From: tomo <tomo>
Date: Wed, 4 Aug 2010 15:06:40 +0000 (+0000)
Subject: (coded-charset-entity-reference-alist):
X-Git-Tag: chise-base-0_25-1^20~339
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7d4733c254c32ab1fee9e658a257917fa4001fce;p=chise%2Fxemacs-chise.git-

(coded-charset-entity-reference-alist):
- Add setting for `=>>jis-x0208'.
- Omit setting for `=>>jis-x0208@1990'.
- Prefer `=>>gt', JIS X0208/0213, `=>>big5-cdp', `=>>gt-k', `=>gt' and
  `=>zinbun-oracle' to `=>ucs@FOO', `=>>ucs@FOO' and `=ucs@FOO'.
---

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 5276839..20a4a7a 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -303,27 +303,9 @@
 	  ( arabic-2-column                "MULE-ARB2-" 2 X)
 	  ( arabic-digit		   "MULE-ARBD-" 2 X)
 	  ( ipa                             "MULE-IPA-" 2 X)
-	  ( =ucs@iso				   "U-" 8 X)
-	  ( =ucs@unicode			  "UU+" 4 X)
-	  ( =ucs@unicode			  "UU-" 8 X)
-	  ( =ucs@iso				   "U+" 4 X)
-	  ( =ucs@gb				  "GU+" 4 X)
-	  ( =ucs@gb				  "GU-" 8 X)
-	  ( =ucs@jis				  "JU+" 4 X)
-	  ( =ucs@jis				  "JU-" 8 X)
-	  ( =ucs@cns				  "CU+" 4 X)
-	  ( =ucs@cns				  "CU-" 8 X)
-	  ( =ucs@ks				  "KU+" 4 X)
-	  ( =ucs@ks				  "KU-" 8 X)
 	  (=>>gt				"G-GT-" 5 d)
 	  (=>>gt				 "aGT-" 5 d)
-	  (=>>ucs@unicode                    	"G-UU+" 4 X)
-	  (=>>ucs@jis				"G-JU+" 4 X)
-	  (=>>ucs@cns				"G-CU+" 4 X)
-	  (=>>ucs@jis/2004		      "G-J04U+" 4 X)
-	  (=>>ucs@jis/2000		      "G-J00U+" 4 X)
-	  (=>>ucs@jis/1990		      "G-J90U+" 4 X)
-	  (=>>jis-x0208@1990		       "G-J90-" 4 X)
+	  (=>>jis-x0208				"G-J0-" 4 X)
 	  (=>>jis-x0213-1@2000		       "G-JX1-" 4 X)
 	  (=>>jis-x0213-2	   	       "G-JX2-" 4 X)
 	  (=>>jis-x0213-1@2004		       "G-JX3-" 4 X)
@@ -340,6 +322,27 @@
 	  ( =>jis-x0213-1@2004		       "A-JX3-" 4 X)
 	  ( =>gt				"A-GT-" 5 d)
 	  ( =>zinbun-oracle		       "A-ZOB-" 4 d)
+	  ( =>ucs@iso				"A-IU+" 4 X)
+	  ( =>ucs@unicode			"A-UU+" 4 X)
+	  (=>>ucs@iso				"G-IU+" 4 X)
+	  (=>>ucs@unicode			"G-UU+" 4 X)
+	  (=>>ucs@jis				"G-JU+" 4 X)
+	  (=>>ucs@cns				"G-CU+" 4 X)
+	  (=>>ucs@jis/2004		      "G-J04U+" 4 X)
+	  (=>>ucs@jis/2000		      "G-J00U+" 4 X)
+	  (=>>ucs@jis/1990		      "G-J90U+" 4 X)
+	  ( =ucs@iso				   "U-" 8 X)
+	  ( =ucs@unicode			  "UU+" 4 X)
+	  ( =ucs@unicode			  "UU-" 8 X)
+	  ( =ucs@iso				   "U+" 4 X)
+	  ( =ucs@gb				  "GU+" 4 X)
+	  ( =ucs@gb				  "GU-" 8 X)
+	  ( =ucs@jis				  "JU+" 4 X)
+	  ( =ucs@jis				  "JU-" 8 X)
+	  ( =ucs@cns				  "CU+" 4 X)
+	  ( =ucs@cns				  "CU-" 8 X)
+	  ( =ucs@ks				  "KU+" 4 X)
+	  ( =ucs@ks				  "KU-" 8 X)
 	  ( china3-jef				 "JC3-" 4 X)
 	  ( chinese-big5			   "B-" 4 X)
 	  ( chinese-big5			  "C0-" 4 X)