From: Stefan Monnier Date: Tue, 3 Sep 2013 18:21:41 +0000 (-0400) Subject: * lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~4 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14b511d4e562f5f15d4f3133be9bea7a1077ef70;p=emacs.git * lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing -autoloads.el file stop us. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fdd8bdabe64..d71087f8302 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,10 @@ 2013-09-03 Stefan Monnier + * emacs-lisp/package.el (package-activate-1): Don't let a missing + -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 diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index d02bcef08c6..7799ee23d62 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -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))))