From: tomo <tomo>
Date: Mon, 8 Sep 2008 15:00:36 +0000 (+0000)
Subject: (char-attribute-name<): Treat non-private final byte.
X-Git-Tag: r21-4-21-chise-0_24-=jis-x0213-1^20~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=03091002ee6d0871e515854a6bd41f4f8d198ea2;p=chise%2Fxemacs-chise.git.1

(char-attribute-name<): Treat non-private final byte.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 56da7a9..9a7e22b 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -168,7 +168,18 @@
 	      t)
 	  (if (<= (charset-id kb) 1)
 	      nil
-	    (< (charset-id ka)(charset-id kb))))
+	    (cond
+	     ((and (charset-final ka)
+		   (>= (charset-final ka) ?@))
+	      (if (and (charset-final kb)
+		       (>= (charset-final kb) ?@))
+		  (< (charset-final ka)(charset-final kb))
+		t))
+	     ((and (charset-final kb)
+		   (>= (charset-final kb) ?@))
+	      nil)
+	     (t
+	      (< (charset-id ka)(charset-id kb))))))
       nil))
    ((find-charset kb)
     t)