X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=9ac3e738bdc6fd4394861c2933c4ea5ececc05eb;hb=51061e3aca491995bae879d1fb2defe5228fe223;hp=ce6b22f305704a0db7da4059e08d65305cd430da;hpb=b6d830dba54fbfb9770d91381861001979c06e56;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index ce6b22f..9ac3e73 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -25,6 +25,65 @@
 
 ;;; Code:
 
+(cond
+ ((featurep 'utf-2000)
+  (make-charset
+   '=jis-x0208@1978
+   "JIS X 0208:1978, unchanged part."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208
+	      final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/-4pr
+   "JIS X 0208:1978, 1st - 3rd impressions."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+	      final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/1pr
+   "JIS X 0208:1978, 1st impression."
+   '(iso-ir 42
+	    registry "jisx0208\\.1978"
+	    dimension 2
+	    chars 94
+	    mother =jis-x0208@1978/-4pr
+	    final ?@
+	    graphic 0))
+  (make-charset
+   '=jis-x0208@1978/4-pr
+   "JIS X 0208:1978, 4th impression or later."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+              ;; final ?@
+	      graphic 0
+	      partial t))
+  (define-charset-alias '=jis-x0208@1978/i1 '=jis-x0208@1978/1pr)
+  (define-charset-alias '=jis-x0208@1978/i-4 '=jis-x0208@1978/-4pr)
+  (define-charset-alias '=jis-x0208@1978/i4- '=jis-x0208@1978/4-pr)
+  )
+ (t
+  (make-charset
+   '=jis-x0208@1978
+   "JIS X0208:1978 Japanese Kanji (so called \"old JIS\")."
+   '(iso-ir 42
+	    registry "jisx0208\\.1978"
+	    dimension 2
+	    chars 94
+	    mother =jis-x0208
+	    final ?@
+	    graphic 0))
+  ))
+
 (define-charset-alias '=jis-x0208-1978		'=jis-x0208@1978)
 (define-charset-alias 'japanese-jisx0208-1978	'=jis-x0208@1978)
 (define-charset-alias 'chinese-gb2312		'=gb2312)
@@ -173,8 +232,7 @@
 
   (define-charset-alias 'japanese-jisx0213-1 '=jis-x0213-1@2000)
   (define-charset-alias 'japanese-jisx0213-2 '=jis-x0213-2)
-  ;; (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1@2000)
-  (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1)
+  (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1@2000)
   (define-charset-alias '=jis-x0213-2-2000 '=jis-x0213-2)
   )
  (t
@@ -209,24 +267,6 @@
 	      mother =jis-x0208
 	      ;; final ?B
 	      graphic 0))
-  (make-charset
-   '=jis-x0208@1978/i1
-   "The first impression of JIS X 0208:1978."
-   '(registry "jisx0208\\.1978"
-	      dimension 2
-	      chars 94
-	      mother =jis-x0208@1978
-	      ;; final ?@
-	      graphic 0))
-  (make-charset
-   '=jis-x0208@1978/i-4
-   "The second and third impressions of JIS X 0208:1978."
-   '(registry "jisx0208\\.1978"
-	      dimension 2
-	      chars 94
-	      mother =jis-x0208@1978
-	      ;; final ?@
-	      graphic 0))
 
   (make-charset '=big5-cdp
 		"Big5 with CDP extension"