(authors-scan-change-log)

(authors-scan-el): Don't enable local eval; enable only safe local
variables, without querying.

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf6bca5c8bb..f01bd382265 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,6 +17,10 @@
 
         * doc-view.el (doc-view-cache-directory): Remove superfluous concat.
 
+        * emacs-lisp/authors.el (authors-scan-change-log)
+        (authors-scan-el): Don't enable local eval; enable only safe local
+        variables, without querying.
+
         * mail/footnote.el (footnote-numeric-regexp)
         (footnote-english-upper-regexp, footnote-english-lower-regexp)
         (footnote-roman-lower-regexp, footnote-roman-upper-regexp):
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 4b490621f51..50d2f41f7ae 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -475,8 +475,8 @@ with the file and the number of each action.
 :wrote          means the author wrote the file
 :changed        means he changed the file COUNT times."
 
-  (let* ((enable-local-variables t)
-         (enable-local-eval t)
+  (let* ((enable-local-variables :safe)
+         (enable-local-eval nil)
          (existing-buffer (get-file-buffer log-file))
          (buffer (find-file-noselect log-file))
          author file pos)
@@ -521,8 +521,8 @@ with the file and the number of each action.
   "Scan Lisp file FILE for author information.
 TABLE is a hash table to add author information to."
   (let* ((existing-buffer (get-file-buffer file))
-         (enable-local-variables t)
-         (enable-local-eval t)
+         (enable-local-variables :safe)
+         (enable-local-eval nil)
          (buffer (find-file-noselect file)))
     (save-excursion
       (set-buffer buffer)