From: tomo <tomo>
Date: Mon, 9 Aug 2010 17:08:02 +0000 (+0000)
Subject: (char-daikanwa-strokes): Fix problem when function
X-Git-Tag: chise-base-0_25-1^20~284
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=529d0316c83f606a02455dce6e48e0aa71cd3112;p=chise%2Fxemacs-chise.git-

(char-daikanwa-strokes): Fix problem when function
`char-representative-of-daikanwa' returns nil.
---

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 9608e52..8889ac3 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -265,8 +265,9 @@
     (setq radical ideographic-radical))
   (let ((drc (char-representative-of-daikanwa char radical))
 	(r (char-ideographic-radical char radical)))
-    (if (or (null r)
-	    (= (char-ideographic-radical drc radical) r))
+    (if (and drc
+	     (or (null r)
+		 (= (char-ideographic-radical drc radical) r)))
 	(setq char drc)))
   (char-ideographic-strokes char radical '(daikanwa)))