Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com

3 files changed, 65 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index d5bed2c8dfc..a9f6a7c0e9e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,15 @@
+2012-08-10  Glenn Morris  <rgm@gnu.org>
+
+        * automated/files.el (files-test-disable-local-variables): New test.
+
+2012-08-08  Glenn Morris  <rgm@gnu.org>
+
+        * automated/files.el: New file.
+
+2012-08-07  Glenn Morris  <rgm@gnu.org>
+
+        * automated/Makefile.in (all): Fix typo.
+
 2012-08-10  Dmitry Gutov  <dgutov@yandex.ru>
 
         * automated/ruby-mode-tests.el (ruby-should-indent):
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 4f2e8a59e49..5f92e21d91a 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -55,7 +55,7 @@ setwins=subdirs=`find . -type d -print`; \
            esac; \
         done
 
-all: test
+all: check
 
 doit:
 
diff --git a/test/automated/files.el b/test/automated/files.el
new file mode 100644
index 00000000000..e43d8c32f85
--- /dev/null
+++ b/test/automated/files.el
@@ -0,0 +1,52 @@
+;;; files.el --- tests for file handling.
+
+;; Copyright (C) 2012 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+
+(defvar files-test-var1 nil)
+
+(defun files-test-fun1 ()
+  (setq files-test-var1 t))
+
+(ert-deftest files-test-bug12155 ()
+  "Test for http://debbugs.gnu.org/12155 ."
+  (with-temp-buffer
+    (insert "text\n"
+            ";; Local Variables:\n"
+            ";; eval: (files-test-fun1)\n"
+            ";; End:\n")
+    (let ((enable-local-variables :safe)
+          (enable-local-eval 'maybe))
+      (hack-local-variables)
+      (should (eq files-test-var1 nil)))))
+
+(ert-deftest files-test-disable-local-variables ()
+  "Test that setting enable-local-variables to nil works."
+  (with-temp-buffer
+    (insert "text\n"
+            ";; Local Variables:\n"
+            ";; files-test-var1: t\n"
+            ";; End:\n")
+    (let ((enable-local-variables nil))
+      (hack-local-variables)
+      (should (eq files-test-var1 nil)))))
+
+;;; files.el ends here