X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=593e21ce76ad6b7e9078a459aeae8b5dd95b758e;hb=ed79ca47b430a917433a5f779c37c2f7c8ee11ba;hp=44c5f049fbefbeb1790981dbf17d8baebf23ec02;hpb=019e5e8851884129784edefde4cb76f40286822f;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 44c5f04..593e21c 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -468,24 +468,24 @@
               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
-		       (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 +500,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))))))))))