- Use `=jis-x0208@{1978|1983|1990}' instead of

[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 43f27f8..c43d38b 100644 (file)
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -120,6 +120,9 @@
              (if (looking-at
                   "[ \t]*U[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)")
                  (string-to-int (match-string 1) 16)))
+       (if (and ucs-ccs ucs (not ucs-code))
+           (setq ucs-code ucs
+                 ucs nil))
        (when (setq chr (decode-char ccs code))
          (unless (eq (encode-char chr ccs 'defined-only)
                      code)
@@ -139,7 +142,8 @@
                                       (char-feature chr '=>ucs)))
                              ucs)))
            (if (or ucs-code (null ucs-ccs))
-               (put-char-attribute chr '=>ucs ucs)
+               (unless (eq (char-feature chr '=>ucs) ucs)
+                 (put-char-attribute chr '=>ucs ucs))
              (unless (eq (encode-char chr ucs-ccs 'defined-only)
                          ucs)
                (put-char-attribute chr ucs-ccs ucs)))))