aboutsummaryrefslogtreecommitdiffstats
path: root/test/src/coding-tests.el
diff options
context:
space:
mode:
authorEli Zaretskii2023-01-12 16:36:35 +0200
committerEli Zaretskii2023-01-12 16:36:35 +0200
commitcfd2b3504ab5de6eb5f3c7a0784cb447883e1326 (patch)
tree05cd282566387e4c469e44830f50586dd56ae026 /test/src/coding-tests.el
parent53b47df8229a3a54777940663edda28de0a01b90 (diff)
downloademacs-cfd2b3504ab5de6eb5f3c7a0784cb447883e1326.tar.gz
emacs-cfd2b3504ab5de6eb5f3c7a0784cb447883e1326.zip
Fix encoding with 'utf-8-auto'
* src/coding.c (encode_coding_utf_8): Fix encoding with 'utf-8-auto': it should produce BOM, per the documentation of the :bom attribute. (Bug#60750) * lisp/international/mule.el (define-coding-system): Doc fix. * test/src/coding-tests.el (coding-tests): Use 'with-coding-priority' instead of 'prefer-coding-system', as the latter has global persistent effect and affects further tests.
Diffstat (limited to 'test/src/coding-tests.el')
-rw-r--r--test/src/coding-tests.el30
1 files changed, 15 insertions, 15 deletions
diff --git a/test/src/coding-tests.el b/test/src/coding-tests.el
index 6bd8d1ae6c4..b27907027ba 100644
--- a/test/src/coding-tests.el
+++ b/test/src/coding-tests.el
@@ -148,21 +148,21 @@
148 148
149(defun coding-tests (content-type write-coding read-coding detected-coding 149(defun coding-tests (content-type write-coding read-coding detected-coding
150 &optional translator) 150 &optional translator)
151 (prefer-coding-system 'utf-8-auto) 151 (with-coding-priority '(utf-8-auto)
152 (let ((filename (coding-tests-filename content-type write-coding))) 152 (let ((filename (coding-tests-filename content-type write-coding)))
153 (with-temp-buffer 153 (with-temp-buffer
154 (let ((coding-system-for-read read-coding) 154 (let ((coding-system-for-read read-coding)
155 (contents (coding-tests-file-contents content-type)) 155 (contents (coding-tests-file-contents content-type))
156 (disable-ascii-optimization nil)) 156 (disable-ascii-optimization nil))
157 (if translator 157 (if translator
158 (setq contents (funcall translator contents))) 158 (setq contents (funcall translator contents)))
159 (insert-file-contents filename) 159 (insert-file-contents filename)
160 (if (and (coding-system-equal buffer-file-coding-system detected-coding) 160 (if (and (coding-system-equal buffer-file-coding-system detected-coding)
161 (string= (buffer-string) contents)) 161 (string= (buffer-string) contents))
162 nil 162 nil
163 (list buffer-file-coding-system 163 (list buffer-file-coding-system
164 (string-to-list (buffer-string)) 164 (string-to-list (buffer-string))
165 (string-to-list contents))))))) 165 (string-to-list contents))))))))
166 166
167(ert-deftest ert-test-coding-ascii () 167(ert-deftest ert-test-coding-ascii ()
168 (unwind-protect 168 (unwind-protect