diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-03 14:21:41 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-03 14:21:41 -0400 |
| commit | 14b511d4e562f5f15d4f3133be9bea7a1077ef70 (patch) | |
| tree | 9e4611ffa95a10f57e425567bf5e595156c8d97f /lisp/emacs-lisp | |
| parent | 9d3f707c59f69f357c8ff2cdea313bfe771dbfc4 (diff) | |
| download | emacs-14b511d4e562f5f15d4f3133be9bea7a1077ef70.tar.gz emacs-14b511d4e562f5f15d4f3133be9bea7a1077ef70.tar.bz2 emacs-14b511d4e562f5f15d4f3133be9bea7a1077ef70.zip | |
* lisp/emacs-lisp/package.el (package-activate-1): Don't let a missing
<pkg>-autoloads.el file stop us.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 3 |
1 files changed, 2 insertions, 1 deletions
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)))) |