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

Remove doom-psuedo-modules-dir

Browse source 
Not needed with now that doom-private-dir has first class support.
This commit is contained in:
Henrik Lissner 2018-06-01 17:01:39 +02:00
parent fd95bfee07
commit 6bad6d12f3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/autoload/modules.el
View file

@ -157,8 +157,7 @@ modified."
;; Replace autoload paths (only for module autoloads) with ;; Replace autoload paths (only for module autoloads) with
;; absolute paths for faster resolution during load and ;; absolute paths for faster resolution during load and
;; simpler `load-path' ;; simpler `load-path'
(let ((load-path (append doom-psuedo-module-dirs (let ((load-path (append doom-modules-dirs
doom-modules-dirs
load-path)) load-path))
cache) cache)
(save-excursion (save-excursion
@ -367,7 +366,7 @@ module. This does not include your byte-compiled, third party packages.'"
(interactive) (interactive)
(cl-loop with default-directory = doom-emacs-dir (cl-loop with default-directory = doom-emacs-dir
for path in (append (doom-files-in doom-emacs-dir :match "\\.elc$" :depth 1) 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-core-dir :match "\\.elc$")
(doom-files-in doom-modules-dirs :match "\\.elc$" :depth 4)) (doom-files-in doom-modules-dirs :match "\\.elc$" :depth 4))
for truepath = (file-truename path) for truepath = (file-truename path)

10
core/core-packages.el
View file

@ -55,11 +55,6 @@
(list (expand-file-name "modules/" doom-private-dir) doom-modules-dir) (list (expand-file-name "modules/" doom-private-dir) doom-modules-dir)
"A list of module root directories. Order determines priority.") "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 () (defvar doom-packages ()
"A list of enabled packages. Each element is a sublist, whose CAR is the "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 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 (cl-loop for key being the hash-keys of doom-modules
for path = (doom-module-path (car key) (cdr key) "packages.el") for path = (doom-module-path (car key) (cdr key) "packages.el")
do (let ((doom--current-module key)) (_load path t))) do (let ((doom--current-module key)) (_load path t)))
(cl-loop for dir in doom-psuedo-module-dirs (_load (expand-file-name "packages.el" doom-private-dir)))))))))
do (_load (expand-file-name "packages.el" dir) t)))))))))
;; ;;
@ -445,7 +439,7 @@ This doesn't require modules to be enabled. For enabled modules us
added, if the file exists." added, if the file exists."
(append (cl-loop for plist being the hash-values of doom-modules (append (cl-loop for plist being the hash-values of doom-modules
collect (plist-get plist :path)) 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) (defun doom-module-table (&optional modules)
"Converts MODULES (a malformed plist) into a hash table of modules, fit for "Converts MODULES (a malformed plist) into a hash table of modules, fit for