(vars_of_mule_charset): Update `utf-2000-version' to

[chise/xemacs-chise.git-] / src / chartab.h

diff --git a/src/chartab.h b/src/chartab.h
index 5191099..7fd20dd 100644 (file)
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -42,7 +42,6 @@ DECLARE_LRECORD (char_table_entry, struct Lisp_Char_Table_Entry);
   XRECORD (x, char_table_entry, struct Lisp_Char_Table_Entry)
 #define XSETCHAR_TABLE_ENTRY(x, p) XSETRECORD (x, p, char_table_entry)
 #define CHAR_TABLE_ENTRYP(x) RECORDP (x, char_table_entry)
-#define GC_CHAR_TABLE_ENTRYP(x) GC_RECORDP (x, char_table_entry)
 /* #define CHECK_CHAR_TABLE_ENTRY(x) CHECK_RECORD (x, char_table_entry)
    char table entries should never escape to Lisp */
 
@@ -63,7 +62,6 @@ DECLARE_LRECORD (char_table, struct Lisp_Char_Table);
   XRECORD (x, char_table, struct Lisp_Char_Table)
 #define XSETCHAR_TABLE(x, p) XSETRECORD (x, p, char_table)
 #define CHAR_TABLEP(x) RECORDP (x, char_table)
-#define GC_CHAR_TABLEP(x) GC_RECORDP (x, char_table)
 #define CHECK_CHAR_TABLE(x) CHECK_RECORD (x, char_table)
 #define CONCHECK_CHAR_TABLE(x) CONCHECK_RECORD (x, char_table)
 
@@ -141,7 +139,11 @@ CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (struct Lisp_Char_Table *ct, Emchar ch);
 INLINE Lisp_Object
 CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (struct Lisp_Char_Table *ct, Emchar ch)
 {
+#ifdef UTF2000
+  Charset_ID lb = CHAR_CHARSET_ID (ch);
+#else
   Charset_ID lb = CHAR_LEADING_BYTE (ch);
+#endif
   if (!CHAR_TABLE_ENTRYP ((ct)->level1[lb - MIN_LEADING_BYTE]))
     return (ct)->level1[lb - MIN_LEADING_BYTE];
   else
@@ -186,7 +188,7 @@ int map_char_table (struct Lisp_Char_Table *ct,
                    int (*fn) (struct chartab_range *range,
                               Lisp_Object val, void *arg),
                    void *arg);
-void prune_syntax_tables (int (*obj_marked_p) (Lisp_Object));
+void prune_syntax_tables (void);
 
 EXFUN (Fcopy_char_table, 1);
 EXFUN (Fmake_char_table, 1);