From 83309518551aed90093423c1ca9ba9159c659035 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Fri, 27 Nov 2020 15:58:31 +0900 Subject: [PATCH] - Don't set `=ucs@JP/hanazono' to nil if `=ucs@JP/hanazono' has the same value as `=ucs@jis'. - Don't set `==ucs@JP/hanazono' to nil if `==ucs@JP/hanazono' has the same value as `==ucs@jis' or `==ucs@unicode' or `==ucs@cns'. --- lisp/utf-2000/maps-conf.el | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el index c81a0fa..8ca50c0 100644 --- a/lisp/utf-2000/maps-conf.el +++ b/lisp/utf-2000/maps-conf.el @@ -296,14 +296,23 @@ (lambda (c v) (if (and (setq j-chr (decode-char '=ucs@JP v)) (not (eq j-chr c)) - (null (encode-char c '=ucs))) + (null (encode-char c '=ucs)) + (not (eq (encode-char c '=ucs@jis) + (encode-char c '=ucs@JP/hanazono)))) (put-char-attribute c '=ucs@JP/hanazono nil)) nil) '=ucs@unicode) (map-char-attribute (lambda (c v) (if (and (setq j-chr (decode-char '==ucs@JP v)) - (not (eq j-chr c))) + (not (eq j-chr c)) + (not (or (eq (encode-char c '==ucs@jis) + (encode-char c '==ucs@JP/hanazono)) + (eq (encode-char c '==ucs@unicode) + (encode-char c '==ucs@JP/hanazono)) + (eq (encode-char c '==ucs@cns) + (encode-char c '==ucs@JP/hanazono)) + ))) (put-char-attribute c '==ucs@JP/hanazono nil)) nil) '==ucs@unicode) -- 1.7.10.4