From: tomo <tomo>
Date: Tue, 11 Feb 2003 16:29:26 +0000 (+0000)
Subject: (=jis-x0213-{1|2}-2000): Renamed from `japanese-jisx0213-{1|2}' when
X-Git-Tag: r21-4-10-utf-2000-0_20-jis-x0213-2000~5
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2893e42d842e97617b8c3a750b6a0d3d5587cc8;p=chise%2Fxemacs-chise.git

(=jis-x0213-{1|2}-2000): Renamed from `japanese-jisx0213-{1|2}' when
`utf-2000' is provided.
(japanese-jisx0213-{1|2}): New alias for =jis-x0213-{1|2}-2000 when
`utf-2000' is provided.
---

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index b2b83a4..5ed91ae 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -98,30 +98,45 @@
   )
 
 ;; JIS X 0213:2000
-(make-charset
- 'japanese-jisx0213-1
- "JIS X 0213:2000 Plain 1"
- (if (featurep 'utf-2000)
-     '(registry "jisx0213\\(\\.2000\\)-1"
-       dimension 2
-       chars 94
-       mother japanese-jisx0208-1990
-       final ?O
-       graphic 0)
+(if (featurep 'utf-2000)
+    (progn
+      (make-charset
+       '=jis-x0213-1-2000
+       "JIS X 0213:2000 Plain 1"
+       '(registry "jisx0213\\(\\.2000\\)-1"
+		  dimension 2
+		  chars 94
+		  mother japanese-jisx0208-1990
+		  final ?O
+		  graphic 0))
+      (make-charset
+       '=jis-x0213-2-2000
+       "JIS X 0213:2000 Plain 2"
+       '(registry "jisx0213\\(\\.2000\\)-2"
+		  dimension 2
+		  chars 94
+		  final ?P
+		  graphic 0))
+      (define-charset-alias 'japanese-jisx0213-1 '=jis-x0213-1-2000)
+      (define-charset-alias 'japanese-jisx0213-2 '=jis-x0213-2-2000)
+      )
+  (make-charset
+   'japanese-jisx0213-1
+   "JIS X 0213:2000 Plain 1"
    '(registry "jisx0213\\(\\.2000\\)-1"
-     dimension 2
-     chars 94
-     final ?O
-     graphic 0)))
-
-(make-charset
- 'japanese-jisx0213-2
- "JIS X 0213:2000 Plain 2"
- '(registry "jisx0213\\(\\.2000\\)-2"
-   dimension 2
-   chars 94
-   final ?P
-   graphic 0))
+	      dimension 2
+	      chars 94
+	      final ?O
+	      graphic 0))
+  (make-charset
+   'japanese-jisx0213-2
+   "JIS X 0213:2000 Plain 2"
+   '(registry "jisx0213\\(\\.2000\\)-2"
+	      dimension 2
+	      chars 94
+	      final ?P
+	      graphic 0))
+  )
 
 (when (featurep 'utf-2000)
   (make-charset