From: tomo <tomo>
Date: Tue, 1 Nov 2011 16:22:41 +0000 (+0000)
Subject: Don't add `=>jis-x0208' if `=+>jis-x0208' is defined to cover it.
X-Git-Tag: r21-4-22-chise-0_25-11^20~333
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f1159cdeb951c9b75ecd8f90f001eb9dffc4174;p=chise%2Fxemacs-chise.git-

Don't add `=>jis-x0208' if `=+>jis-x0208' is defined to cover it.
---

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index df93a5d..fe6432b 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -204,8 +204,9 @@
       (unless (eq code #x332A)
 	(when (setq char (decode-char '=>jis-x0208@1997 code 'defined-only))
 	  (unless (eq (encode-char char '=>>jis-x0208) code)
-	    (put-char-attribute char '=>jis-x0208 code)
-	    (remove-char-attribute char '=>jis-x0208@1997))))
+	    (unless (eq (encode-char char '=+>jis-x0208) code)
+	      (put-char-attribute char '=>jis-x0208 code)
+	      (remove-char-attribute char '=>jis-x0208@1997)))))
       )))
 
 (map-char-attribute