From 193c80f6507ca0f5753cc38df9c46a0a7208013e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 31 Jan 2017 19:41:07 -0500 Subject: [PATCH] Fix package! not stripping out properties + refactor --- core/core-packages.el | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 231ad3ebf..04daae07a 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -138,20 +138,17 @@ symbol and cdr is a plist. The plist accepts any argument `quelpa-use-package' uses." (declare (indent defun)) (let ((use-package-always-ensure doom-auto-install-p) - recipe) - (when (plist-member plist :quelpa) - (setq recipe (plist-get plist :quelpa)) - ;; prepend NAME to quelpa recipe, if none is specified, to avoid local - ;; MELPA lookups by quelpa. - (when (= 0 (mod (length recipe) 2)) - (push name recipe) - (plist-put plist :quelpa (append (list name) recipe)))) - (if (and doom-auto-install-p - (not (bound-and-true-p byte-compile-current-file))) + (recipe (plist-get plist :quelpa))) + ;; prepend NAME to quelpa recipe, if none is specified, to avoid local + ;; MELPA lookups by quelpa. + (when (and recipe (= 0 (mod (length recipe) 2))) + (push name recipe) + (plist-put plist :quelpa (append (list name) recipe))) + (if doom-auto-install-p (unless (package-installed-p name) (add-to-list 'doom--packages name)) - (use-package-plist-delete plist :ensure) - (use-package-plist-delete plist :quelpa)) + (setq plist (use-package-plist-delete plist :ensure)) + (setq plist (use-package-plist-delete plist :quelpa))) `(progn (add-to-list 'doom-packages '(,name ,@recipe)) ,(macroexpand-all `(use-package ,name ,@plist)))))