[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108096: Disable local eval: in some places

[Glenn Morris]

------------------------------------------------------------
revno: 108096
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-08-09 23:53:52 -0700
message:
  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).
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/autoload.el
  lisp/emacs-lisp/copyright.el
  lisp/tutorial.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-07 18:41:39 +0000
+++ b/lisp/ChangeLog    2012-08-10 06:53:52 +0000
@@ -1,3 +1,10 @@
+2012-08-10  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (hack-local-variables-filter): If an eval: form is not

=== modified file 'lisp/emacs-lisp/autoload.el'
--- a/lisp/emacs-lisp/autoload.el       2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/autoload.el       2012-08-10 06:53:52 +0000
@@ -201,7 +201,8 @@
 (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 @@
     (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)))
 

=== modified file 'lisp/emacs-lisp/copyright.el'
--- a/lisp/emacs-lisp/copyright.el      2012-03-16 16:36:27 +0000
+++ b/lisp/emacs-lisp/copyright.el      2012-08-10 06:53:52 +0000
@@ -366,6 +366,7 @@
       (find-file file)
       (let ((inhibit-read-only t)
            (enable-local-variables :safe)
+           (enable-local-eval nil)
            copyright-query)
        (if fix
            (copyright-fix-years)

=== modified file 'lisp/tutorial.el'
--- a/lisp/tutorial.el  2012-03-30 16:21:11 +0000
+++ b/lisp/tutorial.el  2012-08-10 06:53:52 +0000
@@ -830,7 +830,8 @@
         (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 @@
               (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