masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 11:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only emit the debugging context text once

Browse source
This commit is contained in:
John Wiegley 2017-12-03 22:54:34 -08:00
parent 35b975563c
commit f08f8a7ba9
1 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

46
up-core.el
View file

@ -1324,44 +1324,54 @@ no keyword implies `:all'."
;;; The main macro ;;; The main macro
;; ;;
(defun use-package-hush (name args args* expanded body) (defsubst use-package-hush (context body)
`((condition-case-unless-debug err `((condition-case-unless-debug err
,(macroexp-progn body) ,(macroexp-progn body)
(error (error (,context err)))))
(let ((msg (format "%s: %s" ',name (error-message-string err))))
(defun use-package-core (name args)
(let ((context (gensym "use-package--warning"))
(args* (use-package-normalize-keywords name args))
(use-package--hush-function #'identity))
(if use-package-expand-minimally
(funcall use-package--hush-function
(use-package-process-keywords name args*
(and (plist-get args* :demand)
(list :demand t))))
`((cl-flet
((,context
(err)
(let ((msg (format "%s: %s" ',name
(error-message-string err))))
,(when (eq use-package-verbose 'debug) ,(when (eq use-package-verbose 'debug)
`(progn `(progn
(setq msg (concat msg " (see the *use-package* buffer)")) (setq msg (concat msg " (see the *use-package* buffer)"))
(with-current-buffer (get-buffer-create "*use-package*") (with-current-buffer (get-buffer-create "*use-package*")
(goto-char (point-max)) (goto-char (point-max))
(insert "-----\n" msg (insert
"-----\n" msg
,(concat ,(concat
"\n\n" "\n\n"
(pp-to-string `(use-package ,name ,@args)) (pp-to-string `(use-package ,name ,@args))
"\n -->\n\n" "\n -->\n\n"
(pp-to-string `(use-package ,name ,@args*)) (pp-to-string `(use-package ,name ,@args*))
"\n ==>\n\n" "\n ==>\n\n"
(pp-to-string (macroexp-progn expanded)))) (pp-to-string
(emacs-lisp-mode)))) (macroexp-progn
(ignore (display-warning 'use-package msg :error)))))))
(defun use-package-core (name args)
(let* ((args* (use-package-normalize-keywords name args))
(use-package--hush-function
(if use-package-expand-minimally
#'identity
(let ((use-package--hush-function #'identity))
(apply-partially
#'use-package-hush name args args*
(let ((use-package-verbose 'errors) (let ((use-package-verbose 'errors)
(use-package-expand-minimally t)) (use-package-expand-minimally t))
(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))))))))
(emacs-lisp-mode))))
(ignore (display-warning 'use-package msg :error)))))
,(let ((use-package--hush-function
(apply-partially #'use-package-hush context)))
(macroexp-progn
(funcall use-package--hush-function (funcall use-package--hush-function
(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)))))))))))
;;;###autoload ;;;###autoload
(defmacro use-package (name &rest args) (defmacro use-package (name &rest args)