[Emacs-diffs] trunk r114954: * test/automated/files.el (files-test-local-variable-data): Fix result typo

[Glenn Morris]

------------------------------------------------------------
revno: 114954
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-11-04 21:00:12 -0500
message:
  * test/automated/files.el (files-test-local-variable-data): Fix result typo
  presumably caused by interference from dir-locals.
  (file-test--do-local-variables-test): Prevent dir-locals interfering.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/files.el        files.el-20120808073143-2ikns3brqscsycpr-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-04 11:04:50 +0000
+++ b/test/ChangeLog    2013-11-05 02:00:12 +0000
@@ -1,3 +1,9 @@
+2013-11-05  Glenn Morris  <address@hidden>
+
+       * automated/files.el (files-test-local-variable-data):
+       Fix result typo presumably caused by interference from dir-locals.
+       (file-test--do-local-variables-test): Prevent dir-locals interfering.
+
 2013-11-04  Dmitry Gutov  <address@hidden>
 
        * indent/ruby.rb: Add a statement on the line after heredoc.

=== modified file 'test/automated/files.el'
--- a/test/automated/files.el   2013-07-11 16:00:05 +0000
+++ b/test/automated/files.el   2013-11-05 02:00:12 +0000
@@ -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 @@
          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)))))