From 3f0709b328346d3729b2eab710fb5211a122e74f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 28 Jul 2018 20:34:57 +0300 Subject: [PATCH] Make 'tis620-2533' character set be an alias for 'thai-iso8859-11' * lisp/simple.el (what-cursor-position): Revert ad-hoc change to work around tis620-2533 charset. * lisp/w32-fns.el: Use thai-iso8859-11 instead of tis620-2533. * lisp/international/mule-conf.el (tis620-2533): Now an alias for thai-iso8859-11, not a separate character set. * lisp/international/fontset.el (charset-script-alist): Add thai-iso8859-11; fix entries for greek and hebrew. (font-encoding-alist, font-encoding-charset-alist): Use thai-iso8859-11 instead of tis620-2533. * lisp/descr-text.el (describe-char): Remove the ad-hoc code that assigns eight-bit-control characters to the eight-bit charset. --- lisp/descr-text.el | 6 ------ lisp/international/fontset.el | 9 +++++---- lisp/international/mule-conf.el | 9 +-------- lisp/language/thai.el | 4 ++-- lisp/simple.el | 2 +- lisp/w32-fns.el | 2 +- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 466e44aeee8..d8f8188eb1e 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -404,12 +404,6 @@ relevant to POS." (charset (if eight-bit-p 'eight-bit (or (get-text-property pos 'charset) (char-charset char)))) - ;; TIS620.2533 overlaps eight-bit-control, but we want to - ;; show eight-bit for raw bytes, not some obscure character - ;; set no one heard of. - (charset (if (eq charset 'tis620-2533) - 'eight-bit - charset)) (composition (find-composition pos nil nil t)) (component-chars nil) (display-table (or (window-display-table) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index a023d4fbc85..d4ade3cc4c0 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -79,7 +79,7 @@ ("cns11643.92p7-0" . chinese-cns11643-7) ("big5" . big5) ("viscii" . viscii) - ("tis620" . tis620-2533) + ("tis620" . thai-iso8859-11) ("microsoft-cp1251" . windows-1251) ("koi8-r" . koi8-r) ("jisx0213.2000-1" . japanese-jisx0213-1) @@ -139,7 +139,7 @@ (cyrillic-iso8859-5 . iso-8859-5) (greek-iso8859-7 . iso-8859-7) (arabic-iso8859-6 . iso-8859-6) - (thai-tis620 . tis620-2533) + (thai-tis620 . thai-iso8859-11) (latin-jisx0201 . jisx0201) (katakana-jisx0201 . jisx0201) (chinese-big5-1 . big5) @@ -1233,11 +1233,12 @@ Done when `mouse-set-font' is called." (latin-iso8859-15 . latin) (latin-iso8859-16 . latin) (latin-jisx0201 . latin) + (thai-iso8859-11 . thai) (thai-tis620 . thai) (cyrillic-iso8859-5 . cyrillic) (arabic-iso8859-6 . arabic) - (greek-iso8859-7 . latin) - (hebrew-iso8859-8 . latin) + (greek-iso8859-7 . greek) + (hebrew-iso8859-8 . hebrew) (katakana-jisx0201 . kana) (chinese-gb2312 . han) (chinese-gbk . han) diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index dc095707a2c..a635c677705 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -201,6 +201,7 @@ ;; plus nbsp (define-iso-single-byte-charset 'iso-8859-11 'thai-iso8859-11 "ISO/IEC 8859/11" "Latin/Thai" 166 ?T nil "8859-11") +(define-charset-alias 'tis620-2533 'thai-iso8859-11) ;; 8859-12 doesn't (yet?) exist. @@ -229,14 +230,6 @@ :code-space [32 127] :code-offset #x0E00) -;; Fixme: doc for this, c.f. above -(define-charset 'tis620-2533 - "TIS620.2533" - :short-name "TIS620.2533" - :ascii-compatible-p t - :code-space [0 255] - :superset '(ascii eight-bit-control (thai-tis620 . 128))) - (define-charset 'jisx0201 "JISX0201" :short-name "JISX0201" diff --git a/lisp/language/thai.el b/lisp/language/thai.el index a896fe59fd1..c655845e95d 100644 --- a/lisp/language/thai.el +++ b/lisp/language/thai.el @@ -36,7 +36,7 @@ "8-bit encoding for ASCII (MSB=0) and Thai TIS620 (MSB=1)." :coding-type 'charset :mnemonic ?T - :charset-list '(tis620-2533)) + :charset-list '(thai-iso8859-11)) (define-coding-system-alias 'th-tis620 'thai-tis620) (define-coding-system-alias 'tis620 'thai-tis620) @@ -47,7 +47,7 @@ (charset thai-tis620) (coding-system thai-tis620 iso-8859-11 cp874) (coding-priority thai-tis620) - (nonascii-translation . tis620-2533) + (nonascii-translation . iso-8859-11) (input-method . "thai-kesmanee") (unibyte-display . thai-tis620) (features thai-util) diff --git a/lisp/simple.el b/lisp/simple.el index a45e2597163..8d770478aa9 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1410,7 +1410,7 @@ in *Help* buffer. See also the command `describe-char'." (if (or (not coding) (eq (coding-system-type coding) t)) (setq coding (default-value 'buffer-file-coding-system))) - (if (and (>= char #x3fff80) (<= char #x3fffff)) + (if (eq (char-charset char) 'eight-bit) (setq encoding-msg (format "(%d, #o%o, #x%x, raw-byte)" char char char)) ;; Check if the character is displayed with some `display' diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 825420c4261..bdba32c8067 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -280,7 +280,7 @@ bit output with no translation." (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257) (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866) (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) - (w32-add-charset-info "tis620-2533" 'w32-charset-thai 874) + (w32-add-charset-info "iso8859-11" 'w32-charset-thai 874) (w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258) (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000) -- 2.39.2