From: tomo <tomo>
Date: Thu, 18 Jul 2002 10:01:46 +0000 (+0000)
Subject: (insert-char-attributes): Don't insert attribute `composition' if
X-Git-Tag: r21-2-44-utf-2000-0_19-eten-n14~11
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=bad4a5deac421fe030cb942a9888ff40b0b1ba63;p=chise%2Fxemacs-chise.git-

(insert-char-attributes): Don't insert attribute `composition' if
argument `readable' is nil.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index d001d8a..4a706b7 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -731,10 +731,13 @@
 		      value line-breaking))
       (setq attributes (delq 'hanyu-dazidian-char attributes))
       )
-    (when (and (not readable)
-	       (memq '->ucs-variants attributes))
-      (setq attributes (delq '->ucs-variants attributes))
-      )
+    (unless readable
+      (when (memq '->ucs-variants attributes)
+	(setq attributes (delq '->ucs-variants attributes))
+	)
+      (when (memq 'composition attributes)
+	(setq attributes (delq 'composition attributes))
+	))
     (setq rest ccs-attributes)
     (while (and rest
 		(progn