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

Refactor module pairs and paths helpers

Browse source
This commit is contained in:
Henrik Lissner 2017-07-29 00:30:13 +02:00
parent 5849a1fe38
commit c021d347d3
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/core-packages.el
View file

@ -272,19 +272,18 @@ Used by `require!' and `depends-on!'."
"Returns `doom-modules' as a list of (MODULE . SUBMODULE) cons cells. The list "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, is sorted by order of insertion unless ALL-P is non-nil. If ALL-P is non-nil,
include all modules, enabled or otherwise." include all modules, enabled or otherwise."
(if (hash-table-p doom-modules) (unless (hash-table-p doom-modules)
(cl-loop for key being the hash-keys of doom-modules (error "doom-modules is uninitialized"))
collect (cons (car key) (cdr key))) (cl-loop for key being the hash-keys of doom-modules
(error "doom-modules is uninitialized"))) collect key))
(defun doom--module-paths (&optional append-file) (defun doom--module-paths (&optional append-file)
"Returns a list of absolute file paths to activated modules, with APPEND-FILE "Returns a list of absolute file paths to activated modules, with APPEND-FILE
added, if the file exists." added, if the file exists."
(let (paths) (cl-loop for (module . submodule) in (doom--module-pairs)
(dolist (pair (doom--module-pairs) (nreverse paths)) for path = (doom-module-path module submodule append-file)
(let ((path (doom-module-path (car pair) (cdr pair) append-file))) if (file-exists-p path)
(when (file-exists-p path) collect path))
(push path paths))))))
@ -380,7 +379,8 @@ If NOERROR is non-nil, don't throw an error if the file doesn't exist."
(and load-file-name (file-name-directory load-file-name)) (and load-file-name (file-name-directory load-file-name))
(and (bound-and-true-p byte-compile-current-file) (and (bound-and-true-p byte-compile-current-file)
(file-name-directory byte-compile-current-file)) (file-name-directory byte-compile-current-file))
(and buffer-file-name (file-name-directory buffer-file-name)))) (and buffer-file-name
(file-name-directory buffer-file-name))))
(filename (cond ((stringp filesym) filesym) (filename (cond ((stringp filesym) filesym)
((symbolp filesym) (symbol-name filesym)) ((symbolp filesym) (symbol-name filesym))
(t (error "load! expected a string or symbol, got %s (a %s)" (t (error "load! expected a string or symbol, got %s (a %s)"