X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-coding.el;h=11e8710ac6fd828d703edbcfe353a6f1782e02f1;hb=428d16d7c4be61d4b09ec978d05f748b90a94e5f;hp=c0a951b924c62aa636756afdd6f000d12a114bc9;hpb=2de08ae8eb4fc3dc993663c7b184f34a0c4477ac;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index c0a951b..11e8710 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -4,7 +4,7 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1995 Sun Microsystems.
-;; Copyright (C) 1997,1999,2002,2003,2004 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2002,2003,2004,2005,2006,2008,2009 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -124,12 +124,20 @@
 (make-coding-system
  'iso-2022-jp-2 'iso2022
  "ISO-2022 coding system using SS2 for 96-charset in 7-bit code."
- '(charset-g0 ascii
-   charset-g2 t ;; unspecified but can be used later.
-   seven t
-   short t
-   mnemonic "ISO7/SS"
-   eol-type nil))
+ (let ((conf
+	'(charset-g0 ascii
+          charset-g2 t ;; unspecified but can be used later.
+	  seven t
+	  short t
+	  mnemonic "ISO7/SS"
+	  eol-type nil)))
+   (if (featurep 'utf-2000)
+       (list* 'ccs-priority-list
+	      '(ascii
+		=jis-x0208@1983 =jis-x0208@1978
+		latin-jisx0201)
+	      conf)
+     conf)))
 
 (make-coding-system
  'iso-2022-7bit 'iso2022
@@ -194,6 +202,7 @@
 	  ((japanese-jisx0208	. isolated)    "I-J83-" 4 X)
 	  ((japanese-jisx0213-1	. isolated)    "I-JX1-" 4 X)
 	  ((japanese-jisx0213-2	. isolated)    "I-JX2-" 4 X)
+	  ((=jis-x0213-1@2004	. isolated)    "I-JX3-" 4 X)
 	  ((japanese-jisx0212	. isolated)    "I-JSP-" 4 X)
 	  ((japanese-jisx0208-1978 . isolated) "I-J78-" 4 X)
 	  ((chinese-gb2312	. isolated)    	"I-G0-" 4 X)
@@ -230,6 +239,8 @@
 	  ((ipa			. isolated) "I-MULE-IPA-" 2 X)
 	  ((china3-jef		. isolated)    "I-JC3-" 4 X)
 	  ( ideograph-gt   		          "GT-" 5 d)
+	  (<=>gt				 "aGT-" 5 d)
+	  ( =zinbun-oracle                       "ZOB-" 4 d)
 	  ( =ruimoku-v6				"RUI6-" 4 X)
 	  ( chinese-big5-cdp		         "CDP-" 4 X)
 	  ( ideograph-daikanwa                     "M-" 5 d)
@@ -255,6 +266,7 @@
 	  ( japanese-jisx0208   		 "J83-" 4 X)
 	  ( japanese-jisx0213-1   		 "JX1-" 4 X)
 	  ( japanese-jisx0213-2   		 "JX2-" 4 X)
+	  ( =jis-x0213-1@2004			 "JX3-" 4 X)
 	  ( japanese-jisx0212   		 "JSP-" 4 X)
 	  ( japanese-jisx0208-1978  	         "J78-" 4 X)
 	  ( chinese-cns11643-1                    "C1-" 4 X)
@@ -291,10 +303,10 @@
 	  ( china3-jef                    	 "JC3-" 4 X)
 	  ( chinese-big5                    	   "B-" 4 X)
 	  ( chinese-big5                    	  "C0-" 4 X)
+	  ( =ucs@iso                    	   "U-" 8 X)
 	  ( =ucs@unicode                    	  "UU+" 4 X)
 	  ( =ucs@unicode                    	  "UU-" 8 X)
 	  ( =ucs@iso                    	   "U+" 4 X)
-	  ( =ucs@iso                    	   "U-" 8 X)
 	  ( =ucs@gb	                    	  "GU+" 4 X)
 	  ( =ucs@gb	                    	  "GU-" 8 X)
 	  ( =ucs@jis	                    	  "JU+" 4 X)
@@ -304,6 +316,9 @@
 	  ( =ucs@ks	                    	  "KU+" 4 X)
 	  ( =ucs@ks	                    	  "KU-" 8 X)
 	  ( =jis-x0208@1997                      "J97-" 4 X)
+	  ( =jis-x0208@1978/i1                 "J78i1-" 4 X)
+	  ( =shinjigen@rev                      "SJG2-" 4 d)
+	  ( =shinjigen@1ed                      "SJG1-" 4 d)
 	  ))
 
   (make-coding-system