From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Tue, 22 Nov 2016 15:34:16 +0000 (+0900)
Subject: (char-representative-of-daikanwa): Don't make temporal lists for
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9a1739618b9d0f79bca69c0f1069515598cf346a;p=chise%2Fxemacs-chise.git-

(char-representative-of-daikanwa): Don't make temporal lists for
`<-subsumptive' and `<-denotational'.
---

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 08365ed..6106cbc 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -1,7 +1,7 @@
 ;;; ideograph-util.el --- Ideographic Character Database utility
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
-;;   2009, 2010, 2012, 2014, 2015 MORIOKA Tomohiko.
+;;   2009, 2010, 2012, 2014, 2015, 2016 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Chaon model, ISO/IEC 10646, Unicode, UCS-4, MULE.
@@ -228,20 +228,29 @@
 		      (throw 'tag ret))
 		    (setq checked (cons sc checked)
 			  rest (cdr rest)))
-		  (setq rest
-			(append (if (setq ret (get-char-attribute
-					       char '<-subsumptive))
-				    (list ret))
-				(if (setq ret (get-char-attribute
-					       char '<-denotational))
-				    (list ret))))
-		  (while rest
-		    (setq sc (car rest))
-		    (when (setq ret (char-representative-of-daikanwa
-				     sc radical t checked))
-		      (throw 'tag ret))
-		    (setq checked (cons sc checked)
-			  rest (cdr rest))))))
+                  ;; (setq rest
+                  ;;       (append (get-char-attribute char '<-subsumptive)
+                  ;;               (get-char-attribute char '<-denotational)))
+                  ;; (while rest
+                  ;;   (setq sc (car rest))
+                  ;;   (when (setq ret (char-representative-of-daikanwa
+                  ;;                    sc radical t checked))
+                  ;;     (throw 'tag ret))
+                  ;;   (setq checked (cons sc checked)
+                  ;;         rest (cdr rest)))
+		  (when (setq sc (get-char-attribute char '<-subsumptive))
+		    (if (setq ret (char-representative-of-daikanwa
+				   sc radical t checked))
+			(throw 'tag ret)
+		      (setq checked (cons sc checked))
+		      nil))
+		  (when (setq sc (get-char-attribute char '<-denotational))
+		    (if (setq ret (char-representative-of-daikanwa
+				   sc radical t checked))
+			(throw 'tag ret)
+		      (setq checked (cons sc checked))
+		      nil))
+		  )))
 	    (unless ignore-default
 	      char)))))