[Emacs-diffs] /srv/bzr/emacs/trunk r106462: * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.

[Stefan Monnier]

------------------------------------------------------------
revno: 106462
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-11-21 09:22:02 -0500
message:
  * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/autoload.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-20 20:17:46 +0000
+++ b/lisp/ChangeLog    2011-11-21 14:22:02 +0000
@@ -1,6 +1,11 @@
+2011-11-21  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.
+
 2011-11-20  Stefan Monnier  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/autoload.el'
--- a/lisp/emacs-lisp/autoload.el       2011-11-17 21:34:16 +0000
+++ b/lisp/emacs-lisp/autoload.el       2011-11-21 14:22:02 +0000
@@ -512,15 +512,7 @@
 
           (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