mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 02:50:26 -08:00
Code Issues Projects Releases Wiki Activity

Merge pull request from thomasf/master

Browse source 
Don't abort compiling package loading fails
GitHub-reference: https://github.com/jwiegley/use-package/issues/106
This commit is contained in:
John Wiegley 2014-05-17 06:45:36 -05:00
commit 2d67e1dca1
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/use-package/use-package.el
View file

@ -402,9 +402,10 @@ For full documentation. please see commentary.
(eval-when-compile (eval-when-compile
(when (bound-and-true-p byte-compile-current-file) (when (bound-and-true-p byte-compile-current-file)
,@defines-eval ,@defines-eval
,(if (stringp name) (with-demoted-errors
`(load ,name t) ,(if (stringp name)
`(require ',name nil t)))) `(load ,name t)
`(require ',name nil t)))))
,(if (and (or commands (use-package-plist-get args :defer)) ,(if (and (or commands (use-package-plist-get args :defer))
(not (use-package-plist-get args :demand))) (not (use-package-plist-get args :demand)))