Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

4 files changed, 13 insertions, 7 deletions

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index d4ade3cc4c0..9bd05ceb4a2 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" . thai-iso8859-11)
+        ("tis620" . tis620-2533)
         ("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 . thai-iso8859-11)
+        (thai-tis620 . tis620-2533)
         (latin-jisx0201 . jisx0201)
         (katakana-jisx0201 . jisx0201)
         (chinese-big5-1 . big5)
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index a635c677705..3affeec03ea 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -201,7 +201,6 @@
 ;; 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.
 
@@ -223,13 +222,20 @@
 ;; Can this be shared with 8859-11?
 ;; N.b. not all of these are defined in Unicode.
 (define-charset 'thai-tis620
-  "TIS620.2533"
+  "MULE charset for TIS620.2533"
   :short-name "TIS620.2533"
   :iso-final-char ?T
   :emacs-mule-id 133
   :code-space [32 127]
   :code-offset #x0E00)
 
+(define-charset 'tis620-2533
+  "TIS620.2533, a.k.a. TIS-620.  Like `thai-iso8859-11', but without NBSP."
+  :short-name "TIS620.2533"
+  :ascii-compatible-p t
+  :code-space [0 255]
+  :superset '(ascii (thai-tis620 . 128)))
+
 (define-charset 'jisx0201
   "JISX0201"
   :short-name "JISX0201"
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index c655845e95d..a896fe59fd1 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 '(thai-iso8859-11))
+  :charset-list '(tis620-2533))
 
 (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 . iso-8859-11)
+          (nonascii-translation . tis620-2533)
           (input-method . "thai-kesmanee")
           (unibyte-display . thai-tis620)
           (features thai-util)
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index bdba32c8067..a8a41c453a0 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -279,7 +279,7 @@ bit output with no translation."
   (w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254)
   (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-russian 28595)
   (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)