From 087aa26d276de36e01af429db033e10a271589aa Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 26 Nov 2003 08:24:54 +0000 Subject: [PATCH] (char-attribute-name<): Use only `charset-id' again. --- lisp/utf-2000/char-db-util.el | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index ed05f01..e2be819 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -79,30 +79,19 @@ ((find-charset ka) (cond ((find-charset 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) + (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) -- 1.7.10.4