X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fsearch.c;h=49c4c8d4a74bd52acfd76d460a089d1de547a328;hb=6c06ab30ebf628394d2749043f30ed08488fbf2f;hp=169e1d71541eceb244e99ef740788fd47ed8b40b;hpb=b10ee70be2e0ce31599b05e9d58f83fc92141de0;p=chise%2Fxemacs-chise.git-

diff --git a/src/search.c b/src/search.c
index 169e1d7..49c4c8d 100644
--- 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.  */
+#ifdef UTF2000
+	      int charset_base_code = c >> 6;
+#else
 	      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)
@@ -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);
+#ifdef UTF2000
+	      if (charset_base == (untranslated >> 6))
+#else
 	      if (charset_base == (untranslated & ~CHAR_FIELD3_MASK))
+#endif
 		{
 		  ch = TRANSLATE (trt, untranslated);
 		  if (!BUFBYTE_FIRST_BYTE_P (*ptr))