From: tomo <tomo>
Date: Sun, 3 Nov 2002 09:23:22 +0000 (+0000)
Subject: (mapping-table-read-file): Use `encode-char' with `defined-only' mode
X-Git-Tag: r21-4-9-utf-2000-0_19-cb-2~49
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=84d0738d9c9c64ec0ced1f51f7e0b8a8954577bc;p=chise%2Fxemacs-chise.git

(mapping-table-read-file): Use `encode-char' with `defined-only' mode
instead of `get-char-attribute' to support inheritance of
coded-charsets.
- Add C3-to-UCS.txt to the check list.
---

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index f9e7410..788410d 100644
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -105,7 +105,9 @@
 		   "[ \t]*U[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)")
 		  (string-to-int (match-string 1) 16)))
 	(when (setq chr (decode-char ccs code))
-	  (unless (eq (get-char-attribute chr ccs) code)
+	  (unless (eq (encode-char chr ccs 'defined-only)
+		      ;; (get-char-attribute chr ccs)
+		      code)
 	    (put-char-attribute chr ccs code))
 	  (when (and ucs-code
 		     (not (eq (or (get-char-attribute chr ucs-ccs)
@@ -127,7 +129,7 @@
 
 (dolist (file '("J90-to-UCS.txt" "JSP-to-UCS.txt"
 		"JX1-to-UCS.txt" "JX2-to-UCS.txt"
-		;; "C3-to-UCS.txt" ; "C4-to-UCS.txt"
+		"C3-to-UCS.txt" ; "C4-to-UCS.txt"
 		"B-to-UCS.txt" "JC3-to-UCS.txt"))
   (mapping-table-read-file (expand-file-name file "../etc/char-data/")))