From: tomo <tomo>
Date: Fri, 5 Nov 2004 03:08:24 +0000 (+0000)
Subject: (mapping-table-read-file): Fixed.
X-Git-Tag: r21-4-15-u2km-0_21-32-a~2^2~98
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2777c9d3c7e71ac7fe758768ca61d35f8677d716;p=chise%2Fxemacs-chise.git-

(mapping-table-read-file): Fixed.
---

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index c43d38b..34c413f 100644
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -128,9 +128,17 @@
 		      code)
 	    (put-char-attribute chr ccs code))
 	  (when (and ucs-code
-		     (not (eq (or (encode-char chr ucs-ccs 'defined-only)
-				  (char-feature chr '=>ucs))
-			      ucs-code)))
+		     (not
+		      (eq (or (encode-char chr ucs-ccs 'defined-only)
+			      (if (memq ucs-ccs '(ucs-jis
+						  =ucs-jis-1990
+						  =ucs-jis-2000
+						  ;; ucs-big5
+						  ))
+				  (encode-char chr '=ucs@jis/fw
+					       'defined-only)
+				(char-feature chr '=>ucs)))
+			  ucs-code)))
 	    (put-char-attribute chr ucs-ccs ucs-code))
 	  (when (and ucs
 		     (not (eq (or (encode-char chr '=ucs 'defined-only)