Commit 14b511d4 authored by Stefan Monnier's avatar Stefan Monnier

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

<pkg>-autoloads.el file stop us.
parent 9d3f707c
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>
......
......@@ -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))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment