mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Always catch errors during configuration

Browse source
This commit is contained in:
John Wiegley 2017-12-03 10:57:42 -08:00
parent e5aa510d48
commit 223c321a1d
1 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1618,31 +1618,30 @@ no more than once."
(use-package-process-keywords name args (use-package-process-keywords name args
(and (plist-get args :demand) (and (plist-get args :demand)
(list :demand t)))))) (list :demand t))))))
(if (not (eq use-package-verbose 'debug)) (if use-package-expand-minimally
body body
`(condition-case-unless-debug err `(condition-case-unless-debug err
,body ,body
(error (error
(let ((msg (format "%s: %s" ',name (error-message-string err)))) (let ((msg (format "%s: %s" ',name (error-message-string err))))
(with-current-buffer (get-buffer-create "*use-package*") (when (eq use-package-verbose 'debug)
(goto-char (point-max)) (setq msg (concat msg " (see the *use-package* buffer)"))
(insert "-----\n" msg "\n\n" (with-current-buffer (get-buffer-create "*use-package*")
(pp-to-string ',`(use-package ,name ,@orig-args)) (goto-char (point-max))
"\n -->\n\n" (insert "-----\n" msg "\n\n"
(pp-to-string ',`(use-package ,name ,@args)) (pp-to-string ',`(use-package ,name ,@orig-args))
"\n ==>\n\n" "\n -->\n\n"
(pp-to-string (pp-to-string ',`(use-package ,name ,@args))
',(let ((use-package-verbose 'errors) "\n ==>\n\n"
(use-package-expand-minimally t)) (pp-to-string
(macroexp-progn ',(let ((use-package-verbose 'errors)
(use-package-process-keywords name args (use-package-expand-minimally t))
(and (plist-get args :demand) (macroexp-progn
(list :demand t))))))) (use-package-process-keywords name args
(emacs-lisp-mode)) (and (plist-get args :demand)
(ignore (list :demand t)))))))
(display-warning (emacs-lisp-mode)))
'use-package (concat msg " (see the *use-package* buffer)") (ignore (display-warning 'use-package msg :error)))))))))
:error)))))))))
;;;###autoload ;;;###autoload
(defmacro use-package (name &rest args) (defmacro use-package (name &rest args)