* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9e653c5d7b89bb6966a7ccfa965f6adbdf54695..8df4a55b1a80affc614cadc76e9cbb35925704be 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
+2011-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.
+
 2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window.
+       * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame):
+       Use force-same-window.
 
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index b3ac23b2b76bd177d082a9db9fd663c953a2b8d0..df98271832a939caee4751b41e19b513ed58d3ce 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -512,15 +512,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
 
           (when output-start
             (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))
+                   (if otherbuf (current-buffer))))
               (with-current-buffer (marker-buffer output-start)
                 (save-excursion
                   ;; Insert the section-header line which lists the file name