use-package-expand: use display-warning

instead of with-demoted-errors. This prevents errors from getting lost
in the *Messages* buffer.

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 75d5ee6187c3e38b85ffab2859cde11216bbf48e..0d295d192bba92712d9b5453db6e0ca1460d1585 100644 (file)
--- 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'."