[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108097: * lisp/emacs-lisp/copyright.el (copyright-update-directory): Logic fix.

[Glenn Morris]

------------------------------------------------------------
revno: 108097
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-08-09 23:56:01 -0700
message:
  * lisp/emacs-lisp/copyright.el (copyright-update-directory): Logic fix.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/copyright.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-10 06:53:52 +0000
+++ b/lisp/ChangeLog    2012-08-10 06:56:01 +0000
@@ -1,5 +1,7 @@
 2012-08-10  Glenn Morris  <address@hidden>
 
+       * 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)

=== modified file 'lisp/emacs-lisp/copyright.el'
--- a/lisp/emacs-lisp/copyright.el      2012-08-10 06:53:52 +0000
+++ b/lisp/emacs-lisp/copyright.el      2012-08-10 06:56:01 +0000
@@ -363,11 +363,11 @@
   (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)))