Sync up with r21-4-15-chise-0_21-32.

[chise/xemacs-chise.git] / lisp / mule / mule-charset.el

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 45bea13..d8f4a6f 100644 (file)
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -277,21 +277,9 @@ DESCRIPTION (string) is the description string of the charset."
          greek-iso8859-7
          thai-tis620
          =jis-x0208
-         =gt-pj-2
-         =gt-pj-3
-         =gt-pj-4
-         =gt-pj-5
-         =gt-pj-6
-         =gt-pj-7
-         =gt-pj-8
-         =gt-pj-9
-         =gt-pj-10
-         =gt-pj-11
-         =gt-pj-k1
-         =gt-pj-k2
+         chinese-gb2312
          japanese-jisx0208
          =jis-x0208-1990
-         chinese-gb2312
          japanese-jisx0212
          japanese-jisx0208-1978
          korean-ksc5601
@@ -302,6 +290,18 @@ DESCRIPTION (string) is the description string of the charset."
          chinese-cns11643-5
          chinese-cns11643-6
          chinese-cns11643-7
+         =gt-pj-2
+         =gt-pj-3
+         =gt-pj-4
+         =gt-pj-5
+         =gt-pj-6
+         =gt-pj-7
+         =gt-pj-8
+         =gt-pj-9
+         =gt-pj-10
+         =gt-pj-11
+         =gt-pj-k1
+         =gt-pj-k2
          =jis-x0213-1-2000
          =jis-x0213-2-2000
          =big5-cdp
@@ -320,6 +320,7 @@ DESCRIPTION (string) is the description string of the charset."
          arabic-1-column
          arabic-2-column
          =gt-pj-1
+         =jis-x0208@1997
          =ucs-radicals
          =ucs-bmp-cjk
          =ucs-sip-ext-b