1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

Fix mule-tests under en_US.UTF-8 locale

* test/lisp/international/mule-tests.el (sgml-html-meta-utf-8):
Accept also utf-8-unix/dos/whatever.  (Bug#61534)

* lisp/international/mule.el
(sgml-html-meta-auto-coding-function): Fix comparison when
buffer-file-coding-system is of type 'charset'.
This commit is contained in:
Eli Zaretskii 2023-02-15 21:00:54 +02:00
parent 3279530993
commit 2550e8bb0b
2 changed files with 2 additions and 1 deletions

View File

@ -2544,6 +2544,7 @@ This function is intended to be added to `auto-coding-functions'."
;; coding-system-equal, since it isn't a
;; coding-system. So test that up front.
(not (equal sym-type 'charset))
(not (equal bfcs-type 'charset))
(coding-system-equal 'utf-8 sym-type)
(coding-system-equal 'utf-8 bfcs-type))
buffer-file-coding-system

View File

@ -99,7 +99,7 @@ provide HTML fragments. Some tests override those variables."
(ert-deftest sgml-html-meta-utf-8 ()
"Baseline: UTF-8."
(should (eq 'utf-8 (sgml-html-meta-run "utf-8"))))
(should (eq 'utf-8 (coding-system-base (sgml-html-meta-run "utf-8")))))
(ert-deftest sgml-html-meta-windows-hebrew ()
"A non-Unicode charset."