Rename `<-simplified-ideograph' to `<-simplified'.

[chise/xemacs-chise.git.1] / 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 c0f42b8..3378005 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -70,7 +70,8 @@
     v))
 
 (defvar char-db-feature-domains
-  '(ucs daikanwa cns gt jis jis/alt jis/a jis/b misc unknown))
+  '(ucs daikanwa cns gt jis jis/alt jis/a jis/b
+       jis-x0213 misc unknown))
 
 (defvar char-db-ignored-attributes nil)
 
@@ -79,14 +80,20 @@
    ((find-charset ka)
     (cond
      ((find-charset kb)
-      (cond
-       ((= (charset-dimension ka)
-          (charset-dimension kb))
-       (< (charset-id ka)(charset-id kb)))
-       (t
-       (> (charset-dimension ka)
-          (charset-dimension kb))
-       )))
+      (if (<= (charset-id ka) 0)
+         (if (<= (charset-id kb) 0)
+             (cond
+              ((= (charset-dimension ka)
+                  (charset-dimension kb))
+               (> (charset-id ka)(charset-id kb)))
+              (t
+               (> (charset-dimension ka)
+                  (charset-dimension kb))
+               ))
+           t)
+       (if (<= (charset-id kb) 0)
+           nil
+         (< (charset-id ka)(charset-id kb)))))
      ((symbolp kb)
       nil)
      (t
@@ -135,6 +142,7 @@
     chinese-gb12345
     latin-viscii
     ethiopic-ucs
+    =big5-cdp
     =gt
     ideograph-daikanwa-2
     ideograph-daikanwa
@@ -153,7 +161,6 @@
     ideograph-hanziku-12
     =big5
     =big5-eten
-    =big5-cdp
     =gt-k
     =jef-china3))
 
@@ -208,7 +215,7 @@
 (defun char-db-insert-char-spec (char &optional readable column)
   (unless column
     (setq column (current-column)))
-  (let (char-spec ret al cal key temp-char)
+  (let (char-spec al cal key temp-char)
     (setq char-spec (char-db-make-char-spec char))
     (unless (or (characterp char) ; char
                (condition-case nil