* lisp/emacs-lisp/package.el (package-generate-autoloads): Load autoloads

before binding generated-autoload-file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef85ffab8a47fb344cd3e535cb6ea07431966114..a3699fc999fa8e154b764ba59dffcb7aff13e0d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/package.el (package-generate-autoloads): Load autoloads
+       before binding generated-autoload-file.
+
 2011-08-01  Deniz Dogan  <deniz@dogan.se>
 
        * net/rcirc.el (rcirc-handler-333): Clarify docstring.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e42103a7a013891b38e41cb9fe7122ad040a8fb9..19e8375966b6448b7b5d3bcbf2d6b636b7812dab 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -570,11 +570,11 @@ EXTRA-PROPERTIES is currently unused."
   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)))