From: tomo <tomo>
Date: Thu, 13 Nov 2003 07:59:50 +0000 (+0000)
Subject: (char-attribute-name<): Prefer official CCSs; ignore
X-Git-Tag: r21-4-14-chise-0_21-4^2~5
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c63fb764f69dd9611e250d0898cd9285e3391d2;p=chise%2Fxemacs-chise.git.1

(char-attribute-name<): Prefer official CCSs; ignore
charset-dimensions of private CCSs.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index c0f42b8..311ac8c 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -79,14 +79,18 @@
    ((find-charset ka)
     (cond
      ((find-charset kb)
-      (cond
-       ((= (charset-dimension ka)
-	   (charset-dimension kb))
-	(< (charset-id ka)(charset-id kb)))
-       (t
-	(> (charset-dimension ka)
-	   (charset-dimension 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)
+	(< (charset-id ka)(charset-id kb))))
      ((symbolp kb)
       nil)
      (t