[Emacs-diffs] /srv/bzr/emacs/trunk r106407: autoload.el fix for bug#10049

[Glenn Morris]

------------------------------------------------------------
revno: 106407
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-11-17 16:34:16 -0500
message:
  autoload.el fix for bug#10049
  
  * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads):
  Ignore buffer-local generated-autoload-file if it is the same
  as the global value.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/autoload.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-17 12:16:44 +0000
+++ b/lisp/ChangeLog    2011-11-17 21:34:16 +0000
@@ -1,3 +1,9 @@
+2011-11-17  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/autoload.el (autoload-generate-file-autoloads):
+       Ignore buffer-local generated-autoload-file if it is the same
+       as the global value.  (Bug#10049)
+
 2011-11-17  Juanma Barranquero  <address@hidden>
 
        * textmodes/reftex-toc.el (reftex-toc-return-marker, reftex-toc-help)

=== modified file 'lisp/emacs-lisp/autoload.el'
--- a/lisp/emacs-lisp/autoload.el       2011-05-19 06:04:16 +0000
+++ b/lisp/emacs-lisp/autoload.el       2011-11-17 21:34:16 +0000
@@ -514,6 +514,13 @@
             (let ((secondary-autoloads-file-buf
                    (if (local-variable-p 'generated-autoload-file)
                        (current-buffer))))
+             ;; Ignore a buffer-local setting if it points to the
+             ;; global value.  Otherwise we end up writing a mix of md5s
+             ;; and time-stamps to the global file.  (Bug#10049)
+             (and secondary-autoloads-file-buf
+                  outfile
+                  (not otherbuf)
+                  (setq secondary-autoloads-file-buf nil))
               (with-current-buffer (marker-buffer output-start)
                 (save-excursion
                   ;; Insert the section-header line which lists the file name