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

<pkg>-autoloads.el file stop us.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdd8bdabe641b8df1874648f8c55868876dfe0b6..d71087f8302824ce7657b58bf61214ea96acec20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d02bcef08c6861ae48237934d8bf099b17af5b2c..7799ee23d62f38a1d4f6693b911ccfd44bdd7480 100644 (file)
--- 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))))