(U-00025762): Unify BC-8DC8 and M-24936.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / read-maps.el

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index 739818d..7ae6976 100644 (file)
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -41,6 +41,10 @@
      "^JX2-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
      =ucs@jis/2000
      "\tJU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)")
+    (=gb2312
+     "^G0-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
+     =ucs@gb
+     "\tGU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)")
     (=cns11643-1
      "^C1-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
      =ucs@cns
@@ -132,15 +136,17 @@ UCS-REGEXP is a regular expression to match against
            (put-char-attribute chr ccs code))
          (when (and ucs-code
                     (not
-                     (eq (or (encode-char chr ucs-ccs 'defined-only)
-                             (if (memq ucs-ccs '(=ucs@jis
-                                                 =ucs@jis/1990
-                                                 =ucs@jis/2000
-                                                 ;; ucs-big5
-                                                 ))
-                                 (encode-char chr '=ucs@jis/fw
-                                              'defined-only)
-                               (char-feature chr '=>ucs)))
+                     (eq (or
+                          (encode-char chr ucs-ccs 'defined-only)
+                          (cond
+                           ((memq ucs-ccs '(=ucs@jis
+                                            =ucs@jis/1990
+                                            =ucs@jis/2000))
+                            (encode-char chr '=ucs@jis/fw 'defined-only))
+                           ((eq ucs-ccs '=ucs@gb)
+                            (encode-char chr '=ucs@gb/fw 'defined-only))
+                           (t
+                            (char-feature chr '=>ucs))))
                          ucs-code)))
            (put-char-attribute chr ucs-ccs ucs-code))
          (when (and ucs
@@ -148,6 +154,7 @@ UCS-REGEXP is a regular expression to match against
                                  (and (not (memq ucs-ccs '(=ucs@jis
                                                            =ucs@jis/1990
                                                             =ucs@jis/2000
+                                                           =ucs@gb
                                                            ;; ucs-big5
                                                            )))
                                       (char-feature chr '=>ucs)))