(JC3-70A4): New character.

[chise/xemacs-chise.git-] / src / char-ucs.h

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 961ded3..7903a36 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -139,8 +139,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_GT_PJ_10          (MIN_LEADING_BYTE + 50)
 #define LEADING_BYTE_GT_PJ_11          (MIN_LEADING_BYTE + 51)
 
-#define LEADING_BYTE_CHINA3_JEF                (MIN_LEADING_BYTE + 82)
-#define LEADING_BYTE_CBETA             (MIN_LEADING_BYTE + 83)
 /* #define LEADING_BYTE_CHINESE_BIG5_CDP       (MIN_LEADING_BYTE + 84) */
 #define LEADING_BYTE_HANZIKU_1         (MIN_LEADING_BYTE + 85)
 #define LEADING_BYTE_HANZIKU_2         (MIN_LEADING_BYTE + 86)
@@ -318,7 +316,6 @@ DECLARE_LRECORD (charset, Lisp_Charset);
 #define XCHARSET(x) XRECORD (x, charset, Lisp_Charset)
 #define XSETCHARSET(x, p) XSETRECORD (x, p, charset)
 #define CHARSETP(x) RECORDP (x, charset)
-#define GC_CHARSETP(x) GC_RECORDP (x, charset)
 #define CHECK_CHARSET(x) CHECK_RECORD (x, charset)
 #define CONCHECK_CHARSET(x) CONCHECK_RECORD (x, charset)
 
@@ -495,10 +492,13 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
 
 #define MIN_CHAR_DAIKANWA      0x00E00000
 #define MAX_CHAR_DAIKANWA      (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */
+/*
 #define MIN_CHAR_CBETA         0x00E20000
 #define MAX_CHAR_CBETA         0x00E2FFFF
+
 #define MIN_CHAR_CHINA3_JEF    0x00E80000
 #define MAX_CHAR_CHINA3_JEF    0x00E8FFFF
+*/
 
 #define MIN_CHAR_94            0x00E90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)
@@ -513,7 +513,7 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
 #define MAX_CHAR_96x96         (MIN_CHAR_96x96 + 96 * 96 * 80 - 1)
 
 #define MIN_CHAR_GT            0x61000000
-#define MAX_CHAR_GT            (MIN_CHAR_GT + 66773)
+#define MAX_CHAR_GT            (MIN_CHAR_GT + 67547)
 #define MIN_CHAR_BIG5_CDP      0x62000000
 #define MAX_CHAR_BIG5_CDP      0x6200FFFF
 #define MIN_CHAR_HANZIKU_1     (0x62000000 + 65536 * 1)
@@ -686,7 +686,7 @@ decoding_table_remove_char (Lisp_Object ccs, int code_point)
   decoding_table_put_char (ccs, code_point, Qunbound);
 }
 
-#ifdef HAVE_DATABASE
+#ifdef HAVE_CHISE_CLIENT
 Emchar load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point);
 #endif