Sync up with r21-4-10-utf-2000-0_20-ucs-gb-l.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6aef12..8e5ccfe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-05  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mule/mule-conf.el (ucs-gb): New coded-charsets when `utf-2000'
+       is provided [was builtin coded-charsets].
+
 2003-03-04  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
        * mule/mule-conf.el (ucs-cns): New coded-charsets when `utf-2000'

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 1642395..520cd1a 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -139,6 +139,15 @@
   )
 
 (when (featurep 'utf-2000)
+  (make-charset 'ucs-gb
+               "UCS for GB"
+               `(long-name     "ISO/IEC 10646 for GB"
+                 chars         256
+                 dimension     3
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        ucs))
   (make-charset 'ucs-cns
                "UCS for CNS"
                `(long-name     "ISO/IEC 10646 for CNS 11643"

diff --git a/src/ChangeLog b/src/ChangeLog
index d00ef5e..ea0f341 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-05  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * char-ucs.h (LEADING_BYTE_UCS_GB): Deleted.
+
+       * mule-charset.c (Vcharset_ucs_gb): Deleted.
+       (Qucs_gb): Deleted.
+       (syms_of_mule_charset): Delete `ucs-gb'.
+       (complex_vars_of_mule_charset): Likewise.
+
 2003-03-04  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
        * char-ucs.h (LEADING_BYTE_UCS_CNS): Deleted.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 7ea200d..cef3c04 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -76,9 +76,6 @@ typedef short Charset_ID;
 /* ISO/IEC 10646 SIP */
 #define LEADING_BYTE_UCS_SIP           (MIN_LEADING_BYTE + 5)
 
-/* ISO/IEC 10646 for GB */
-#define LEADING_BYTE_UCS_GB            (MIN_LEADING_BYTE + 6)
-
 /* Japanese JIS X0208 Common   2/4 2/{(8),9,10,11} 4/2 (B) */
 #define LEADING_BYTE_JIS_X0208                 (MIN_LEADING_BYTE + 11)
 

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 7e2710a..5a6e824 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -68,7 +68,6 @@ Lisp_Object Vcharset_ucs;
 Lisp_Object Vcharset_ucs_bmp;
 Lisp_Object Vcharset_ucs_smp;
 Lisp_Object Vcharset_ucs_sip;
-Lisp_Object Vcharset_ucs_gb;
 Lisp_Object Vcharset_latin_viscii;
 Lisp_Object Vcharset_latin_tcvn5712;
 Lisp_Object Vcharset_latin_viscii_lower;
@@ -308,7 +307,6 @@ Lisp_Object Qascii,
   Qucs_bmp,
   Qucs_smp,
   Qucs_sip,
-  Qucs_gb,
   Qlatin_viscii,
   Qlatin_tcvn5712,
   Qlatin_viscii_lower,
@@ -2377,7 +2375,6 @@ syms_of_mule_charset (void)
   defsymbol (&Qucs_bmp,                        "ucs-bmp");
   defsymbol (&Qucs_smp,                        "ucs-smp");
   defsymbol (&Qucs_sip,                        "ucs-sip");
-  defsymbol (&Qucs_gb,                 "ucs-gb");
   defsymbol (&Qlatin_viscii,           "latin-viscii");
   defsymbol (&Qlatin_tcvn5712,         "latin-tcvn5712");
   defsymbol (&Qlatin_viscii_lower,     "latin-viscii-lower");
@@ -2496,15 +2493,6 @@ complex_vars_of_mule_charset (void)
                  build_string ("\\(ISO10646.*-2\\|UCS00-2\\)"),
                  Qnil, MIN_CHAR_SIP, MAX_CHAR_SIP,
                  MIN_CHAR_SIP, 0, Qnil, CONVERSION_IDENTICAL);
-  staticpro (&Vcharset_ucs_gb);
-  Vcharset_ucs_gb =
-    make_charset (LEADING_BYTE_UCS_GB, Qucs_gb, 256, 3,
-                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
-                 build_string ("UCS for GB"),
-                 build_string ("UCS for GB"),
-                 build_string ("ISO/IEC 10646 for GB"),
-                 build_string (""),
-                 Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL);
 #else
 # define MIN_CHAR_THAI 0
 # define MAX_CHAR_THAI 0