From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 21 Nov 2011 14:22:02 +0000 (-0500)
Subject: * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.
X-Git-Tag: emacs-pretest-24.0.92~99
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f04a3be94bbcfbf24baba836a1d5fb4099412b07;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9e653c5d7b..8df4a55b1a8 100644
--- 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 b3ac23b2b76..df98271832a 100644
--- 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