[Emacs-diffs] trunk r114119: * lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing

[Stefan Monnier]

------------------------------------------------------------
revno: 114119
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-03 14:21:41 -0400
message:
  * lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing
  <pkg>-autoloads.el file stop us.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-03 16:23:10 +0000
+++ b/lisp/ChangeLog    2013-09-03 18:21:41 +0000
@@ -1,7 +1,10 @@
 2013-09-03  Stefan Monnier  <address@hidden>
 
+       * 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  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-08-28 17:57:12 +0000
+++ b/lisp/emacs-lisp/package.el        2013-09-03 18:21:41 +0000
@@ -464,7 +464,8 @@
             (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))))