diff --git a/core/autoload/help.el b/core/autoload/help.el index 84b91819c..e43ed5e8d 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -77,7 +77,7 @@ in." nil t module)))) (cl-destructuring-bind (category submodule) (mapcar #'intern (split-string module " ")) - (unless (member (cons category submodule) (doom-module-pairs)) + (unless (doom-module-enabled-p category submodule) (error "'%s' isn't a valid module" module)) (let ((doc-path (expand-file-name "README.org" (doom-module-path category submodule)))) (unless (file-exists-p doc-path) diff --git a/core/core-packages.el b/core/core-packages.el index 21fc9c398..812910a9a 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -281,11 +281,6 @@ Used by `require!' and `depends-on!'." '(t)) doom-modules))) -(defun doom-module-pairs () - "Returns `doom-modules' as a list of (MODULE . SUBMODULE) cons cells." - (cl-loop for key being the hash-keys of doom-modules - collect key)) - (defun doom-module-load-file (module submodule file &optional path) "Load FILE in MODULE/SUBMODULE. If PATH is specified, look for FILE in PATH." (unless (or path (file-name-absolute-p file))