Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-20 20:07:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
<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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,7 +1,10 @@
2013-09-03 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/package.el (package-activate-1): Don't let a missing
<pkg>-autoloads.el file stop us.
* net/tramp.el (with-parsed-tramp-file-name): Silence compiler
warnings, and factor our common code.
warnings, and factor out common code.
2013-09-03 Dmitry Gutov <dgutov@yandex.ru>

3
lisp/emacs-lisp/package.el
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))))