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

package!: fix :built-in property

Browse source
This commit is contained in:
Henrik Lissner 2019-07-05 22:28:55 +02:00
parent 0eeb6b5092
commit ecc4e8087c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/core-packages.el
View file

@ -153,7 +153,7 @@ them."
;; ;;
;; Module package macros ;; Module package macros
(cl-defmacro package! (name &rest plist &key built-in recipe pin disable _ignore _freeze) (cl-defmacro package! (name &rest plist &key built-in recipe pin disable ignore _freeze)
"Declares a package and how to install it (if applicable). "Declares a package and how to install it (if applicable).
This macro is declarative and does not load nor install packages. It is used to This macro is declarative and does not load nor install packages. It is used to
@ -203,10 +203,10 @@ elsewhere."
(setq module-list (append module-list (list module) nil) (setq module-list (append module-list (list module) nil)
plist (plist-put plist :modules module-list)))) plist (plist-put plist :modules module-list))))
(when built-in (when built-in
(doom-log "Ignoring built-in package '%s'" name) (doom-log "Ignoring built-in package %S" name)
(when (eq built-in 'prefer) (when (eq built-in '(quote prefer))
(setq built-in '(locate-library ,(symbol-name name) nil doom-site-load-path))) (setq built-in '(locate-library ,(symbol-name name) nil doom-site-load-path))))
(setq plist (plist-put plist :ignore built-in))) (setq plist (plist-put plist :ignore (or built-in ignore)))
(while plist (while plist
(unless (null (cadr plist)) (unless (null (cadr plist))
(setq old-plist (plist-put old-plist (car plist) (cadr plist)))) (setq old-plist (plist-put old-plist (car plist) (cadr plist))))