From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 19 Nov 2018 16:36:42 +0000 (+0200)
Subject: Fix decoding XML files encoded in ISO-8859
X-Git-Tag: emacs-26.1.91~104
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df7ed10;p=emacs.git

Fix decoding XML files encoded in ISO-8859

* lisp/international/mule.el (sgml-xml-auto-coding-function):
Avoid signaling an error from coding-system-equal when the XML
encoding tag specifies an encoding whose type is 'charset'.
(Bug#33429)
---

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 14888100020..979845b7233 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2500,7 +2500,11 @@ This function is intended to be added to `auto-coding-functions'."
                   (let ((sym-type (coding-system-type sym))
                         (bfcs-type
                          (coding-system-type buffer-file-coding-system)))
-                    (if (and (coding-system-equal 'utf-8 sym-type)
+                    ;; 'charset' will signal an error in
+                    ;; coding-system-equal, since it isn't a
+                    ;; coding-system.  So test that up front.
+                    (if (and (not (equal sym-type 'charset))
+                             (coding-system-equal 'utf-8 sym-type)
                              (coding-system-equal 'utf-8 bfcs-type))
                         buffer-file-coding-system
 		      sym))