(J90-6D40): Unify JIS X 0208:1978 and 1983 code points.

[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 fa66bbc..b0d07b7 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -121,20 +121,18 @@
     (setq column (current-column)))
   (let (char-spec ret al cal key temp-char)
     (cond ((characterp char)
-          (cond ((setq ret (get-char-attribute char 'ucs))
-                 (unless (and (<= #xE000 ret)(<= ret #xF8FF))
-                   (setq char-spec (list (cons 'ucs ret))))
-                 (if (setq ret (get-char-attribute char 'chinese-big5-cdp))
-                     (setq char-spec (cons (cons 'chinese-big5-cdp ret)
-                                           char-spec)))
+          (cond ((and (setq ret (get-char-attribute char 'ucs))
+                      (not (and (<= #xE000 ret)(<= ret #xF8FF))))
+                 (setq char-spec (list (cons 'ucs ret)))
                  (if (setq ret (get-char-attribute char 'name))
                      (setq char-spec (cons (cons 'name ret) char-spec)))
                  )
                 ((setq ret (split-char char))
                  (setq char-spec (list ret))
                  (dolist (ccs (delq (car ret) (charset-list)))
-                   (if (and (>= (charset-iso-final-char ccs) ?0)
-                            (setq ret (get-char-attribute char ccs)))
+                   (if (or (and (>= (charset-iso-final-char ccs) ?0)
+                                (setq ret (get-char-attribute char ccs)))
+                           (eq ccs 'ideograph-daikanwa))
                        (setq char-spec (cons (cons ccs ret) char-spec))))
                  (if (setq ret (get-char-attribute char 'name))
                      (setq char-spec (cons (cons 'name ret) char-spec)))