Sync with r21-4-10-utf-2000-0_20-jis-x0213-2000.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6f26db..1493b5e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
 2003-02-10  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
+       * mule/mule-charset.el (default-coded-charset-priority-list): Use
+       `=jis-x0213-{1|2}-2000' instead of `japanese-jisx0213-{1|2}'.
+
+       * mule/mule-conf.el (=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.
+
+2003-02-10  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
        * dumped-lisp.el (preloaded-file-list): Add
        "u02980-Miscellaneous-Mathematical-Symbols-B",
        "u02900-Supplemental-Arrows-B" and

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 8cb894c..175e26f 100644 (file)
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1996 Sun Microsystems.
-;; Copyright (C) 1999,2000,2001 MORIOKA Tomohiko
+;; Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -289,8 +289,8 @@ DESCRIPTION (string) is the description string of the charset."
          chinese-cns11643-6
          chinese-cns11643-7
          japanese-jisx0208-1990
-         japanese-jisx0213-1
-         japanese-jisx0213-2
+         =jis-x0213-1-2000
+         =jis-x0213-2-2000
          korean-ksc5601
          ;; chinese-gb12345
          chinese-isoir165

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index b2b83a4..5ed91ae 100644 (file)
--- 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