From b856f9b86618ef586606e3291812e9095176172b Mon Sep 17 00:00:00 2001 From: tomo Date: Sat, 20 Nov 2004 05:46:28 +0000 Subject: [PATCH] (mapping-table-read-file): Modify to support `=ucs@gb/fw'. --- lisp/utf-2000/read-maps.el | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el index a2a1f85..7ae6976 100644 --- a/lisp/utf-2000/read-maps.el +++ b/lisp/utf-2000/read-maps.el @@ -136,17 +136,17 @@ UCS-REGEXP is a regular expression to match against (put-char-attribute chr ccs code)) (when (and ucs-code (not - (eq (or (encode-char chr ucs-ccs 'defined-only) - (if (memq ucs-ccs '(=ucs@jis - =ucs@jis/1990 - =ucs@jis/2000 - )) - (encode-char chr '=ucs@jis/fw - 'defined-only) - (unless (memq ucs-ccs '(=ucs@gb - ;; ucs-big5 - )) - (char-feature chr '=>ucs)))) + (eq (or + (encode-char chr ucs-ccs 'defined-only) + (cond + ((memq ucs-ccs '(=ucs@jis + =ucs@jis/1990 + =ucs@jis/2000)) + (encode-char chr '=ucs@jis/fw 'defined-only)) + ((eq ucs-ccs '=ucs@gb) + (encode-char chr '=ucs@gb/fw 'defined-only)) + (t + (char-feature chr '=>ucs)))) ucs-code))) (put-char-attribute chr ucs-ccs ucs-code)) (when (and ucs -- 1.7.10.4