(jp-jouyou-read-file): Check `<-simplified' and

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

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index 54f27e4..43f27f8 100644 (file)
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -161,8 +161,12 @@
                (mapcar (lambda (c)
                          (aref c 0))
                        (split-string tchars " ")))
-         (unless (equal (char-feature 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)))