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

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

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 339e89e..1642395 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-cns
+               "UCS for CNS"
+               `(long-name     "ISO/IEC 10646 for CNS 11643"
+                 chars         256
+                 dimension     3
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        ucs))
   (make-charset 'ucs-jis
                "UCS for JIS"
                `(long-name     "ISO/IEC 10646 for JIS X0208/0212/0213"

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

diff --git a/src/char-ucs.h b/src/char-ucs.h
index f8db601..7ea200d 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -79,9 +79,6 @@ typedef short Charset_ID;
 /* ISO/IEC 10646 for GB */
 #define LEADING_BYTE_UCS_GB            (MIN_LEADING_BYTE + 6)
 
-/* ISO/IEC 10646 for CNS */
-#define LEADING_BYTE_UCS_CNS           (MIN_LEADING_BYTE + 7)
-
 /* 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 7c6aa60..7e2710a 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -69,7 +69,6 @@ Lisp_Object Vcharset_ucs_bmp;
 Lisp_Object Vcharset_ucs_smp;
 Lisp_Object Vcharset_ucs_sip;
 Lisp_Object Vcharset_ucs_gb;
-Lisp_Object Vcharset_ucs_cns;
 Lisp_Object Vcharset_latin_viscii;
 Lisp_Object Vcharset_latin_tcvn5712;
 Lisp_Object Vcharset_latin_viscii_lower;
@@ -310,7 +309,6 @@ Lisp_Object Qascii,
   Qucs_smp,
   Qucs_sip,
   Qucs_gb,
-  Qucs_cns,
   Qlatin_viscii,
   Qlatin_tcvn5712,
   Qlatin_viscii_lower,
@@ -2380,7 +2378,6 @@ syms_of_mule_charset (void)
   defsymbol (&Qucs_smp,                        "ucs-smp");
   defsymbol (&Qucs_sip,                        "ucs-sip");
   defsymbol (&Qucs_gb,                 "ucs-gb");
-  defsymbol (&Qucs_cns,                        "ucs-cns");
   defsymbol (&Qlatin_viscii,           "latin-viscii");
   defsymbol (&Qlatin_tcvn5712,         "latin-tcvn5712");
   defsymbol (&Qlatin_viscii_lower,     "latin-viscii-lower");
@@ -2508,15 +2505,6 @@ complex_vars_of_mule_charset (void)
                  build_string ("ISO/IEC 10646 for GB"),
                  build_string (""),
                  Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL);
-  staticpro (&Vcharset_ucs_cns);
-  Vcharset_ucs_cns =
-    make_charset (LEADING_BYTE_UCS_CNS, Qucs_cns, 256, 3,
-                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
-                 build_string ("UCS for CNS"),
-                 build_string ("UCS for CNS 11643"),
-                 build_string ("ISO/IEC 10646 for CNS 11643"),
-                 build_string (""),
-                 Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL);
 #else
 # define MIN_CHAR_THAI 0
 # define MAX_CHAR_THAI 0