Change the font registries for CJK

fonts in the default fontset.  Don't append '*' to registries.

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 33b7fb12cf8ca33ef1bb276b7090c1afca24909d..2581745448618620dcb8174732d588d2737c7b64 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -50,9 +50,9 @@
           (cyrillic-iso8859-5 . ("*" . "ISO8859-5"))
           (latin-iso8859-9 . (nil . "ISO8859-9"))
           (japanese-jisx0208-1978 . ("*" . "JISX0208.1978"))
-          (chinese-gb2312 . ("*" . "GB2312"))
-          (japanese-jisx0208 . ("*" . "JISX0208.1983"))
-          (korean-ksc5601 . ("*" . "KSC5601"))
+          (chinese-gb2312 . ("*" . "GB2312.1980"))
+          (japanese-jisx0208 . ("*" . "JISX0208.1990"))
+          (korean-ksc5601 . ("*" . "KSC5601.1989"))
           (japanese-jisx0212 . ("*" . "JISX0212"))
           (chinese-cns11643-1 . ("*" . "CNS11643.1992-1"))
           (chinese-cns11643-2 . ("*" . "CNS11643.1992-2"))
@@ -83,14 +83,12 @@
           (mule-unicode-0100-24ff . (nil . "ISO10646-1"))
           (mule-unicode-2500-33ff . (nil . "ISO10646-1"))
           (mule-unicode-e000-ffff . (nil . "ISO10646-1"))
-          (japanese-jisx0213-1 . ("*" . "JISX0213"))
-          (japanese-jisx0213-2 . ("*" . "JISX0213"))
+          (japanese-jisx0213-1 . ("*" . "JISX0213.2000"))
+          (japanese-jisx0213-2 . ("*" . "JISX0213.2000"))
           ))
       charset font-spec arg)
   (while l
     (setq charset (car (car l)) font-spec (cdr (car l)) l (cdr l))
-    (or (string-match "-" (cdr font-spec))
-       (setcdr font-spec (concat (cdr font-spec) "*")))
     (if (symbolp charset)
        (setq arg (make-char charset))
       (setq arg charset))