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

Fix conflict between private & default autodefs

Browse source 
e.g. If you had a ~/.doom.d/modules/tools/lsp/autoload.el that defined
an lsp! autodef, it would be indexed and included in
~/.emacs.d/.local/autoloads.el *before* the lsp! autodef from the
original ~/.emacs.d/modules/tools/lsp/autoload.el.
This commit is contained in:
Henrik Lissner 2020-04-29 18:32:25 -04:00
parent 91c00d4756
commit 079b748217
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/core-modules.el
View file

@ -211,13 +211,15 @@ those directories. The first returned path is always `doom-private-dir'."
(declare (pure t) (side-effect-free t)) (declare (pure t) (side-effect-free t))
(append (list doom-private-dir) (append (list doom-private-dir)
(if module-dirs (if module-dirs
(mapcar (lambda (m) (doom-module-locate-path (car m) (cdr m)))
(doom-files-in (if (listp module-dirs) (doom-files-in (if (listp module-dirs)
module-dirs module-dirs
doom-modules-dirs) doom-modules-dirs)
:map #'doom-module-from-path
:type 'dirs :type 'dirs
:mindepth 1 :mindepth 1
:depth 1) :depth 1))
(cl-loop for plist being the hash-values of (doom-modules) (cl-loop for plist being the hash-values of doom-modules
collect (plist-get plist :path))) collect (plist-get plist :path)))
nil)) nil))