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

[gnu-emacs] / lisp / emacs-lisp / copyright.el

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 8e96d95c5dd0bfe00793b3e7fba1bc0103137812..c3616c6e490a4264e738d9823df207a8d887e9e0 100644 (file)
--- 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)))