(char-db-coded-charset-priority-list):

- Add `=jis-x0213-1' and `=jis-x0213-1@2004'.
- Use `=jis-x0213-1@2000' instead of `=jis-x0213-1-2000'.
- Use `=jis-x0213-2' instead of `=jis-x0213-2-2000'.
- Add `<=>jis-x0208'.
- Use `<=>jis-x0208@1997' instead of `=jis-x0208@1997'.
- Add `<=>jis-x0213-1' and `<=>jis-x0213-1@{2000|2004}'.

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 4b557b7..168a162 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -209,8 +209,10 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0213-1-2000
-    =jis-x0213-2-2000
+    =jis-x0213-1
+    =jis-x0213-1@2000
+    =jis-x0213-1@2004
+    =jis-x0213-2
     korean-ksc5601
     chinese-isoir165
     katakana-jisx0201
@@ -238,9 +240,13 @@
     =gt-k
     =ucs@iso
     =ucs@unicode
+    <=>jis-x0208
+    <=>jis-x0208@1997
+    <=>jis-x0213-1
+    <=>jis-x0213-1@2000
+    <=>jis-x0213-1@2004
     =big5
     =big5-eten
-    =jis-x0208@1997
     =zinbun-oracle
     =ruimoku-v6
     =jef-china3))