projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(M-01347): Separate G0-5557, C1-473E, J90-437B and U+5146.
[chise/xemacs-chise.git-]
/
src
/
search.c
diff --git
a/src/search.c
b/src/search.c
index
169e1d7
..
49c4c8d
100644
(file)
--- a/
src/search.c
+++ b/
src/search.c
@@
-1277,7
+1277,11
@@
search_buffer (struct buffer *buf, Lisp_Object string, Bufpos bufpos,
{
/* Keep track of which character set row
contains the characters that need translation. */
{
/* Keep track of which character set row
contains the characters that need translation. */
+#ifdef UTF2000
+ int charset_base_code = c >> 6;
+#else
int charset_base_code = c & ~CHAR_FIELD3_MASK;
int charset_base_code = c & ~CHAR_FIELD3_MASK;
+#endif
if (charset_base == -1)
charset_base = charset_base_code;
else if (charset_base != charset_base_code)
if (charset_base == -1)
charset_base = charset_base_code;
else if (charset_base != charset_base_code)
@@
-1576,7
+1580,11
@@
boyer_moore (struct buffer *buf, Bufbyte *base_pat, Bytecount len,
while (!BUFBYTE_FIRST_BYTE_P (*charstart))
charstart--;
untranslated = charptr_emchar (charstart);
while (!BUFBYTE_FIRST_BYTE_P (*charstart))
charstart--;
untranslated = charptr_emchar (charstart);
+#ifdef UTF2000
+ if (charset_base == (untranslated >> 6))
+#else
if (charset_base == (untranslated & ~CHAR_FIELD3_MASK))
if (charset_base == (untranslated & ~CHAR_FIELD3_MASK))
+#endif
{
ch = TRANSLATE (trt, untranslated);
if (!BUFBYTE_FIRST_BYTE_P (*ptr))
{
ch = TRANSLATE (trt, untranslated);
if (!BUFBYTE_FIRST_BYTE_P (*ptr))