Sync with r21-2-44-utf-2000-0_18m-uj90.

[chise/xemacs-chise.git-] / lisp / utf-2000 / char-db-util.el

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 23615c4..4a706b7 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -74,11 +74,6 @@
 (defvar char-db-ignored-attributes nil)
 
 ;;;###autoload
-(defun char-ref-p (obj)
-  (and (consp obj)
-       (keywordp (car obj))))
-
-;;;###autoload
 (defun char-ref= (cr1 cr2)
   (cond ((char-ref-p cr1)
         (if (char-ref-p cr2)
@@ -736,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