From: tomo <tomo>
Date: Mon, 16 Feb 2004 10:24:14 +0000 (+0000)
Subject: (char-attribute-name<): Fixed.
X-Git-Tag: r21-4-14-chise-0_21-24^2~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9aa64083b4fe3c65337e725adcf740965d7527ee;p=chise%2Fxemacs-chise.git

(char-attribute-name<): Fixed.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 5aaa6e2..01f6894 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -77,27 +77,6 @@
 
 (defun char-attribute-name< (ka kb)
   (cond
-   ((find-charset ka)
-    (cond
-     ((find-charset kb)
-      (if (<= (charset-id ka) 0)
-	  (if (<= (charset-id kb) 0)
-	      (cond
-	       ((= (charset-dimension ka)
-		   (charset-dimension kb))
-		(> (charset-id ka)(charset-id kb)))
-	       (t
-		(> (charset-dimension ka)
-		   (charset-dimension kb))
-		))
-	    t)
-	(if (<= (charset-id kb) 0)
-	    nil
-	  (< (charset-id ka)(charset-id kb)))))
-     ((symbolp kb)
-      nil)
-     (t
-      t)))
    ((eq '->denotational kb)
     t)
    ((eq '->subsumptive kb)
@@ -106,6 +85,23 @@
     nil)
    ((eq '->subsumptive ka)
     nil)
+   ((find-charset ka)
+    (if (find-charset kb)
+	(if (<= (charset-id ka) 0)
+	    (if (<= (charset-id kb) 0)
+		(cond
+		 ((= (charset-dimension ka)
+		     (charset-dimension kb))
+		  (> (charset-id ka)(charset-id kb)))
+		 (t
+		  (> (charset-dimension ka)
+		     (charset-dimension kb))
+		  ))
+	      t)
+	  (if (<= (charset-id kb) 0)
+	      nil
+	    (< (charset-id ka)(charset-id kb))))
+      nil))
    ((find-charset kb)
     t)
    ((symbolp ka)
@@ -528,7 +524,7 @@
 		     line-breaking)
 	   (format "(%-18s %s)\t; %c%s"
 		   name
-		   (mapconcat #'prin1-to-string
+		   (mapconcat (function prin1-to-string)
 			      value " ")
 		   (char-representative-of-daikanwa char)
 		   line-breaking)))