(mapping-table-read-file): Use `=ucs' instead of `ucs'; use

`encode-char' instead of `get-char-attribute' for it.

diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el
index 46f9d8c..99751af 100644 (file)
--- a/lisp/utf-2000/read-maps.el
+++ b/lisp/utf-2000/read-maps.el
@@ -116,7 +116,7 @@
                              ucs-code)))
            (put-char-attribute chr ucs-ccs ucs-code))
          (when (and ucs
-                    (not (eq (or (get-char-attribute chr 'ucs)
+                    (not (eq (or (encode-char chr '=ucs 'defined-only)
                                  (and (not (eq ucs-ccs 'ucs-jis))
                                       (get-char-attribute chr '=>ucs)))
                              ucs)))