X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=337800549529f496adae34ecac263bc952673e10;hb=851e5e6185f0314fa8de8f2d1ff6690af8d42dda;hp=df81a7a0fead6dc34245ded8dc241ff5041c7c60;hpb=6a8868a6b55131aefb5d58a4829f1441c6f98eeb;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index df81a7a..3378005 100644
--- 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,33 +80,20 @@
    ((find-charset ka)
     (cond
      ((find-charset kb)
-      (cond
-       ((= (charset-dimension ka)
-	   (charset-dimension kb))
-	(cond ((= (charset-chars ka)(charset-chars kb))
-	       (if (charset-iso-final-char ka)
-		   (cond
-		    ((>= (charset-iso-final-char ka) ?@)
-		     (if (and (charset-iso-final-char kb)
-			      (>= (charset-iso-final-char kb) ?@))
-			 (< (charset-iso-final-char ka)
-			    (charset-iso-final-char kb))
-		       t))
-		    (t
-		     (if (charset-iso-final-char kb)
-			 (if (>= (charset-iso-final-char kb) ?@)
-			     nil
-			   (< (charset-iso-final-char ka)
-			      (charset-iso-final-char kb)))
-		       t)))
-		 (if (charset-iso-final-char kb)
-		     nil
-		   (< (charset-id ka)(charset-id kb)))))
-	      ((<= (charset-chars ka)(charset-chars 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
@@ -154,6 +142,7 @@
     chinese-gb12345
     latin-viscii
     ethiopic-ucs
+    =big5-cdp
     =gt
     ideograph-daikanwa-2
     ideograph-daikanwa
@@ -172,7 +161,6 @@
     ideograph-hanziku-12
     =big5
     =big5-eten
-    =big5-cdp
     =gt-k
     =jef-china3))
 
@@ -227,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