From: tomo <tomo>
Date: Wed, 28 Jul 2010 13:53:31 +0000 (+0000)
Subject: (coded-charset-entity-reference-alist): Prefer
X-Git-Tag: chise-base-0_25-1^20~418
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ea05323e56ff5688ff1968a935ecc68da44b47fc;p=chise%2Fxemacs-chise.git

(coded-charset-entity-reference-alist): Prefer
`=>>ucs@{unicode|jis|cns' to `=>>ucs@jis/{2004|2000|1990',
`=>>jis-x0208@{1990|1978', `=>>jis-x0213-1@{2000|2004}',
`=>>jis-x0213-2', `=>jis-x0208@1997', `=>jis-x0213-1@{2000|2004}' and
`=>jis-x0213-2'.
---

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 1c0df9c..5bbec77 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -278,19 +278,6 @@
 	  ( =jis-x0213-1@2004			 "JX3-" 4 X)
 	  ( =jis-x0212				 "JSP-" 4 X)
 	  ( =jis-x0208@1978			 "J78-" 4 X)
-	  (=>>jis-x0208@1990		       "G-J90-" 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)
-	  (=>>jis-x0213-1@2000		        "aJX1-" 4 X)
-	  (=>>jis-x0213-2	   		"aJX2-" 4 X)
-	  (=>>jis-x0213-1@2004		        "aJX3-" 4 X)
-	  (=>>jis-x0208@1978		       "G-J78-" 4 X)
-	  ( =>jis-x0208@1997			 "J97-" 4 X)
-	  ( =>jis-x0208@1997			"A-J0-" 4 X)
-	  ( =>jis-x0213-1@2000		       "A-JX1-" 4 X)
-	  ( =>jis-x0213-2		       "A-JX2-" 4 X)
-	  ( =>jis-x0213-1@2004		       "A-JX3-" 4 X)
 	  ( chinese-cns11643-1                    "C1-" 4 X)
 	  ( chinese-cns11643-2                    "C2-" 4 X)
 	  ( chinese-cns11643-3                    "C3-" 4 X)
@@ -340,6 +327,22 @@
 	  (=>>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-x0213-1@2000		       "G-JX1-" 4 X)
+	  (=>>jis-x0213-2	   	       "G-JX2-" 4 X)
+	  (=>>jis-x0213-1@2004		       "G-JX3-" 4 X)
+	  (=>>jis-x0213-1@2000		        "aJX1-" 4 X)
+	  (=>>jis-x0213-2	   		"aJX2-" 4 X)
+	  (=>>jis-x0213-1@2004		        "aJX3-" 4 X)
+	  (=>>jis-x0208@1978		       "G-J78-" 4 X)
+	  ( =>jis-x0208@1997			 "J97-" 4 X)
+	  ( =>jis-x0208@1997			"A-J0-" 4 X)
+	  ( =>jis-x0213-1@2000		       "A-JX1-" 4 X)
+	  ( =>jis-x0213-2		       "A-JX2-" 4 X)
+	  ( =>jis-x0213-1@2004		       "A-JX3-" 4 X)
 	  ( =jis-x0208@1978/i1                 "J78i1-" 4 X)
 	  ( =shinjigen@rev                      "SJG2-" 4 d)
 	  ( =shinjigen@1ed                      "SJG1-" 4 d)