Disable local eval: in some places

* tutorial.el (help-with-tutorial):
* emacs-lisp/copyright.el (copyright-update-directory):
* emacs-lisp/autoload.el (autoload-find-generated-file)
(autoload-find-file): Disable local eval: (for insurance).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d61d9d69b858d299366af7330ec3be354508f60..92afc1ab8575634f58871a1deca70b1a639c2074 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-10  Glenn Morris  <rgm@gnu.org>
+
+       * tutorial.el (help-with-tutorial):
+       * emacs-lisp/copyright.el (copyright-update-directory):
+       * emacs-lisp/autoload.el (autoload-find-generated-file)
+       (autoload-find-file): Disable local eval: (for insurance).
+
 2012-08-07  Glenn Morris  <rgm@gnu.org>
 
        * files.el (hack-local-variables-filter): If an eval: form is not

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 5af666b9dedda4b4e423953ea121a69649b7ac8b..e8dd9e8d1b4050cc44378894e30a5b3425d2b60a 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -201,7 +201,8 @@ or macro definition or a defcustom)."
 (defun autoload-find-generated-file ()
   "Visit the autoload file for the current buffer, and return its buffer.
 If a buffer is visiting the desired autoload file, return it."
-  (let ((enable-local-variables :safe))
+  (let ((enable-local-variables :safe)
+       (enable-local-eval nil))
     ;; We used to use `raw-text' to read this file, but this causes
     ;; problems when the file contains non-ASCII characters.
     (find-file-noselect
@@ -355,7 +356,8 @@ which lists the file name and which functions are in it, etc."
     (emacs-lisp-mode)
     (setq default-directory (file-name-directory file))
     (insert-file-contents file nil)
-    (let ((enable-local-variables :safe))
+    (let ((enable-local-variables :safe)
+         (enable-local-eval nil))
       (hack-local-variables))
     (current-buffer)))
 

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 09b456b54babb436ef99e02f0ced9e145afb30f1..0da5b2abbb8d41ab018216dcc39af8a105878d7a 100644 (file)
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -366,6 +366,7 @@ If FIX is non-nil, run `copyright-fix-years' instead."
       (find-file file)
       (let ((inhibit-read-only t)
            (enable-local-variables :safe)
+           (enable-local-eval nil)
            copyright-query)
        (if fix
            (copyright-fix-years)

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index b512700f5b93eb13b5a6b4c8f2f5ade5c4e04ee9..e43c878a17fb40b94c4f0c7d0f9500534272a7fb 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -830,7 +830,8 @@ Run the Viper tutorial? "))
         (if old-tut-file
             (progn
               (insert-file-contents (tutorial--saved-file))
-             (let ((enable-local-variables :safe))
+             (let ((enable-local-variables :safe)
+                    (enable-local-eval nil))
                (hack-local-variables))
               ;; FIXME?  What we actually want is to ignore dir-locals (?).
               (setq buffer-read-only nil) ; bug#11118
@@ -849,7 +850,8 @@ Run the Viper tutorial? "))
               (goto-char tutorial--point-before-chkeys)
               (setq tutorial--point-before-chkeys (point-marker)))
           (insert-file-contents (expand-file-name filename tutorial-directory))
-         (let ((enable-local-variables :safe))
+         (let ((enable-local-variables :safe)
+                (enable-local-eval nil))
            (hack-local-variables))
           ;; FIXME?  What we actually want is to ignore dir-locals (?).
           (setq buffer-read-only nil) ; bug#11118