From 19ce459138673d6a617fa342c533ee59e20eee86 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 20 Jun 2022 23:38:20 +0200 Subject: [PATCH] fix(cli): module cli.el loader $DOOMDIR/init.el had to be loaded earlier, so we could read the active module list. This indirectly fixes an issue where users' literate configs weren't being tangled on 'doom sync'. Fix: #6479 --- bin/doom | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/doom b/bin/doom index 665a57574..9990476fb 100755 --- a/bin/doom +++ b/bin/doom @@ -105,6 +105,10 @@ (require 'core-cli (expand-file-name "core/core-cli" user-emacs-directory)) +;; Load $DOOMDIR/init.el, to read the user's `doom!' block, and so users can +;; customize things early, if they like. +(load! doom-module-init-file doom-private-dir t) + ;; ;;; Entry point @@ -218,9 +222,6 @@ SEE ALSO: (when pager (setenv "DOOMPAGER" pager)) (exit! :restart)) - ;; Load $DOOMDIR/init.el, so users can customize things, if they like. - (doom-log "Loading $DOOMDIR/init.el") - (load! doom-module-init-file doom-private-dir t) ;; Load extra files and forms, as per given options. (dolist (file loads) (load (doom-path (cdr file)) @@ -288,10 +289,9 @@ SEE ALSO: (let ((cli-file "cli")) (defgroup! "Module commands" (dolist (key (hash-table-keys doom-modules)) - (when-let* ((path (plist-get (gethash key doom-modules) path)) - (path (car (doom-glob path cli-file)))) + (when-let (path (plist-get (gethash key doom-modules) :path)) (defgroup! :prefix (format "+%s" (cdr key)) - (defautoload! () path))))) + (load! cli-file path t))))) (doom-log "Loading $DOOMDIR/cli.el") (load! cli-file doom-private-dir t))))