X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmule%2Fmule-charset.el;h=1acb1196dec4992f4f13b397a4cff1e6f186fca7;hb=219fd0876abb7e8dc526900d475547fb3d89e1b9;hp=6368cfa7f558dfe508d579833922c2115ffd6bf9;hpb=6cf48346a61a8d8dbe90ce3ac039b664dfaa5b1c;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 6368cfa..1acb119 100644
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1996 Sun Microsystems.
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
-;;   2009, 2010, 2011 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -290,6 +290,26 @@ DESCRIPTION (string) is the description string of the charset."
           =ucs-bmp-cjk-compat@unicode
           japanese-jisx0208-1978
 	  =jis-x0212
+	  chinese-cns11643-1
+	  chinese-cns11643-2
+	  chinese-cns11643-3
+          chinese-cns11643-4
+	  chinese-cns11643-5
+	  chinese-cns11643-6
+	  chinese-cns11643-7
+	  =adobe-japan1-6
+	  =big5-cdp
+	  =hanyo-denshi/ja
+	  =hanyo-denshi/jb
+	  =hanyo-denshi/jc
+	  =hanyo-denshi/jd
+	  =hanyo-denshi/ft
+	  =hanyo-denshi/ia
+	  =hanyo-denshi/ib
+	  =hanyo-denshi/hg
+	  =hanyo-denshi/ip
+	  =hanyo-denshi/jt
+	  =hanyo-denshi/ks/mf
 	  =gt-pj-2
 	  =gt-pj-3
 	  =gt-pj-4
@@ -302,14 +322,6 @@ DESCRIPTION (string) is the description string of the charset."
 	  =gt-pj-11
 	  =gt-pj-k1
 	  =gt-pj-k2
-	  chinese-cns11643-1
-	  chinese-cns11643-2
-	  chinese-cns11643-3
-          chinese-cns11643-4
-	  chinese-cns11643-5
-	  chinese-cns11643-6
-	  chinese-cns11643-7
-	  =big5-cdp
 	  chinese-big5-eten-a
 	  chinese-big5-eten-b
 	  chinese-big5
@@ -333,17 +345,6 @@ DESCRIPTION (string) is the description string of the charset."
 	  =hanziku-10
 	  =hanziku-11
 	  =hanziku-12
-	  =hanyo-denshi/ja
-	  =hanyo-denshi/jb
-	  =hanyo-denshi/jc
-	  =hanyo-denshi/jd
-	  =hanyo-denshi/ft
-	  =hanyo-denshi/ia
-	  =hanyo-denshi/ib
-	  =hanyo-denshi/hg
-	  =hanyo-denshi/ip
-	  =hanyo-denshi/jt
-	  =hanyo-denshi/ks/mf
 	  =ucs-sip-ext-b@iso
 	  ideograph-daikanwa-2
 	  ideograph-daikanwa
@@ -366,6 +367,10 @@ DESCRIPTION (string) is the description string of the charset."
 	  arabic-iso8859-6
 	  chinese-big5-1
 	  chinese-big5-2
+          ;; =zihai-17xx
+	  =ucs-bmp-itaiji-084
+	  =big5-cdp-var-3
+	  =big5-cdp-var-5
 	  ;; ucs-sip
 	  =>>big5-cdp
 	  =>>jis-x0208
@@ -376,8 +381,8 @@ DESCRIPTION (string) is the description string of the charset."
 	  ucs-bmp
 	  ==>ucs-bmp-cjk@bucs
 	  =>ucs-bmp-cjk@unicode
+          =+>ucs-bmp-cjk@unicode
           ;; =>>ucs@unicode
-	  =adobe-japan1-6
 	  =adobe-japan1-base
 	  =>jis-x0208@1997
 	  =>>hanyo-denshi/ft