summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-08-01 11:54:09 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2011-08-01 11:54:09 -0400
commitcca09170ad19eb3c357052550765a2788fabbb40 (patch)
treed059799771fcacc611352ee97081ff32c3d91baa /lisp/emacs-lisp
parent027b979ca027f82d4730e6548b2a714f71d0da0c (diff)
downloademacs-cca09170ad19eb3c357052550765a2788fabbb40.tar.gz
emacs-cca09170ad19eb3c357052550765a2788fabbb40.tar.bz2
emacs-cca09170ad19eb3c357052550765a2788fabbb40.zip
* lisp/emacs-lisp/package.el (package-generate-autoloads): Load autoloads
before binding generated-autoload-file.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el2
1 files changed, 1 insertions, 1 deletions
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)))