From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Wed, 3 Mar 2021 09:49:43 +0000 (+0900)
Subject: (char-attribute-name<): Fix problem when comparing '=mj', `=>>mj' and
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=654b7cfbdae3d7ba1d190af85b448b17c66bad52;p=chise%2Fxemacs-chise.git

(char-attribute-name<): Fix problem when comparing '=mj', `=>>mj' and
`==mj'.
---

diff --git a/lisp/utf-2000/chise-subr.el b/lisp/utf-2000/chise-subr.el
index 87c0577..f0e65de 100644
--- a/lisp/utf-2000/chise-subr.el
+++ b/lisp/utf-2000/chise-subr.el
@@ -1,7 +1,7 @@
 ;;; chise-subr.el --- basic lisp subroutines for XEmacs CHISE
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
-;;   2010, 2011, 2012, 2013, 2014, 2015, 2020 MORIOKA Tomohiko.
+;;   2010, 2011, 2012, 2013, 2014, 2015, 2020, 2021 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -167,11 +167,17 @@
 		 (t nil))
 	      (cond
 	       ((eq ka '=mj)
-		t)
+		(not (eq kb '=mj))
+		)
 	       ((eq ka '==mj)
-		t)
+		(not (or (eq kb '=mj)
+			 (eq kb '=>>mj)
+			 (eq kb '==mj)))
+		)
 	       ((eq ka '=>>mj)
-		t)
+		(not (or (eq kb '=mj)
+			 (eq kb '=>>mj)))
+		)
 	       ((and (setq a-id (charset-id ka))
 		     (charset-id-adobe-japan1-p a-id))
 		(cond
@@ -189,9 +195,14 @@
 	       ((eq kb '=mj)
 		nil)
 	       ((eq kb '==mj)
-		nil)
+		(or (eq ka '=mj)
+		    (eq ka '=>>mj)
+		    (eq ka '==mj))
+		)
 	       ((eq kb '=>>mj)
-		nil)
+		(or (eq ka '=mj)
+		    (eq ka '=>>mj))
+		)
 	       ((and (setq b-id (charset-id kb))
 		     (charset-id-adobe-japan1-p b-id))
 		nil)