aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/decoder-tests.el5
2 files changed, 7 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index aded5473304..458d4df1f39 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12013-07-08 Kenichi Handa <handa@gnu.org>
2
3 * automated/decoder-tests.el (decoder-tests-prefer-utf-8-read):
4 Use with-ccoding-priority to avoid side-effect (Bug#14781).
5
12013-07-05 Michael Albinus <michael.albinus@gmx.de> 62013-07-05 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * automated/file-notify-tests.el 8 * automated/file-notify-tests.el
diff --git a/test/automated/decoder-tests.el b/test/automated/decoder-tests.el
index e1b05faf3c0..2e99fd7f115 100644
--- a/test/automated/decoder-tests.el
+++ b/test/automated/decoder-tests.el
@@ -213,10 +213,9 @@
213;; PREFER is non-nil, prefer that coding system before reading. 213;; PREFER is non-nil, prefer that coding system before reading.
214 214
215(defun decoder-tests-prefer-utf-8-read (file detect prefer) 215(defun decoder-tests-prefer-utf-8-read (file detect prefer)
216 (if prefer
217 (prefer-coding-system prefer))
218 (with-temp-buffer 216 (with-temp-buffer
219 (insert-file-contents file) 217 (with-coding-priority (if prefer (list prefer))
218 (insert-file-contents file))
220 (if (eq buffer-file-coding-system detect) 219 (if (eq buffer-file-coding-system detect)
221 nil 220 nil
222 (format "Invalid detection: %s" buffer-file-coding-system)))) 221 (format "Invalid detection: %s" buffer-file-coding-system))))