X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=7044aa9403b7753f26b81123a8faed93e171db45;hb=399cae61bc6f175584dad0416a2e50e86acdb2da;hp=423321e80c338ea40fbc1c27819e05b53826cf8f;hpb=efcd98968dda3c2fefae21cc2d84955e0eef337d;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 423321e..7044aa9 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -252,11 +252,11 @@
      '(> > > >))))
 
 (defun insert-ideograph-radical-char-data (radical)
-  (let* ((ideographic-radical radical)
-	 (chars
-	  (sort (copy-list (aref ideograph-radical-chars-vector radical))
-		(function ideograph-char<)))
-	 attributes ccss)
+  (let ((chars
+	 (sort (copy-list (aref ideograph-radical-chars-vector radical))
+	       (lambda (a b)
+		 (ideograph-char< a b radical))))
+	attributes ccss)
     (dolist (name (char-attribute-list))
       (unless (memq name char-db-ignored-attributes)
 	(if (find-charset name)
@@ -267,7 +267,11 @@
     (aset ideograph-radical-chars-vector radical chars)
     (dolist (char chars)
       (when (some (lambda (ccs)
-		    (encode-char char ccs))
+		    (let ((code (encode-char char ccs)))
+		      (and code
+			   ;;(not (memq ccs char-db-ignored-attributes))
+			   ;;(or (not (memq ccs '(ucs))
+			   (and (<= 0 code)(<= code #x10FFFF)))))
 		  ccss)
 	(insert-char-data char nil attributes ccss)))))