From: tomo <tomo>
Date: Mon, 12 Apr 2004 05:55:37 +0000 (+0000)
Subject: (jp-jouyou-read-file): Check `<-simplified' and
X-Git-Tag: r21-4-14-chise-0_21-26^2~45
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=535bc17bc56f1c40eeeb6d8d7c282a7b31509d7b;p=chise%2Fxemacs-chise.git

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

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index 54f27e4..43f27f8 100644
--- 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)))