From: tomo <tomo>
Date: Mon, 24 Nov 2003 11:04:03 +0000 (+0000)
Subject: (char-attribute-name<): Use `charset-iso-final-char' again for ISO-IR
X-Git-Tag: r21-4-14-chise-0_21-9^2~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cfa29de4a63f43148b3bd5e1267f5c269541d402;p=chise%2Fxemacs-chise.git.1

(char-attribute-name<): Use `charset-iso-final-char' again for ISO-IR
coded-charsets.
(char-db-insert-char-spec): Delete unused local variable `ret'.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 311ac8c..ed05f01 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -79,18 +79,31 @@
    ((find-charset ka)
     (cond
      ((find-charset 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)
-	(< (charset-id ka)(charset-id kb))))
+      (if (and (charset-iso-final-char ka)
+	       (>= (charset-iso-final-char ka) ?@)
+	       (charset-iso-final-char kb)
+	       (>= (charset-iso-final-char kb) ?@))
+	  (cond
+	   ((= (charset-dimension ka)
+	       (charset-dimension kb))
+	    (< (charset-iso-final-char ka)
+	       (charset-iso-final-char 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)
+	  (< (charset-id ka)(charset-id kb)))))
      ((symbolp kb)
       nil)
      (t
@@ -212,7 +225,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