From: tomo <tomo>
Date: Tue, 20 Nov 2001 17:21:24 +0000 (+0000)
Subject: (insert-char-attributes): Now return value of `char-attribute-list'
X-Git-Tag: no-et-1~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9b817a48e84943fb571c0666f94275960adf8bc;p=chise%2Fxemacs-chise.git

(insert-char-attributes): Now return value of `char-attribute-list'
includes names of CCS-attributes.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index bc8e6a5..50996cb 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -358,17 +358,23 @@
 (defun insert-char-attributes (char &optional readable
 				    attributes ccs-attributes
 				    column)
-  (setq attributes
-	(sort (if attributes
-		  (if (consp attributes)
-		      (copy-sequence attributes))
-		(char-attribute-list))
-	      #'char-attribute-name<))
-  (setq ccs-attributes
-	(sort (if ccs-attributes
-		  (copy-sequence ccs-attributes)
-		(charset-list))
-	      #'char-attribute-name<))
+  (let (atr-d ccs-d)
+    (setq attributes
+	  (sort (if attributes
+		    (if (consp attributes)
+			(copy-sequence attributes))
+		  (dolist (name (char-attribute-list))
+		    (if (find-charset name)
+			(push name ccs-d)
+		      (push name atr-d)))
+		  atr-d)
+		#'char-attribute-name<))
+    (setq ccs-attributes
+	  (sort (if ccs-attributes
+		    (copy-sequence ccs-attributes)
+		  (or ccs-d
+		      (charset-list)))
+		#'char-attribute-name<)))
   (unless column
     (setq column (current-column)))
   (let (name value has-long-ccs-name rest