[Emacs-diffs] /srv/bzr/emacs/trunk r105372: * lisp/emacs-lisp/package.el (package-generate-autoloads): Load autoloads

[Stefan Monnier]

------------------------------------------------------------
revno: 105372
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-08-01 11:54:09 -0400
message:
  * lisp/emacs-lisp/package.el (package-generate-autoloads): Load autoloads
  before binding generated-autoload-file.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-01 12:30:18 +0000
+++ b/lisp/ChangeLog    2011-08-01 15:54:09 +0000
@@ -1,3 +1,8 @@
+2011-08-01  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/package.el (package-generate-autoloads): Load autoloads
+       before binding generated-autoload-file.
+
 2011-08-01  Deniz Dogan  <address@hidden>
 
        * net/rcirc.el (rcirc-handler-333): Clarify docstring.

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2011-04-24 20:32:23 +0000
+++ b/lisp/emacs-lisp/package.el        2011-08-01 15:54:09 +0000
@@ -570,11 +570,11 @@
   file)
 
 (defun package-generate-autoloads (name pkg-dir)
+  (require 'autoload)         ;Load before we let-bind generated-autoload-file!
   (let* ((auto-name (concat name "-autoloads.el"))
         (ignore-name (concat name "-pkg.el"))
         (generated-autoload-file (expand-file-name auto-name pkg-dir))
         (version-control 'never))
-    (require 'autoload)
     (unless (fboundp 'autoload-ensure-default-file)
       (package-autoload-ensure-default-file generated-autoload-file))
     (update-directory-autoloads pkg-dir)))