summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-04-27 09:32:53 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-04-27 09:32:53 -0400
commit4fac34cee97a3a5c3ccd86ecdd598317d86102b8 (patch)
treee1d0c53adf962092e55ec650ce3ac4f11332c956 /lisp/emacs-lisp
parent8beecaeda0d28bff0c4d3c2758bb938c656728b5 (diff)
downloademacs-4fac34cee97a3a5c3ccd86ecdd598317d86102b8.tar.gz
emacs-4fac34cee97a3a5c3ccd86ecdd598317d86102b8.tar.bz2
emacs-4fac34cee97a3a5c3ccd86ecdd598317d86102b8.zip
* lisp/emacs-lisp/package.el (package-autoload-ensure-default-file):
Add current dir to the load-path. (package-generate-autoloads): Don't rely on autoload-ensure-default-file.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 605d1cf375c..c80b8d970dc 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -588,7 +588,8 @@ EXTRA-PROPERTIES is currently unused."
(concat ";;; " (file-name-nondirectory file)
" --- automatically extracted autoloads\n"
";;\n"
- ";;; Code:\n\n"
+ ";;; Code:\n"
+ "(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))\n"
" \n;; Local Variables:\n"
";; version-control: never\n"
";; no-byte-compile: t\n"
@@ -605,8 +606,7 @@ EXTRA-PROPERTIES is currently unused."
;;(ignore-name (concat name "-pkg.el"))
(generated-autoload-file (expand-file-name auto-name pkg-dir))
(version-control 'never))
- (unless (fboundp 'autoload-ensure-default-file)
- (package-autoload-ensure-default-file generated-autoload-file))
+ (package-autoload-ensure-default-file generated-autoload-file)
(update-directory-autoloads pkg-dir)
(let ((buf (find-buffer-visiting generated-autoload-file)))
(when buf (kill-buffer buf)))))