Sync with r21-4-10-utf-2000-0_20-cbl.

diff --git a/src/ChangeLog b/src/ChangeLog
index 68b6531..4c822bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-05  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * mule-charset.c (Vcharset_ideograph_cbeta): Deleted.
+       (Qideograph_cbeta): Deleted.
+       (syms_of_mule_charset): Don't define `ideograph-cbeta'.
+       (complex_vars_of_mule_charset): Likewise.
+
+       * char-ucs.h (LEADING_BYTE_CBETA): Deleted.
+       (MIN_CHAR_CBETA): Comment out.
+       (MAX_CHAR_CBETA): Likewise.
+
 2002-12-19  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
        * mule-charset.c (charset_lookup_description_1): Use

diff --git a/src/char-ucs.h b/src/char-ucs.h
index cd7101f..9d9abd7 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -137,7 +137,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_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)
@@ -490,9 +489,10 @@ 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
 */

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 8b9f91b..3dfb932 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -91,7 +91,6 @@ Lisp_Object Vcharset_ideograph_hanziku_9;
 Lisp_Object Vcharset_ideograph_hanziku_10;
 Lisp_Object Vcharset_ideograph_hanziku_11;
 Lisp_Object Vcharset_ideograph_hanziku_12;
-Lisp_Object Vcharset_ideograph_cbeta;
 Lisp_Object Vcharset_ideograph_gt;
 Lisp_Object Vcharset_ideograph_gt_pj_1;
 Lisp_Object Vcharset_ideograph_gt_pj_2;
@@ -365,7 +364,6 @@ Lisp_Object Qascii,
   Qideograph_hanziku_10,
   Qideograph_hanziku_11,
   Qideograph_hanziku_12,
-  Qideograph_cbeta,
   Qideograph_daikanwa_2,
   Qideograph_daikanwa,
   Qideograph_gt,
@@ -2490,7 +2488,6 @@ syms_of_mule_charset (void)
   defsymbol (&Qideograph_hanziku_10,   "ideograph-hanziku-10");
   defsymbol (&Qideograph_hanziku_11,   "ideograph-hanziku-11");
   defsymbol (&Qideograph_hanziku_12,   "ideograph-hanziku-12");
-  defsymbol (&Qideograph_cbeta,                "ideograph-cbeta");
   defsymbol (&Qethiopic_ucs,           "ethiopic-ucs");
 #endif
   defsymbol (&Qchinese_big5_1,         "chinese-big5-1");
@@ -2990,16 +2987,6 @@ complex_vars_of_mule_charset (void)
   DEF_HANZIKU (10);
   DEF_HANZIKU (11);
   DEF_HANZIKU (12);
-  staticpro (&Vcharset_ideograph_cbeta);
-  Vcharset_ideograph_cbeta =
-    make_charset (LEADING_BYTE_CBETA, Qideograph_cbeta, 256, 2,
-                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
-                 build_string ("CB"),
-                 build_string ("CBETA"),
-                 build_string ("CBETA private characters"),
-                 build_string ("cbeta-0"),
-                 Qnil, MIN_CHAR_CBETA, MAX_CHAR_CBETA,
-                 MIN_CHAR_CBETA, 0, Qnil, CONVERSION_IDENTICAL);
   staticpro (&Vcharset_ideograph_gt);
   Vcharset_ideograph_gt =
     make_charset (LEADING_BYTE_GT, Qideograph_gt, 256, 3,