X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=8ca50c0f37be9bcbbe956de9d1837a1e6610c542;hb=7788c4868ae0a97a50756d82bd27506b1939cd3e;hp=c81a0fa5534e37c7b8857ff5d00c60fb4623a144;hpb=110105ffd62716cde47030525f8063278209c100;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index c81a0fa..8ca50c0 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -296,14 +296,23 @@
    (lambda (c v)
      (if (and (setq j-chr (decode-char '=ucs@JP v))
 	      (not (eq j-chr c))
-	      (null (encode-char c '=ucs)))
+	      (null (encode-char c '=ucs))
+	      (not (eq (encode-char c '=ucs@jis)
+		       (encode-char c '=ucs@JP/hanazono))))
 	 (put-char-attribute c '=ucs@JP/hanazono nil))
      nil)
    '=ucs@unicode)
   (map-char-attribute
    (lambda (c v)
      (if (and (setq j-chr (decode-char '==ucs@JP v))
-	      (not (eq j-chr c)))
+	      (not (eq j-chr c))
+	      (not (or (eq (encode-char c '==ucs@jis)
+			   (encode-char c '==ucs@JP/hanazono))
+		       (eq (encode-char c '==ucs@unicode)
+			   (encode-char c '==ucs@JP/hanazono))
+		       (eq (encode-char c '==ucs@cns)
+			   (encode-char c '==ucs@JP/hanazono))
+		       )))
 	 (put-char-attribute c '==ucs@JP/hanazono nil))
      nil)
    '==ucs@unicode)