X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=0e7502a9292b7663e3a944a80a1136986c05833f;hb=b18a4f234473e110b8483b2a83fb60924fa9c8a0;hp=c2d5e0666f9031cfc8f523767f4754a54d98818f;hpb=996f02090eca13088154fc1aae90b9817739f284;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index c2d5e06..0e7502a 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -25,9 +25,11 @@
 
 ;;; Code:
 
-(define-charset-alias 'japanese-jisx0208-1978	'=jis-x0208-1978)
+(define-charset-alias '=jis-x0208-1978		'=jis-x0208@1978)
+(define-charset-alias 'japanese-jisx0208-1978	'=jis-x0208@1978)
 (define-charset-alias 'chinese-gb2312		'=gb2312)
-(define-charset-alias 'japanese-jisx0208	'=jis-x0208-1983)
+(define-charset-alias '=jis-x0208-1983		'=jis-x0208@1983)
+(define-charset-alias 'japanese-jisx0208	'=jis-x0208@1983)
 (define-charset-alias 'korean-ksc5601		'=ks-x1001)
 (define-charset-alias 'japanese-jisx0212	'=jis-x0212)
 (define-charset-alias 'chinese-cns11643-1	'=cns11643-1)
@@ -135,7 +137,7 @@
 		registry "jisx0213\\(\\.2000\\)-1"
 		dimension 2
 		chars 94
-		mother =jis-x0208-1990
+		mother =jis-x0208@1990
 		final ?O
 		graphic 0))
       (make-charset
@@ -170,11 +172,21 @@
 
 (when (featurep 'utf-2000)
   (define-charset-alias 'ucs '=ucs)
-  (define-charset-alias 'japanese-jisx0208-1990 '=jis-x0208-1990)
+  (define-charset-alias '=jis-x0208-1990 '=jis-x0208@1990)
+  (define-charset-alias 'japanese-jisx0208-1990 '=jis-x0208@1990)
+  (make-charset
+   '=jis-x0208@1997
+   "JIS X 0208 based on the unification rule of 1997 edition."
+   '(registry "jisx0208\\.1990"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208
+	      ;; final ?B
+	      graphic 0))
 
   (make-charset '=big5-cdp
 		"Big5 with CDP extension"
-		`(long-name	"Big5-CDP"
+		'(long-name	"Big5-CDP"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -231,7 +243,7 @@
   (make-charset
    '=gt-pj-k1
    "Ideographic parts of GT (pseudo JIS encoding) part 1"
-   `(long-name "GT K1"
+   '(long-name "GT K1"
 	       chars 94
 	       dimension 2
 	       columns 2
@@ -242,7 +254,7 @@
   (make-charset
    '=gt-pj-k2
    "Ideographic parts of GT (pseudo JIS encoding) part 2"
-   `(long-name "GT K2"
+   '(long-name "GT K2"
 	       chars 94
 	       dimension 2
 	       columns 2