From dc50338624a6440210f0b6c1df67cf9d1c33b0f8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 4 Nov 2013 21:00:12 -0500 Subject: [PATCH] * 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. --- test/ChangeLog | 6 ++++++ test/automated/files.el | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/ChangeLog b/test/ChangeLog index 1b5925d79c4..387a83f25ab 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2013-11-05 Glenn Morris + + * 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 * indent/ruby.rb: Add a statement on the line after heredoc. diff --git a/test/automated/files.el b/test/automated/files.el index 8ce2ed7230c..6ce1cbc2457 100644 --- a/test/automated/files.el +++ b/test/automated/files.el @@ -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))))) -- 2.39.2