From: Glenn Morris <rgm@gnu.org>
Date: Fri, 10 Aug 2012 06:56:01 +0000 (-0700)
Subject: * lisp/emacs-lisp/copyright.el (copyright-update-directory): Logic fix.
X-Git-Tag: emacs-24.2~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fbb5e3364871172431e32b4b722d1e1fd6312330;p=emacs.git

* lisp/emacs-lisp/copyright.el (copyright-update-directory): Logic fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92afc1ab857..65017383de8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 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)
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 0da5b2abbb8..889e3541455 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -363,11 +363,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)
-	    (enable-local-eval nil)
-	    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)))