X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/c5e87d104b7342f35459c7513d6b4cefea1e968e..a8e1496d750ab0f571b3412ff61aaa4da640a036:/lisp/emacs-lisp/autoload.el

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 6d5067151d..b3ac23b2b7 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -514,6 +514,13 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
             (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