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

Fix recursive load errors with multiple doom! calls #352

Browse source
This commit is contained in:
Henrik Lissner 2018-01-12 14:31:58 -05:00
parent 98fbbc533f
commit 987805de5f
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/core-packages.el
View file

@ -218,10 +218,9 @@ This aggressively reloads core autoload files."
"Adds MODULES to `doom-modules'. MODULES must be in mplist format. "Adds MODULES to `doom-modules'. MODULES must be in mplist format.
e.g '(:feature evil :lang emacs-lisp javascript java)" e.g '(:feature evil :lang emacs-lisp javascript java)"
(unless doom-modules
(setq doom-modules (make-hash-table :test #'equal (setq doom-modules (make-hash-table :test #'equal
:size (+ 5 (length modules)) :size (+ 5 (length modules))
:rehash-threshold 1.0))) :rehash-threshold 1.0))
(let (mode) (let (mode)
(dolist (m modules) (dolist (m modules)
(cond ((keywordp m) (setq mode m)) (cond ((keywordp m) (setq mode m))
@ -260,7 +259,9 @@ added, if the file exists."
(defun doom-module-enabled-p (module submodule) (defun doom-module-enabled-p (module submodule)
"Returns t if MODULE->SUBMODULE is present in `doom-modules'." "Returns t if MODULE->SUBMODULE is present in `doom-modules'."
(and (doom-module-get module submodule) t)) (and (hash-table-p doom-modules)
(doom-module-get module submodule)
t))
(defun doom-module-enable (module submodule &optional flags) (defun doom-module-enable (module submodule &optional flags)
"Adds MODULE and SUBMODULE to `doom-modules', overwriting it if it exists. "Adds MODULE and SUBMODULE to `doom-modules', overwriting it if it exists.
@ -399,7 +400,8 @@ The module is only loaded once. If RELOAD-P is non-nil, load it again."
(if (not (file-directory-p module-path)) (if (not (file-directory-p module-path))
(lwarn 'doom-modules :warning "Couldn't find module '%s %s'" (lwarn 'doom-modules :warning "Couldn't find module '%s %s'"
module submodule) module submodule)
(doom-module-enable module submodule flags) (when (hash-table-p doom-modules)
(doom-module-enable module submodule flags))
`(condition-case-unless-debug ex `(condition-case-unless-debug ex
(progn (progn
(load! init ,module-path t) (load! init ,module-path t)