X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fread-maps.el;h=d9974c3b3cd37376af12401b7b52865e875abe9a;hb=ffe143c4a3bf580720cd2774d8b0122256b295c5;hp=a7643150ed6054a21c40bed76eb7b4cb394972af;hpb=9b1f8909906a28f9f25a475600c3199416024fd8;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index a764315..d9974c3 100644
--- 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