From cca09170ad19eb3c357052550765a2788fabbb40 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 1 Aug 2011 11:54:09 -0400 Subject: [PATCH] * lisp/emacs-lisp/package.el (package-generate-autoloads): Load autoloads before binding generated-autoload-file. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef85ffab8a4..a3699fc999f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-08-01 Stefan Monnier + + * emacs-lisp/package.el (package-generate-autoloads): Load autoloads + before binding generated-autoload-file. + 2011-08-01 Deniz Dogan * net/rcirc.el (rcirc-handler-333): Clarify docstring. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index e42103a7a01..19e8375966b 100644 --- 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)))