From: tomo <tomo>
Date: Tue, 13 Apr 2004 06:59:00 +0000 (+0000)
Subject: (char-daikanwa): Prefer children to parents.
X-Git-Tag: r21-4-14-chise-0_21-26^2~30
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9ebbb78223e047fdc1001990e3527de9d62ba2e1;p=chise%2Fxemacs-chise.git.1

(char-daikanwa): Prefer children to parents.
---

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 44c5f04..2fc4402 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -474,18 +474,15 @@
 	    (unless (memq char checked)
 	      (catch 'tag
 		(let ((rest
-		       (append (get-char-attribute char '<-subsumptive)
-			       (get-char-attribute char '<-denotational)))
+		       (append (get-char-attribute char '->subsumptive)
+			       (get-char-attribute char '->denotational)))
 		      (i 0)
 		      sc)
 		  (setq checked (cons char checked))
 		  (while rest
 		    (setq sc (car rest))
-		    (when (setq ret (char-daikanwa sc radical checked))
-		      (throw 'tag
-			     (if (numberp ret)
-				 (list ret 0 i)
-			       (append ret (list i)))))
+		    (if (setq ret (char-daikanwa sc radical checked))
+			(throw 'tag ret))
 		    (setq checked (cons sc checked)
 			  rest (cdr rest)
 			  i (1+ i)))
@@ -500,12 +497,15 @@
 		    (setq checked (cons sc checked)
 			  rest (cdr rest)))
 		  (setq rest
-			(append (get-char-attribute char '->subsumptive)
-				(get-char-attribute char '->denotational)))
+			(append (get-char-attribute char '<-subsumptive)
+				(get-char-attribute char '<-denotational)))
 		  (while rest
 		    (setq sc (car rest))
-		    (if (setq ret (char-daikanwa sc radical checked))
-			(throw 'tag ret))
+		    (when (setq ret (char-daikanwa sc radical checked))
+		      (throw 'tag
+			     (if (numberp ret)
+				 (list ret 0 i)
+			       (append ret (list i)))))
 		    (setq checked (cons sc checked)
 			  rest (cdr rest))))))))))