diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-03-15 02:47:42 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-03-15 02:47:42 -0400 |
| commit | 9748de389c3696d4d5445e2e826216c66277ef4e (patch) | |
| tree | 7e828718049628c48c28b1aa4f0ef132b87c7012 /lisp/use-package/use-package.el | |
| parent | 4ae584f3ff0e9bda05420ec3b8598e59374b0899 (diff) | |
| parent | 27cba067ee6c6aa93af4914d06db6e6ea876ed3d (diff) | |
| download | emacs-9748de389c3696d4d5445e2e826216c66277ef4e.tar.gz emacs-9748de389c3696d4d5445e2e826216c66277ef4e.tar.bz2 emacs-9748de389c3696d4d5445e2e826216c66277ef4e.zip | |
Merge pull request from npostavs/warning
use-package-expand: use display-warning
GitHub-reference: https://github.com/jwiegley/use-package/issues/162
Diffstat (limited to 'lisp/use-package/use-package.el')
| -rw-r--r-- | lisp/use-package/use-package.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 75d5ee6187c..0d295d192bb 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -282,9 +282,12 @@ then the expanded macros do their job silently." (defsubst use-package-expand (name label form) (declare (indent 1)) (and form - `(with-demoted-errors - ,(format "Failure in %s of %s: %%S" label name) - ,form))) + (let ((err (make-symbol "err")) + (fmt (format "Failure in %s of %s: %%S" label name))) + `(condition-case-unless-debug ,err + ,form + (error (display-warning 'use-package (format ,fmt ,err) :error) + nil))))) (defun use--package (name-symbol name-string args) "See docstring for `use-package'." |