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

5 files changed, 38 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2e45204026..dc921213b42 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2012-08-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/copyright.el (copyright-update-directory): Logic fix.
+
+        * 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
+        known to be safe, and enable-local-variables is :safe, then ignore
+        the form totally, as is done for non-eval forms.  (Bug#12155)
+
 2012-08-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/rx.el (rx-constituents): Don't define as constant.
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 3fc185dda25..e6e2d1e60e0 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -228,7 +228,8 @@ expression, in which case we want to handle forms differently."
 (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
@@ -382,7 +383,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 8e96d95c5dd..c3616c6e490 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -362,10 +362,11 @@ If FIX is non-nil, run `copyright-fix-years' instead."
   (dolist (file (directory-files directory t match nil))
     (unless (file-directory-p file)
       (message "Updating file `%s'" file)
-      (find-file file)
-      (let ((inhibit-read-only t)
-            (enable-local-variables :safe)
-            copyright-query)
+      ;; FIXME we should not use find-file+save+kill.
+      (let ((enable-local-variables :safe)
+            (enable-local-eval nil))
+        (find-file file))
+      (let ((inhibit-read-only t))
         (if fix
             (copyright-fix-years)
           (copyright-update)))
diff --git a/lisp/files.el b/lisp/files.el
index c5651135dc1..a7c9a7f7db4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3102,11 +3102,16 @@ DIR-NAME is the name of the associated directory.  Otherwise it is nil."
               ;; Obey `enable-local-eval'.
               ((eq var 'eval)
                (when enable-local-eval
-                 (push elt all-vars)
-                 (or (eq enable-local-eval t)
-                     (hack-one-local-variable-eval-safep (eval (quote val)))
-                     (safe-local-variable-p var val)
-                     (push elt unsafe-vars))))
+                 (let ((safe (or (hack-one-local-variable-eval-safep
+                                  (eval (quote val)))
+                                 ;; In case previously marked safe (bug#5636).
+                                 (safe-local-variable-p var val))))
+                   ;; If not safe and e-l-v = :safe, ignore totally.
+                   (when (or safe (not (eq enable-local-variables :safe)))
+                     (push elt all-vars)
+                     (or (eq enable-local-eval t)
+                         safe
+                         (push elt unsafe-vars))))))
               ;; Ignore duplicates (except `mode') in the present list.
               ((and (assq var all-vars) (not (eq var 'mode))) nil)
               ;; Accept known-safe variables.
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index e0e2a82fab9..64879e5cfd5 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -829,7 +829,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
@@ -848,7 +849,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