From e36d208c694153bfb195a2750405483ebe306d8a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 4 Dec 2017 11:32:27 -0800 Subject: [PATCH] Expand use-package-core as a macro, to avoid load time dependency --- up-core.el | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/up-core.el b/up-core.el index d1732c3b2a2..b4d86971b9b 100644 --- a/up-core.el +++ b/up-core.el @@ -1348,24 +1348,24 @@ no keyword implies `:all'." ;;; The main macro ;; -(defun use-package-core (name args) - (let* ((args* (use-package-normalize-keywords name args)) - (use-package--form - (concat "\n\n" - (pp-to-string `(use-package ,name ,@args)) - "\n -->\n\n" - (pp-to-string `(use-package ,name ,@args*)) - "\n ==>\n\n" - (pp-to-string - (macroexp-progn - (let ((use-package-verbose 'errors) - (use-package-expand-minimally t)) - (use-package-process-keywords name args* - (and (plist-get args* :demand) - (list :demand t))))))))) - (use-package-process-keywords name args* - (and (plist-get args* :demand) - (list :demand t))))) +(defmacro use-package-core (name args) + `(let* ((args* (use-package-normalize-keywords ,name ,args)) + (use-package--form + (concat "\n\n" + (pp-to-string `(use-package ,name ,@,args)) + "\n -->\n\n" + (pp-to-string `(use-package ,name ,@args*)) + "\n ==>\n\n" + (pp-to-string + (macroexp-progn + (let ((use-package-verbose 'errors) + (use-package-expand-minimally t)) + (use-package-process-keywords name args* + (and (plist-get args* :demand) + (list :demand t))))))))) + (use-package-process-keywords name args* + (and (plist-get args* :demand) + (list :demand t))))) ;;;###autoload (defmacro use-package (name &rest args) -- 2.39.2