(insert-char-attributes): Ignore `->ucs-unified' instead of

`->ucs-variants' when `readable' is non-nil.
(insert-char-data-with-variant): Rename `no-ucs-variant' to
`no-ucs-unified'.
(insert-char-range-data): Likewise.

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index a974983..c4e288f 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -847,8 +847,8 @@
       (setq attributes (delq 'hanyu-dazidian-char attributes))
       )
     (unless readable
-      (when (memq '->ucs-variants attributes)
-       (setq attributes (delq '->ucs-variants attributes))
+      (when (memq '->ucs-unified attributes)
+       (setq attributes (delq '->ucs-unified attributes))
        )
       (when (memq 'composition attributes)
        (setq attributes (delq 'composition attributes))
@@ -1056,7 +1056,7 @@
     ))
 
 (defun insert-char-data-with-variant (char &optional printable
-                                          no-ucs-variant
+                                          no-ucs-unified
                                           script excluded-script)
   (insert-char-data char printable)
   (let ((variants (or (char-variants char)
@@ -1073,7 +1073,7 @@
               (or (null excluded-script)
                   (null (setq vs (get-char-attribute variant 'script)))
                   (not (memq excluded-script vs))))
-         (or (and no-ucs-variant (get-char-attribute variant '=ucs))
+         (or (and no-ucs-unified (get-char-attribute variant '=ucs))
              (insert-char-data variant printable)))
       (setq variants (cdr variants))
       )))
@@ -1084,7 +1084,7 @@
     (while (<= code max)
       (setq char (decode-char '=ucs code))
       (if (encode-char char '=ucs 'defined-only)
-         (insert-char-data-with-variant char nil 'no-ucs-variant
+         (insert-char-data-with-variant char nil 'no-ucs-unified
                                         script excluded-script))
       (setq code (1+ code)))))