(ideographic-radicals): Use `=ucs' instead of `ucs'.

(char-db-make-char-spec): Likewise; use `encode-char' instead of
`get-char-attribute' for it.
(char-db-insert-char-reference): Use `=ucs' instead of `ucs'.
(char-db-decode-isolated-char): Likewise.
(insert-char-attributes): Likewise.
(insert-char-data-with-variant): Likewise.
(insert-char-range-data): Likewise; use `encode-char' instead of
`get-char-attribute' for it.

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 3910477..f2397d4 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -65,7 +65,7 @@
   (let ((v (make-vector 215 nil))
        (i 1))
     (while (< i 215)
-      (aset v i (decode-char 'ucs (+ #x2EFF i)))
+      (aset v i (decode-char '=ucs (+ #x2EFF i)))
       (setq i (1+ i)))
     v))
 
@@ -177,9 +177,9 @@
 (defun char-db-make-char-spec (char)
   (let (ret char-spec)
     (cond ((characterp char)
-          (cond ((and (setq ret (get-char-attribute char 'ucs))
+          (cond ((and (setq ret (encode-char char '=ucs 'defined-only))
                       (not (and (<= #xE000 ret)(<= ret #xF8FF))))
-                 (setq char-spec (list (cons 'ucs ret)))
+                 (setq char-spec (list (cons '=ucs ret)))
                  (cond ((setq ret (get-char-attribute char 'name))
                         (setq char-spec (cons (cons 'name ret) char-spec))
                         )
@@ -354,7 +354,7 @@
             (insert separator)
             (insert ":char\t")
             (cond ((numberp value)
-                   (setq value (decode-char 'ucs value)))
+                   (setq value (decode-char '=ucs value)))
                    ;; ((consp value)
                    ;;  (setq value (or (find-char value)
                    ;;                  value)))
@@ -398,7 +398,7 @@
                 (decode-builtin-char ccs code-point))))
     (cond ((and (<= 0 (char-int ret))
                (<= (char-int ret) #x1F))
-          (decode-char 'ucs (+ #x2400 (char-int ret))))
+          (decode-char '=ucs (+ #x2400 (char-int ret))))
          ((= (char-int ret) #x7F)
           ?\u2421)
          (t ret))))
@@ -477,21 +477,21 @@
     (when (and (memq '=>ucs attributes)
               (setq value (get-char-attribute char '=>ucs)))
       (insert (format "(=>ucs\t\t. #x%04X)\t; %c%s"
-                     value (decode-char 'ucs value)
+                     value (decode-char '=ucs value)
                      line-breaking))
       (setq attributes (delq '=>ucs attributes))
       )
     (when (and (memq '=>ucs* attributes)
               (setq value (get-char-attribute char '=>ucs*)))
       (insert (format "(=>ucs*\t\t. #x%04X)\t; %c%s"
-                     value (decode-char 'ucs value)
+                     value (decode-char '=ucs value)
                      line-breaking))
       (setq attributes (delq '=>ucs* attributes))
       )
     (when (and (memq '=>ucs-gb attributes)
               (setq value (get-char-attribute char '=>ucs-gb)))
       (insert (format "(=>ucs-gb\t\t. #x%04X)\t; %c%s"
-                     value (decode-char 'ucs value)
+                     value (decode-char '=ucs value)
                      line-breaking))
       (setq attributes (delq '=>ucs-gb attributes))
       )
@@ -528,7 +528,7 @@
       (insert (format (if char-db-convert-obsolete-format
                          "(=>ucs\t\t. #x%04X)\t; %c%s"
                        "(->ucs\t\t. #x%04X)\t; %c%s")
-                     value (decode-char 'ucs value)
+                     value (decode-char '=ucs value)
                      line-breaking))
       (setq attributes (delq '->ucs attributes))
       )
@@ -712,7 +712,7 @@
       (while (consp value)
        (setq cell (car value))
        (if (integerp cell)
-           (setq cell (decode-char 'ucs cell)))
+           (setq cell (decode-char '=ucs cell)))
        (cond ((characterp cell)
               (if separator
                   (insert lbs))
@@ -841,7 +841,7 @@
                 (while (consp value)
                   (setq cell (car value))
                    (if (integerp cell)
-                      (setq cell (decode-char 'ucs cell)))
+                      (setq cell (decode-char '=ucs cell)))
                   (cond ((characterp cell)
                          (if separator
                              (insert lbs))
@@ -1026,7 +1026,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-variant (get-char-attribute variant '=ucs))
              (insert-char-data variant printable)))
       (setq variants (cdr variants))
       )))
@@ -1035,12 +1035,11 @@
   (let ((code min)
        char)
     (while (<= code max)
-      (setq char (decode-char 'ucs code))
-      (if (get-char-attribute char 'ucs)
+      (setq char (decode-char '=ucs code))
+      (if (encode-char char '=ucs 'defined-only)
          (insert-char-data-with-variant char nil 'no-ucs-variant
                                         script excluded-script))
-      (setq code (1+ code))
-      )))
+      (setq code (1+ code)))))
 
 (defun write-char-range-data-to-file (min max file
                                          &optional script excluded-script)