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

refactor: s/doom-modules-dirs/doom-module-load-path/

Browse source 
Ref: fc6934c240
This commit is contained in:
Henrik Lissner 2024-02-05 03:33:22 -05:00
parent 2ace90233c
commit 343c3a82b0
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/cli/compile.el
View file

@ -199,7 +199,7 @@ module. This does not include your byte-compiled, third party packages.'"
in (append (doom-glob doom-emacs-dir "*.elc") in (append (doom-glob doom-emacs-dir "*.elc")
(doom-files-in doom-user-dir :match "\\.elc$" :depth 1) (doom-files-in doom-user-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-module-load-path :match "\\.elc$" :depth 4))
if (file-exists-p path) if (file-exists-p path)
do (delete-file path) do (delete-file path)
and do (print! (success "\033[KDeleted %s%s") (relpath path) esc) and do (print! (success "\033[KDeleted %s%s") (relpath path) esc)

10
lisp/doom-modules.el
View file

@ -267,7 +267,7 @@ If PLIST consists of a single nil, the module is purged from memory instead."
PATHS-OR-ALL can either be a non-nil value or a list of directories. If given a PATHS-OR-ALL can either be a non-nil value or a list of directories. If given a
list of directories, return a list of module keys for all modules present list of directories, return a list of module keys for all modules present
underneath it. If non-nil, return the same, but search `doom-modules-dirs' underneath it. If non-nil, return the same, but search `doom-module-load-path'
(includes :core and :user). Modules that are enabled are sorted first by their (includes :core and :user). Modules that are enabled are sorted first by their
:depth, followed by disabled modules in lexicographical order (unless a :depth :depth, followed by disabled modules in lexicographical order (unless a :depth
is specified in their .doommodule). is specified in their .doommodule).
@ -279,7 +279,7 @@ configdepth. See `doom-module-set' for details."
(append (seq-remove #'cdr (doom-module-list nil initorder?)) (append (seq-remove #'cdr (doom-module-list nil initorder?))
(doom-files-in (if (listp paths-or-all) (doom-files-in (if (listp paths-or-all)
paths-or-all paths-or-all
doom-modules-dirs) doom-modules-load-path)
:map #'doom-module-from-path :map #'doom-module-from-path
:type 'dirs :type 'dirs
:mindepth 1 :mindepth 1
@ -309,7 +309,7 @@ If the category isn't enabled this returns nil. For finding disabled modules use
path))) path)))
(defun doom-module-locate-path (category &optional module file) (defun doom-module-locate-path (category &optional module file)
"Searches `doom-modules-dirs' to find the path to a module. "Searches `doom-module-load-path' to find the path to a module.
CATEGORY is a keyword (e.g. :lang) and MODULE is a symbol (e.g. 'python). FILE CATEGORY is a keyword (e.g. :lang) and MODULE is a symbol (e.g. 'python). FILE
is a string that will be appended to the resulting path. If no path exists, this is a string that will be appended to the resulting path. If no path exists, this
@ -325,8 +325,8 @@ returns nil, otherwise an absolute path."
(if file (if file
;; PERF: locate-file-internal is a little faster for finding files, ;; PERF: locate-file-internal is a little faster for finding files,
;; but its interface for finding directories is clumsy. ;; but its interface for finding directories is clumsy.
(locate-file-internal path doom-modules-dirs '("" ".elc" ".el")) (locate-file-internal path doom-module-load-path '("" ".elc" ".el"))
(cl-loop for default-directory in doom-modules-dirs (cl-loop for default-directory in doom-module-load-path
if (file-exists-p path) if (file-exists-p path)
return (expand-file-name path))))))) return (expand-file-name path)))))))

2
lisp/doom-profiles.el
View file

@ -439,7 +439,7 @@ Defaults to the profile at `doom-profile-default'."
(doom-autoloads--scan (doom-autoloads--scan
(append (doom-glob doom-core-dir "lib/*.el") (append (doom-glob doom-core-dir "lib/*.el")
(cl-loop for dir (cl-loop for dir
in (append (doom-module-load-path doom-modules-dirs) in (append (doom-module-load-path)
(list doom-user-dir)) (list doom-user-dir))
if (doom-glob dir "autoload.el") collect (car it) if (doom-glob dir "autoload.el") collect (car it)
if (doom-glob dir "autoload/*.el") append it) if (doom-glob dir "autoload/*.el") append it)

2
lisp/lib/autoloads.el
View file

@ -186,7 +186,7 @@ non-nil, treat FILES as pre-generated autoload files instead."
(let ((load-file-name file) (let ((load-file-name file)
(load-path (load-path
(append (list doom-user-dir) (append (list doom-user-dir)
doom-modules-dirs doom-module-load-path
load-path))) load-path)))
(condition-case _ (condition-case _
(while t (while t

2
lisp/lib/debug.el
View file

@ -301,7 +301,7 @@ ready to be pasted in a bug report on github."
'compiled-user-config) 'compiled-user-config)
(if (doom-files-in doom-core-dir :type 'files :match "\\.elc$") (if (doom-files-in doom-core-dir :type 'files :match "\\.elc$")
'compiled-core) 'compiled-core)
(if (doom-files-in doom-modules-dirs :type 'files :match "\\.elc$") (if (doom-files-in doom-module-load-path :type 'files :match "\\.elc$")
'compiled-modules))))) 'compiled-modules)))))
(custom (custom
,@(when (and (stringp custom-file) ,@(when (and (stringp custom-file)