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

Rewrite require! and change depends-on!

Browse source 
depends-on! was changed to no longer load a specified module's
packages.el, but to preform a module-enabled assertion. It emits an
error if the linked module isn't (or specified flags aren't) enabled.
This commit is contained in:
Henrik Lissner 2019-04-21 19:35:27 -04:00
parent 03b76e1789
commit ff42cf0767
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/core-modules.el
View file

@ -409,22 +409,29 @@ to have them return non-nil (or exploit that to overwrite Doom's config)."
(substring (symbol-name when) 1)))
,@body)))
(defmacro require! (category module &rest plist)
"Loads the module specified by CATEGORY (a keyword) and MODULE (a symbol)."
`(let ((module-path (doom-module-locate-path ,category ',module)))
(defmacro require! (category module &rest flags)
"Loads the CATEGORY MODULE module with FLAGS.
CATEGORY is a keyword, MODULE is a symbol and FLAGS are symbols.
(require! :lang php +lsp)
This is for testing and internal use. This is not the correct way to enable a
module."
`(let ((doom-modules ,doom-modules)
(module-path (doom-module-locate-path ,category ',module)))
(doom-module-set
,category ',module
,@(when plist
(let ((old-plist (doom-module-get category module)))
(unless (plist-member plist :flags)
(plist-put plist :flags (plist-get old-plist :flags)))
(unless (plist-member plist :path)
(plist-put plist :path (or (plist-get old-plist :path)
(doom-module-locate-path category module)))))
,@(let ((plist (doom-module-get category module)))
(when flags
(plist-put plist :flags flags))
(unless (plist-member plist :path)
(plist-put plist :path (doom-module-locate-path category module)))
plist))
(if (directory-name-p module-path)
(condition-case-unless-debug ex
(let ((doom--current-module ',(cons category module)))
(let ((doom--current-module ',(cons category module))
(doom--current-flags ',flags))
(load! "init" module-path :noerror)
(let ((doom--stage 'config))
(load! "config" module-path :noerror)))