[Emacs-diffs] trunk r113325: automated/decoder-tests.el (decoder-tests-prefer-utf-8-read): Use with-coding-priority to avoid side-effect (Bug#14781).

[Kenichi Handa]

------------------------------------------------------------
revno: 113325 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: K. Handa <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-08 20:57:12 +0900
message:
  automated/decoder-tests.el (decoder-tests-prefer-utf-8-read): Use 
with-coding-priority to avoid side-effect (Bug#14781).
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/decoder-tests.el 
decodertests.el-20130523111713-8bd70mdz8ezekunl-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-07-05 14:06:14 +0000
+++ b/test/ChangeLog    2013-07-08 11:51:55 +0000
@@ -1,3 +1,8 @@
+2013-07-08  Kenichi Handa  <address@hidden>
+
+       * automated/decoder-tests.el (decoder-tests-prefer-utf-8-read):
+       Use with-ccoding-priority to avoid side-effect (Bug#14781).
+
 2013-07-05  Michael Albinus  <address@hidden>
 
        * automated/file-notify-tests.el

=== modified file 'test/automated/decoder-tests.el'
--- a/test/automated/decoder-tests.el   2013-06-28 14:39:08 +0000
+++ b/test/automated/decoder-tests.el   2013-07-08 11:51:42 +0000
@@ -213,10 +213,9 @@
 ;; PREFER is non-nil, prefer that coding system before reading.
 
 (defun decoder-tests-prefer-utf-8-read (file detect prefer)
-  (if prefer
-      (prefer-coding-system prefer))
   (with-temp-buffer
-    (insert-file-contents file)
+    (with-coding-priority (if prefer (list prefer))
+      (insert-file-contents file))
     (if (eq buffer-file-coding-system detect)
        nil
       (format "Invalid detection: %s" buffer-file-coding-system))))