Use `<-same' instead of `->same'.

[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 a764315..d9974c3 100644 (file)
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -126,7 +126,7 @@
            (put-char-attribute chr ccs code))
          (when (and ucs-code
                     (not (eq (or (encode-char chr ucs-ccs 'defined-only)
-                                 (get-char-attribute chr '=>ucs))
+                                 (char-feature chr '=>ucs))
                              ucs-code)))
            (put-char-attribute chr ucs-ccs ucs-code))
          (when (and ucs
@@ -136,10 +136,11 @@
                                                             =ucs-jis-2000
                                                            ;; ucs-big5
                                                            )))
-                                      (get-char-attribute chr '=>ucs)))
+                                      (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)))))
@@ -161,9 +162,15 @@
                (mapcar (lambda (c)
                          (aref c 0))
                        (split-string tchars " ")))
-         (put-char-attribute char
-                             '<-simplified@JP/Jouyou
-                             tchars))
+         (unless (or (equal (char-feature char '<-simplified@JP/Jouyou)
+                            tchars)
+                     (and (equal (char-feature char '<-simplified)
+                                 tchars)
+                          (memq 'JP/Jouyou
+                                (char-feature char '<-simplified*sources))))
+           (put-char-attribute char
+                               '<-simplified@JP/Jouyou
+                               tchars)))
         ;; (put-char-attribute
         ;;  char 'script (adjoin
         ;;                'JP