From: Stefan Monnier Date: Sat, 27 Apr 2013 13:32:53 +0000 (-0400) Subject: * lisp/emacs-lisp/package.el (package-autoload-ensure-default-file): X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~358^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4fac34cee97a3a5c3ccd86ecdd598317d86102b8;p=emacs.git * 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 30c49c942c6..61d6af86d2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2013-04-27 Stefan Monnier + + * 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. + 2013-04-26 Reuben Thomas * textmodes/remember.el (remember-store-in-files): Document that 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)))))