diff options
| author | Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net> | 2023-01-17 20:08:15 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-01-22 16:05:39 +0200 |
| commit | 0fb90f524dbacf487bc9b9c2737e0ae3db5a3818 (patch) | |
| tree | f07a4eabeda324a3b1b7b5d5c4621bf31d53c178 | |
| parent | c854ef7a187a579ab1dc7e022a841b59c4361ebf (diff) | |
| download | emacs-0fb90f524dbacf487bc9b9c2737e0ae3db5a3818.tar.gz | |
Fix decoding HTML files from archives
* 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#61005)
This is the same fix as in #df7ed10e for
sgml-xml-auto-coding-function.
| -rw-r--r-- | lisp/international/mule.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index eddd7b6407a..52019697ad7 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -2540,6 +2540,10 @@ This function is intended to be added to `auto-coding-functions'." (bfcs-type (coding-system-type buffer-file-coding-system))) (if (and enable-multibyte-characters + ;; 'charset' will signal an error in + ;; coding-system-equal, since it isn't a + ;; coding-system. So test that up front. + (not (equal sym-type 'charset)) (coding-system-equal 'utf-8 sym-type) (coding-system-equal 'utf-8 bfcs-type)) buffer-file-coding-system |