1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 15:00:34 -08:00

* lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing

<pkg>-autoloads.el file stop us.
This commit is contained in:
Stefan Monnier 2013-09-03 14:21:41 -04:00
parent 9d3f707c59
commit 14b511d4e5
2 changed files with 6 additions and 2 deletions

View file

@ -464,7 +464,8 @@ Return the max version (as a string) if the package is held at a lower version."
(package-desc-full-name pkg-desc)))
;; Add to load path, add autoloads, and activate the package.
(let ((old-lp load-path))
(load (expand-file-name (format "%s-autoloads" name) pkg-dir) nil t)
(with-demoted-errors
(load (expand-file-name (format "%s-autoloads" name) pkg-dir) nil t))
(when (and (eq old-lp load-path)
(not (or (member pkg-dir load-path)
(member pkg-dir-dir load-path))))