From: tomo <tomo>
Date: Fri, 16 Apr 2004 04:39:02 +0000 (+0000)
Subject: (char-daikanwa): Return value of `=>daikanwa' with subcode 0.
X-Git-Tag: r21-4-14-chise-0_21-26^2~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8176cef7d8cdc8908927f7bd54b2b84c47c9b352;p=chise%2Fxemacs-chise.git-

(char-daikanwa): Return value of `=>daikanwa' with subcode 0.
---

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 2fc4402..593e21c 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -468,9 +468,12 @@
               radical))
       (let ((ret (or (encode-char char 'ideograph-daikanwa 'defined-only)
                      (encode-char char '=daikanwa-rev2 'defined-only)
-                     (get-char-attribute char 'morohashi-daikanwa)
-                     (get-char-attribute char '=>daikanwa))))
+                     (get-char-attribute char 'morohashi-daikanwa))))
         (or ret
+	    (and (setq ret (get-char-attribute char '=>daikanwa))
+		 (if (numberp ret)
+		     (list ret 0)
+		   (append ret '(0))))
 	    (unless (memq char checked)
 	      (catch 'tag
 		(let ((rest