diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-05-17 06:45:36 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-05-17 06:45:36 -0500 |
| commit | 2d67e1dca1bf7cf55a80c5acc906df98a8fe42cd (patch) | |
| tree | 2e4382d48e6ae2e8253b79365bc1c57efe908847 /lisp/use-package | |
| parent | a4939e7ef349e0faa0a0ec45e50a5d0821c96c07 (diff) | |
| parent | 1c82b2377ffb2e05e60c6b3232c2555d1f66355c (diff) | |
| download | emacs-2d67e1dca1bf7cf55a80c5acc906df98a8fe42cd.tar.gz emacs-2d67e1dca1bf7cf55a80c5acc906df98a8fe42cd.tar.bz2 emacs-2d67e1dca1bf7cf55a80c5acc906df98a8fe42cd.zip | |
Merge pull request from thomasf/master
Don't abort compiling package loading fails
GitHub-reference: https://github.com/jwiegley/use-package/issues/106
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/use-package.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 0012d26597d..7b370380d4b 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -402,9 +402,10 @@ For full documentation. please see commentary. (eval-when-compile (when (bound-and-true-p byte-compile-current-file) ,@defines-eval - ,(if (stringp name) - `(load ,name t) - `(require ',name nil t)))) + (with-demoted-errors + ,(if (stringp name) + `(load ,name t) + `(require ',name nil t))))) ,(if (and (or commands (use-package-plist-get args :defer)) (not (use-package-plist-get args :demand))) |