Mercurial > emacs

changeset 88388:e9a23b7c1feb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include "character.h" instead of "charset.h". (search_buffer, boyer_moore): Adjusted for the new multibyte form. (Freplace_match): Adjusted for the change of multibyte_char_to_unibyte.
author Kenichi Handa <handa@m17n.org>
date Fri, 01 Mar 2002 01:46:49 +0000
parents 06da178fab0e
children 39b2b971cdb3
files src/search.c
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/search.c	Fri Mar 01 01:46:12 2002 +0000
+++ b/src/search.c	Fri Mar 01 01:46:49 2002 +0000
@@ -24,7 +24,7 @@
 #include "syntax.h"
 #include "category.h"
 #include "buffer.h"
-#include "charset.h"
+#include "character.h"
 #include "region-cache.h"
 #include "commands.h"
 #include "blockinput.h"
@@ -1228,7 +1228,7 @@
 		{
 		  /* Keep track of which character set row
 		     contains the characters that need translation.  */
-		  int charset_base_code = c & ~CHAR_FIELD3_MASK;
+		  int charset_base_code = c & ~0x3F;
 		  if (charset_base == -1)
 		    charset_base = charset_base_code;
 		  else if (charset_base != charset_base_code)
@@ -1615,7 +1615,7 @@
 	      while (! CHAR_HEAD_P (*charstart))
 		charstart--;
 	      untranslated = STRING_CHAR (charstart, ptr - charstart + 1);
-	      if (charset_base == (untranslated & ~CHAR_FIELD3_MASK))
+	      if (charset_base == (untranslated & ~0x3F))
 		{
 		  TRANSLATE (ch, trt, untranslated);
 		  if (! CHAR_HEAD_P (*ptr))
@@ -2435,10 +2435,7 @@
       Lisp_Object rev_tbl;
       int really_changed = 0;
 
-      rev_tbl= (!buf_multibyte && CHAR_TABLE_P (Vnonascii_translation_table)
-		? Fchar_table_extra_slot (Vnonascii_translation_table,
-					  make_number (0))
-		: Qnil);
+      rev_tbl= Qnil;
 
       substed_alloc_size = length * 2 + 100;
       substed = (unsigned char *) xmalloc (substed_alloc_size + 1);