Updating Doom Emacs.

.emacs.d/core/autoload/config.el

@@ -26,8 +26,9 @@
   (doom-project-find-file doom-private-dir))
 
 ;;;###autoload
-(defun doom/goto-doomblock ()
-  "Open your private init.el and go to your `doom!' block."
+(defun doom/goto-private-init-file ()
+  "Open your private init.el file.
+And jumps to your `doom!' block."
   (interactive)
   (find-file (expand-file-name "init.el" doom-private-dir))
   (goto-char
@@ -37,13 +38,13 @@
        (point))))
 
 ;;;###autoload
-(defun doom/goto-config-file ()
+(defun doom/goto-private-config-file ()
   "Open your private config.el file."
   (interactive)
   (find-file (expand-file-name "config.el" doom-private-dir)))
 
 ;;;###autoload
-(defun doom/goto-packages-file ()
+(defun doom/goto-private-packages-file ()
   "Open your private packages.el file."
   (interactive)
   (find-file (expand-file-name "packages.el" doom-private-dir)))
@@ -52,42 +53,48 @@
 ;;
 ;;; Managements
 
-(cl-defmacro doom--compile (command &key on-success on-failure)
-  (declare (indent defun))
-  `(with-current-buffer (compile ,command)
-     (add-hook
-      'compilation-finish-functions
-      (lambda (_buf status)
-        (if (equal status "finished\n")
-            ,on-success
-          ,on-failure))
-      nil 'local)))
+(defmacro doom--if-compile (command on-success &optional on-failure)
+  (declare (indent 2))
+  (let ((windowsym (make-symbol "doom-sync-window")))
+    `(with-current-buffer (compile ,command t)
+       (let ((,windowsym (get-buffer-window (current-buffer))))
+         (select-window ,windowsym)
+         (add-hook
+          'compilation-finish-functions
+          (lambda (_buf status)
+            (if (equal status "finished\n")
+                (progn
+                  (delete-window ,windowsym)
+                  ,on-success)
+              ,on-failure))
+          nil 'local)))))
 
 ;;;###autoload
 (defun doom/reload ()
   "Reloads your private config.
 
-This is experimental! It will try to do as `bin/doom refresh' does, but from
-within this Emacs session. i.e. it reload autoloads files (if necessary),
-reloads your package list, and lastly, reloads your private config.el.
+This is experimental! It will try to do as `bin/doom sync' does, but from within
+this Emacs session. i.e. it reload autoloads files (if necessary), reloads your
+package list, and lastly, reloads your private config.el.
 
 Runs `doom-reload-hook' afterwards."
   (interactive)
   (require 'core-cli)
   (when (and IS-WINDOWS (file-exists-p doom-env-file))
-    (warn "Can't regenerate envvar file from within Emacs. Run 'doom env' from the console"))
-  (doom--compile (format "%s refresh -e" doom-bin)
-    :on-success
-    (let ((doom-reloading-p t))
-      (doom-initialize 'force)
-      (with-demoted-errors "PRIVATE CONFIG ERROR: %s"
-        (general-auto-unbind-keys)
-        (unwind-protect
-            (doom-initialize-modules 'force)
-          (general-auto-unbind-keys t)))
-      (run-hook-wrapped 'doom-reload-hook #'doom-try-run-hook)
-      (print! (success "Config successfully reloaded!")))
-    :on-failure
+    (message "Can't regenerate envvar file from within Emacs. Run 'doom env' from the console"))
+  ;; In case doom/reload is run before incrementally loaded packages are loaded,
+  ;; which could cause odd load order issues.
+  (mapc #'require (cdr doom-incremental-packages))
+  (doom--if-compile (format "%s sync -e" doom-bin)
+      (let ((doom-reloading-p t))
+        (doom-initialize 'force)
+        (with-demoted-errors "PRIVATE CONFIG ERROR: %s"
+          (general-auto-unbind-keys)
+          (unwind-protect
+              (doom-initialize-modules 'force)
+            (general-auto-unbind-keys t)))
+        (run-hook-wrapped 'doom-reload-hook #'doom-try-run-hook)
+        (message "Config successfully reloaded!"))
     (user-error "Failed to reload your config")))
 
 ;;;###autoload
@@ -98,13 +105,13 @@ This is much faster and safer than `doom/reload', but not as comprehensive. This
 reloads your package and module visibility, but does not install new packages or
 remove orphaned ones. It also doesn't reload your private config.
 
-It is useful to only pull in changes performed by 'doom refresh' on the command
+It is useful to only pull in changes performed by 'doom sync' on the command
 line."
   (interactive)
   (require 'core-cli)
   (require 'core-packages)
   (doom-initialize-packages)
-  (doom-cli-reload-autoloads nil 'force))
+  (doom-autoloads-reload))
 
 ;;;###autoload
 (defun doom/reload-env (&optional arg)
@@ -118,25 +125,22 @@ imported into Emacs."
   (interactive "P")
   (when IS-WINDOWS
     (user-error "Cannot reload envvar file from within Emacs on Windows, run it from cmd.exe"))
-  (doom--compile
-    (format "%s -ic '%s env%s'"
-            (string-trim
-             (shell-command-to-string
-             (format "getent passwd %S | cut -d: -f7"
-                     (user-login-name))))
-            doom-bin (if arg " -c" ""))
-    :on-success
-    (let ((doom-reloading-p t))
-      (unless arg
-        (doom-load-envvars-file doom-env-file)))
-    :on-failure
+  (doom--if-compile
+      (format "%s -ic '%s env%s'"
+              (string-trim
+               (shell-command-to-string
+                (format "getent passwd %S | cut -d: -f7"
+                        (user-login-name))))
+              doom-bin (if arg " -c" ""))
+      (let ((doom-reloading-p t))
+        (unless arg
+          (doom-load-envvars-file doom-env-file)))
     (error "Failed to generate env file")))
 
 ;;;###autoload
 (defun doom/upgrade ()
   "Run 'doom upgrade' then prompt to restart Emacs."
   (interactive)
-  (doom--compile (format "%s upgrade" doom-bin)
-    :on-success
-    (when (y-or-n-p "You must restart Emacs for the upgrade to take effect.\n\nRestart Emacs?")
-      (doom/restart-and-restore))))
+  (doom--if-compile (format "%s -y upgrade" doom-bin)
+      (when (y-or-n-p "You must restart Emacs for the upgrade to take effect.\n\nRestart Emacs?")
+        (doom/restart-and-restore))))