From: tomo <tomo>
Date: Tue, 18 Mar 2003 16:38:37 +0000 (+0000)
Subject: (char-representative-of-daikanwa): Use `encode-char' instead of
X-Git-Tag: r21-4-11-chise-0_21-=daikanwa-rev1+2^2~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19f75020882c8d66e421827f3dacaf9792e8eac2;p=chise%2Fxemacs-chise.git

(char-representative-of-daikanwa): Use `encode-char' instead of
`get-char-attribute' for `ideograph-daikanwa'; regard `=daikanwa-rev2'
as same as `ideograph-daikanwa'.
(char-daikanwa): Likewise.
---

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index e176fd9..5c9bccc 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -169,7 +169,8 @@
 
 ;;;###autoload
 (defun char-representative-of-daikanwa (char)
-  (if (get-char-attribute char 'ideograph-daikanwa)
+  (if (or (encode-char char 'ideograph-daikanwa 'defined-only)
+	  (encode-char char '=daikanwa-rev2 'defined-only))
       char
     (let ((m (get-char-attribute char 'morohashi-daikanwa))
 	  m-m m-s pat)
@@ -177,7 +178,8 @@
 	    (setq m-m (pop m))
 	    (setq m-s (pop m))
 	    (if (= m-s 0)
-		(decode-char 'ideograph-daikanwa m-m)
+		(or (decode-char '=daikanwa-rev2 m-m 'defined-only)
+		    (decode-char 'ideograph-daikanwa m-m))
 	      (when m
 		(setq pat (list m-m m-s))
 		(map-char-attribute (lambda (c v)
@@ -231,7 +233,8 @@
 
 ;;;###autoload
 (defun char-daikanwa (char)
-  (or (get-char-attribute char 'ideograph-daikanwa)
+  (or (encode-char char 'ideograph-daikanwa 'defined-only)
+      (encode-char char '=daikanwa-rev2 'defined-only)
       (get-char-attribute char 'morohashi-daikanwa)))
 
 ;;;###autoload