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

Revert "Refactor def-package!"

Browse source 
This reverts commit f7a86ae281.

Turns out it's still needed when byte-compiling!
This commit is contained in:
Henrik Lissner 2018-06-12 01:58:06 +02:00
parent 4425fdfca4
commit 9ec0461162
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core-modules.el
View file

@ -265,7 +265,13 @@ to least)."
(when (and (memq name (bound-and-true-p doom-disabled-packages))
(not (memq :disabled plist)))
(setq plist `(:disabled t ,@plist)))
`(use-package ,name ,@plist))
;; If byte-compiling, ignore this package if it doesn't meet the condition.
;; This avoids false-positive load errors.
(unless (and (bound-and-true-p byte-compile-current-file)
(or (and (plist-member plist :if) (not (eval (plist-get plist :if) t)))
(and (plist-member plist :when) (not (eval (plist-get plist :when) t)))
(and (plist-member plist :unless) (eval (plist-get plist :unless) t))))
`(use-package ,name ,@plist)))
(defmacro def-package-hook! (package when &rest body)
"Reconfigures a package's `def-package!' block.