Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru

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

diff --git a/test/automated/files.el b/test/automated/files.el
index f2d2192a420347d4e513dcf815900d8f133f52c0..44816bc33f5357a6b7413dcd88471ac87a1d8db8 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-2014 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,7 @@ form.")
              (should (file-test--do-local-variables-test str subtest))))))
     (ad-disable-advice 'hack-local-variables-confirm 'around 'files-test)))
 
+;; Stop the above "Local Var..." confusing Emacs.
+\f
+
 ;;; files.el ends here