From beb109d141270037456acd19ba02e5395d30d97f Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 22 Dec 1999 19:42:46 +0000 Subject: [PATCH] (ideograph-char<): Fixed. --- lisp/utf-2000/ideograph-util.el | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index 2133b1f..b051ead 100644 --- a/lisp/utf-2000/ideograph-util.el +++ b/lisp/utf-2000/ideograph-util.el @@ -158,18 +158,22 @@ nil) (t (< (car (cdr ra))(car (cdr rb)))))) (t (< (car ra)(car rb))))) - ((setq ra (get-char-attribute a 'ucs)) - (cond - ((setq rb (get-char-attribute b 'ucs)) - (< ra rb)))) - (t - (cond - ((setq ra (char-ideograph-strokes a)) - (cond ((setq rb (char-ideograph-strokes b)) - (cond ((= ra rb) - (not (char-ideograph-strokes b))) - ((< ra rb)))))) - ))))))) + (t))) + ((or (get-char-attribute b 'morohashi-daikanwa) + (get-char-attribute b 'non-morohashi)) + nil) + ((setq ra (get-char-attribute a 'ucs)) + (cond + ((setq rb (get-char-attribute b 'ucs)) + (< ra rb)))) + (t + (cond + ((setq ra (char-ideograph-strokes a)) + (cond ((setq rb (char-ideograph-strokes b)) + (cond ((= ra rb) + (not (char-ideograph-strokes b))) + ((< ra rb)))))) + ))))) (defun insert-ideograph-radical-char-data (radical) (let ((chars -- 1.7.10.4