diff --git a/core/autoload/modules.el b/core/autoload/modules.el index ed71220b1..303baa235 100644 --- a/core/autoload/modules.el +++ b/core/autoload/modules.el @@ -157,8 +157,7 @@ modified." ;; Replace autoload paths (only for module autoloads) with ;; absolute paths for faster resolution during load and ;; simpler `load-path' - (let ((load-path (append doom-psuedo-module-dirs - doom-modules-dirs + (let ((load-path (append doom-modules-dirs load-path)) cache) (save-excursion @@ -367,7 +366,7 @@ module. This does not include your byte-compiled, third party packages.'" (interactive) (cl-loop with default-directory = doom-emacs-dir for path in (append (doom-files-in doom-emacs-dir :match "\\.elc$" :depth 1) - (doom-files-in doom-psuedo-module-dirs :match "\\.elc$" :depth 1) + (doom-files-in doom-private-dir :match "\\.elc$" :depth 1) (doom-files-in doom-core-dir :match "\\.elc$") (doom-files-in doom-modules-dirs :match "\\.elc$" :depth 4)) for truepath = (file-truename path) diff --git a/core/core-packages.el b/core/core-packages.el index 8c91e575d..0c3098d38 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -55,11 +55,6 @@ (list (expand-file-name "modules/" doom-private-dir) doom-modules-dir) "A list of module root directories. Order determines priority.") -(defvar doom-psuedo-module-dirs (list doom-private-dir) - "Additional paths for modules that are outside of `doom-modules-dirs'. -`doom//reload-doom-autoloads', `doom//byte-compile' and -`doom-initialize-packages' will include the directories in this list.") - (defvar doom-packages () "A list of enabled packages. Each element is a sublist, whose CAR is the package's name as a symbol, and whose CDR is the plist supplied to its @@ -346,8 +341,7 @@ them." (cl-loop for key being the hash-keys of doom-modules for path = (doom-module-path (car key) (cdr key) "packages.el") do (let ((doom--current-module key)) (_load path t))) - (cl-loop for dir in doom-psuedo-module-dirs - do (_load (expand-file-name "packages.el" dir) t))))))))) + (_load (expand-file-name "packages.el" doom-private-dir))))))))) ;; @@ -445,7 +439,7 @@ This doesn't require modules to be enabled. For enabled modules us added, if the file exists." (append (cl-loop for plist being the hash-values of doom-modules collect (plist-get plist :path)) - (cl-remove-if-not #'file-directory-p doom-psuedo-module-dirs))) + (list doom-private-dir))) (defun doom-module-table (&optional modules) "Converts MODULES (a malformed plist) into a hash table of modules, fit for