From: tomo <tomo>
Date: Mon, 4 Jun 2001 04:37:50 +0000 (+0000)
Subject: (char-db-insert-alist): Specify `none' as the third argument of
X-Git-Tag: r21-2-38-utf-2000-0_17-1~667
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2841fa9ec02c3e17f0d30836d515a8604154eb16;p=chise%2Fxemacs-chise.git-

(char-db-insert-alist): Specify `none' as the third argument of
`insert-char-attributes' if non-CCS attributes is not specified in a
value of `char' attribute.
(insert-char-attributes): Use nil as `attributes' if non-nil-list is
specified for the argument.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index a9a7717..3cec543 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -141,7 +141,7 @@
 		     (setq value (cdr value)))
 		   (insert-char-attributes ret
 					   readable
-					   al cal))
+					   (or al 'none) cal))
 	       (insert (prin1-to-string value)))
 	     (insert ")")
 	     (insert line-breaking))
@@ -191,7 +191,8 @@
 				    column)
   (setq attributes
 	(if attributes
-	    (copy-sequence attributes)
+	    (if (consp attributes)
+		(copy-sequence attributes))
 	  (sort (char-attribute-list) #'char-attribute-name<)))
   (setq ccs-attributes
 	(if ccs-attributes