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

@package: fix catch-all package association with quelpa

Browse source
This commit is contained in:
Henrik Lissner 2017-02-20 01:13:21 -05:00
parent 19750a6620
commit 4d53af3086
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/core-packages.el
View file

@ -347,13 +347,14 @@ them."
(and old-plist (plist-get old-plist :recipe)))) (and old-plist (plist-get old-plist :recipe))))
(pkg-pin (or (plist-get plist :pin) (pkg-pin (or (plist-get plist :pin)
(and old-plist (plist-get old-plist :pin))))) (and old-plist (plist-get old-plist :pin)))))
(when pkg-recipe
(when (= 0 (mod (length pkg-recipe) 2)) (when (= 0 (mod (length pkg-recipe) 2))
(plist-put plist :recipe (cons name pkg-recipe))) (plist-put plist :recipe (cons name pkg-recipe)))
(when (and pkg-recipe pkg-pin) (when pkg-pin
(plist-put plist :pin nil)) (plist-put plist :pin nil)))
`(progn `(progn
(when ,(and pkg-pin t) (when ,(and pkg-pin t)
(add-to-list 'package-pinned-packages ,(cons name pkg-pin))) (cl-pushnew (cons ',name ,pkg-pin) package-pinned-packages :key 'car))
(when ,(and old-plist t) (when ,(and old-plist t)
(assq-delete-all ',name doom-packages)) (assq-delete-all ',name doom-packages))
(push ',(cons name plist) doom-packages)))) (push ',(cons name plist) doom-packages))))