From 211977e28a3ddce34c2f94705c2f2ea7a0c18dd5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 8 Nov 2017 22:45:52 +0100 Subject: [PATCH] doom--module-pairs => doom-module-pairs --- bin/doom-doctor | 2 +- core/autoload/help.el | 2 +- core/autoload/test.el | 2 +- core/core-packages.el | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/doom-doctor b/bin/doom-doctor index 0578e1a23..a57693582 100755 --- a/bin/doom-doctor +++ b/bin/doom-doctor @@ -283,7 +283,7 @@ (indented 4 (columns 3 23 (mapcar (lambda (x) (format "+%s" x)) - (mapcar #'cdr (doom--module-pairs))))))) + (mapcar #'cdr (doom-module-pairs))))))) (when (and (bound-and-true-p doom-packages) (require 'package nil t)) diff --git a/core/autoload/help.el b/core/autoload/help.el index 739f7f25c..52ee799b6 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -25,7 +25,7 @@ submodule in the format, e.g. ':feature evil')." nil t))) (cl-destructuring-bind (category submodule) (mapcar #'intern (split-string module " ")) - (unless (member (cons category submodule) (doom--module-pairs)) + (unless (member (cons category submodule) (doom-module-pairs)) (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/autoload/test.el b/core/autoload/test.el index 8a79a3ceb..2ab50a6e0 100644 --- a/core/autoload/test.el +++ b/core/autoload/test.el @@ -41,7 +41,7 @@ If neither is available, run all tests in all enabled modules." (let ((noninteractive t) doom-modules) (load (expand-file-name "init.test.el" user-emacs-directory) nil t) - (setq modules (doom--module-pairs) + (setq modules (doom-module-pairs) targets (list (expand-file-name "test/" doom-core-dir)))))) ;; resolve targets to a list of test files and load them (cl-loop with targets = diff --git a/core/core-packages.el b/core/core-packages.el index f624953bd..c594b3e57 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -213,13 +213,13 @@ This aggressively reloads core autoload files." (let (noninteractive) (funcall load-fn (doom-module-path :private user-login-name "init.el") t)) (mapc load-fn (file-expand-wildcards (expand-file-name "autoload/*.el" doom-core-dir))) - (cl-loop for (module . submodule) in (doom--module-pairs) + (cl-loop for (module . submodule) in (doom-module-pairs) for path = (doom-module-path module submodule "config.el") do (funcall load-fn path t)))) (when (or force-p (not doom-packages)) (setq doom-packages nil) (funcall load-fn (expand-file-name "packages.el" doom-core-dir)) - (cl-loop for (module . submodule) in (doom--module-pairs) + (cl-loop for (module . submodule) in (doom-module-pairs) for path = (doom-module-path module submodule "packages.el") do (funcall load-fn path t))))) (doom|finalize)) @@ -274,7 +274,7 @@ Used by `require!' and `depends-on!'." (doom-enlist (or flags t)) doom-modules)) -(defun doom--module-pairs () +(defun doom-module-pairs () "Returns `doom-modules' as a list of (MODULE . SUBMODULE) cons cells. The list is sorted by order of insertion unless ALL-P is non-nil. If ALL-P is non-nil, include all modules, enabled or otherwise." @@ -320,7 +320,7 @@ MODULES is an malformed plist of modules to load." (unless noninteractive (load ,(doom-module-path :private user-login-name "init") t t) - ,@(cl-loop for (module . submodule) in (doom--module-pairs) + ,@(cl-loop for (module . submodule) in (doom-module-pairs) collect `(require! ,module ,submodule nil t)) (when (display-graphic-p)