diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-11-19 18:36:42 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-11-19 18:36:42 +0200 |
| commit | df7ed10e4f15d3ea8b4426f7721bafe60bf8deeb (patch) | |
| tree | 1488fc3b65d4bb9b5f0bb3a1228952d26cc00649 /lisp | |
| parent | 7851ae8b443c62a41ea4f4440512aa56cc87b9b7 (diff) | |
| download | emacs-df7ed10e4f15d3ea8b4426f7721bafe60bf8deeb.tar.gz emacs-df7ed10e4f15d3ea8b4426f7721bafe60bf8deeb.tar.bz2 emacs-df7ed10e4f15d3ea8b4426f7721bafe60bf8deeb.zip | |
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)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/international/mule.el | 6 |
1 files changed, 5 insertions, 1 deletions
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)) |