Update copyright year to 2015

[gnu-emacs] / test / automated / files.el

diff --git a/test/automated/files.el b/test/automated/files.el
index f2d2192a420347d4e513dcf815900d8f133f52c0..0522e0c5c79428ef773b070a22344d3f2c6002f5 100644 (file)
--- a/test/automated/files.el
+++ b/test/automated/files.el
@@ -1,6 +1,6 @@
 ;;; files.el --- tests for file handling.
 
-;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -51,7 +51,7 @@
      (:all nil    (eq files-test-result nil))
      (:all maybe  (eq files-test-result t)) ; This combination is ambiguous.
      (maybe t     (eq files-test-result 'query))
-     (maybe nil   (eq files-test-result 'query))
+     (maybe nil   (eq files-test-result nil))
      (maybe maybe (eq files-test-result 'query)))
     ;; Unsafe local variable value
     (("files-test-result: t")
@@ -127,6 +127,8 @@ form.")
          files-test-safe-result nil)
     (let ((enable-local-variables (nth 0 test-settings))
          (enable-local-eval      (nth 1 test-settings))
+         ;; Prevent any dir-locals file interfering with the tests.
+         (enable-dir-local-variables nil)
          (files-test-queried nil))
       (hack-local-variables)
       (eval (nth 2 test-settings)))))
@@ -146,4 +148,25 @@ form.")
              (should (file-test--do-local-variables-test str subtest))))))
     (ad-disable-advice 'hack-local-variables-confirm 'around 'files-test)))
 
+(defvar files-test-bug-18141-file
+  (expand-file-name "data/files-bug18141.el.gz" (getenv "EMACS_TEST_DIRECTORY"))
+  "Test file for bug#18141.")
+
+(ert-deftest files-test-bug-18141 ()
+  "Test for http://debbugs.gnu.org/18141 ."
+  (skip-unless (executable-find "gzip"))
+  (let ((tempfile (make-temp-file "files-test-bug-18141" nil ".gz")))
+    (unwind-protect
+       (progn
+         (copy-file files-test-bug-18141-file tempfile t)
+         (with-current-buffer (find-file-noselect tempfile)
+           (set-buffer-modified-p t)
+           (save-buffer)
+           (should (eq buffer-file-coding-system 'iso-2022-7bit-unix))))
+      (delete-file tempfile))))
+
+
+;; Stop the above "Local Var..." confusing Emacs.
+\f
+
 ;;; files.el ends here