Skip to content

Commit b7b66e6

Browse files
committed
fix: $DOOMDIR loading twice and too early
An unintended change snuck into 2c14eff. The :core and :user virtual modules are no longer stripped from the module list before iterating through (and loading) them. This meant that Doom would load these two like regular modules (and first, since these two are always at the start of the list). This is harmless for :core, because it has no init.el or config.el, but :user does! This means $DOOMDIR/{init,config}.el would be loaded twice (once before all other modules and again afterwards), causing load order issues (like #6818). Fix: #6818 Amend: 2c14eff
1 parent c5de95f commit b7b66e6

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

lisp/doom-profiles.el

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,12 +386,11 @@ Defaults to the profile at `doom-profile-default'."
386386
branch ,(if (zerop (car branch)) (cdr branch))))))))
387387

388388
(defun doom-profile--generate-load-modules ()
389-
(let ((module-list (doom-module-list)))
389+
(let ((module-list (cddr (doom-module-list))))
390390
;; FIX: Same as above (see `doom-profile--generate-init-vars').
391391
`((unless doom-init-time
392392
(set 'doom-disabled-packages ',doom-disabled-packages)
393393
(set 'doom-modules ',doom-modules)
394-
(defvar doom-modules-list ',(cddr module-list))
395394
;; Cache module state and flags in symbol plists for quick lookup by
396395
;; `modulep!' later.
397396
,@(cl-loop for (category . modules) in (seq-group-by #'car (doom-module-list))

0 commit comments

Comments
 (0)