emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix package! not stripping out properties + refactor

Browse source
This commit is contained in:
Henrik Lissner 2017-01-31 19:41:07 -05:00
parent db02e974d7
commit 193c80f650
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/core-packages.el
View file

@ -138,20 +138,17 @@ symbol and cdr is a plist. The plist accepts any argument `quelpa-use-package'
uses." uses."
(declare (indent defun)) (declare (indent defun))
(let ((use-package-always-ensure doom-auto-install-p) (let ((use-package-always-ensure doom-auto-install-p)
recipe) (recipe (plist-get plist :quelpa)))
(when (plist-member plist :quelpa) ;; prepend NAME to quelpa recipe, if none is specified, to avoid local
(setq recipe (plist-get plist :quelpa)) ;; MELPA lookups by quelpa.
;; prepend NAME to quelpa recipe, if none is specified, to avoid local (when (and recipe (= 0 (mod (length recipe) 2)))
;; MELPA lookups by quelpa. (push name recipe)
(when (= 0 (mod (length recipe) 2)) (plist-put plist :quelpa (append (list name) recipe)))
(push name recipe) (if doom-auto-install-p
(plist-put plist :quelpa (append (list name) recipe))))
(if (and doom-auto-install-p
(not (bound-and-true-p byte-compile-current-file)))
(unless (package-installed-p name) (unless (package-installed-p name)
(add-to-list 'doom--packages name)) (add-to-list 'doom--packages name))
(use-package-plist-delete plist :ensure) (setq plist (use-package-plist-delete plist :ensure))
(use-package-plist-delete plist :quelpa)) (setq plist (use-package-plist-delete plist :quelpa)))
`(progn `(progn
(add-to-list 'doom-packages '(,name ,@recipe)) (add-to-list 'doom-packages '(,name ,@recipe))
,(macroexpand-all `(use-package ,name ,@plist))))) ,(macroexpand-all `(use-package ,name ,@plist)))))