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

refactor: enable module whether or not it exists

Browse source 
The doom-modules table should reflect the user's intentions, not the
actual state of its modules (e.g. by omitting modules that couldn't be
found at activation time).
This commit is contained in:
Henrik Lissner 2022-09-15 23:37:04 +02:00
parent a9e0156416
commit e411762e8c
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/doom-modules.el
View file

@ -274,11 +274,8 @@ those directories."
mplist) mplist)
(push (car key) mplist)) (push (car key) mplist))
(throw 'doom-modules t)))) (throw 'doom-modules t))))
(let ((path (doom-module-locate-path category module))) (push (funcall fn category module :flags (if (listp m) (cdr m)))
(push (funcall fn category module results))))))
:flags (if (listp m) (cdr m))
:path (if (stringp path) (file-truename path)))
results)))))))
(when noninteractive (when noninteractive
(setq doom-inhibit-module-warnings t)) (setq doom-inhibit-module-warnings t))
(nreverse results))) (nreverse results)))
@ -432,9 +429,12 @@ to least)."
`(when noninteractive `(when noninteractive
(doom-module-mplist-map (doom-module-mplist-map
(lambda (category module &rest plist) (lambda (category module &rest plist)
(if (plist-member plist :path) (let ((path (doom-module-locate-path category module)))
(apply #'doom-module-set category module plist) (unless path
(message "WARNING Couldn't find the %s %s module" category module))) (print! (warn "Failed to locate a '%s %s' module") category module))
(apply #'doom-module-set category module
:path path
plist)))
,@(if (keywordp (car modules)) ,@(if (keywordp (car modules))
(list (list 'quote modules)) (list (list 'quote modules))
modules)) modules))