Updating dotfiles.

.emacs.d/core/cli/autoloads.el

@@ -14,7 +14,7 @@ one wants that.")
     auto-mode-alist
     interpreter-mode-alist
     Info-directory-list)
-  "A list of variables to be cached in `doom-autoload-file'.")
+  "A list of variables to be cached in `doom-autoloads-file'.")
 
 (defvar doom-autoloads-files ()
   "A list of additional files or file globs to scan for autoloads.")
@@ -26,7 +26,7 @@ one wants that.")
 (defun doom-autoloads-reload (&optional file)
   "Regenerates Doom's autoloads and writes them to FILE."
   (unless file
-    (setq file doom-autoload-file))
+    (setq file doom-autoloads-file))
   (print! (start "(Re)generating autoloads file..."))
   (print-group!
    (cl-check-type file string)

.emacs.d/core/cli/doctor.el

@@ -59,6 +59,16 @@ in."
               "typically installed. If you're seeing a vanilla Emacs splash screen, this "
               "may explain why. If you use Chemacs, you may ignore this warning."))
 
+  (when EMACS27+
+    (print! (start "Checking for great Emacs features..."))
+    (unless (and (functionp 'json-serialize)
+                 (string-match-p "\\_<JSON\\_>" system-configuration-features))
+      (warn! "Emacs was not built with native JSON support")
+      (explain! "Users will see a substantial performance gain by building Emacs with "
+                "jansson support (i.e. a native JSON library), particularly LSP users. "
+                "You must install a prebuilt Emacs binary with this included, or compile "
+                "Emacs with the --with-json option.")))
+
   (print! (start "Checking for private config conflicts..."))
   (let ((xdg-dir (concat (or (getenv "XDG_CONFIG_HOME")
                              "~/.config")

.emacs.d/core/cli/env.el

@@ -61,11 +61,14 @@ Why this over exec-path-from-shell?
 ;; Helpers
 
 (defvar doom-env-blacklist
-  '("^DBUS_SESSION_BUS_ADDRESS$"
-    "^GPG_AGENT_INFO$" "^\\(SSH\\|GPG\\)_TTY$"
-    "^SSH_\\(AUTH_SOCK\\|AGENT_PID\\)$"
-    "^HOME$" "^PWD$" "^PS1$" "^R?PROMPT$" "^TERM$"
-    ;; Doom envvars
+  '(;; State that may be problematic if overwritten
+    "^HOME$" "^\\(OLD\\)?PWD$" "^SHLVL$" "^PS1$" "^R?PROMPT$" "^TERM$" "^USER$"
+    ;; X server or services' variables
+    "^DISPLAY$" "^DBUS_SESSION_BUS_ADDRESS$"
+    ;; ssh and gpg variables (likely to become stale)
+    "^SSH_\\(AUTH_SOCK\\|AGENT_PID\\)$" "^\\(SSH\\|GPG\\)_TTY$"
+    "^GPG_AGENT_INFO$"
+    ;; Internal Doom envvars
     "^DEBUG$" "^INSECURE$" "^YES$" "^__")
   "Environment variables to not save in `doom-env-file'.
 

.emacs.d/core/cli/help.el

@@ -74,7 +74,7 @@
   :bare t
   (if command
       (doom--cli-print (doom-cli-get (intern command)))
-    (doom--cli-print (doom-cli-get :main))
+    (doom--cli-print (doom-cli-get :doom))
     (terpri)
     (print! (bold "Commands:"))
     (print-group!

.emacs.d/core/cli/packages.el

@@ -126,8 +126,14 @@ list remains lean."
       (doom-log "%s is newer than %s" file elc-file)
       t)))
 
+;; DEPRECATED Remove later
+(defun doom--comp-output-filename (file)
+  (if (fboundp 'comp-output-filename)
+      (comp-output-filename file)
+    (comp-el-to-eln-filename file)))
+
 (defun doom--eln-file-outdated-p (file)
-  (when-let* ((eln-file (comp-output-filename file))
+  (when-let* ((eln-file (doom--comp-output-filename file))
               (error-file (concat eln-file ".error")))
     (push eln-file doom--expected-eln-files)
     (cond ((file-exists-p eln-file)
@@ -144,7 +150,7 @@ list remains lean."
 
 (defun doom--native-compile-done-h (file)
   (when-let* ((file)
-              (eln-file (comp-output-filename file))
+              (eln-file (doom--comp-output-filename file))
               (error-file (concat eln-file ".error")))
     (if (file-exists-p eln-file)
         (doom-log "Compiled %s" eln-file)
@@ -484,8 +490,9 @@ If ELPA-P, include packages installed with package.el (M-x package-install)."
              (and (or repos-p regraft-repos-p)
                   (straight--directory-files (straight--repos-dir) nil nil 'sort))))
         (list (when builds-p
-                (seq-remove (doom-rpartial #'gethash straight--profile-cache)
-                            (straight--directory-files (straight--build-dir) nil nil 'sort)))
+                (seq-filter #'file-directory-p
+                            (seq-remove (doom-rpartial #'gethash straight--profile-cache)
+                                        (straight--directory-files (straight--build-dir) nil nil 'sort))))
               (when repos-p
                 (seq-remove (doom-rpartial #'straight--checkhash straight--repo-cache)
                             rdirs))

.emacs.d/core/cli/upgrade.el

@@ -17,16 +17,17 @@ following shell commands:
   (let ((doom-auto-discard force-p))
     (cond
      (packages-only-p
-      (doom-cli-execute "sync" '("-u"))
+      (doom-cli-execute "sync" "-u")
       (print! (success "Finished upgrading Doom Emacs")))
 
      ((doom-cli-upgrade doom-auto-accept doom-auto-discard)
       ;; Reload Doom's CLI & libraries, in case there were any upstream changes.
       ;; Major changes will still break, however
       (print! (info "Reloading Doom Emacs"))
-      (doom-cli-execute-after "doom" "upgrade" "-p" (if force-p "-f")))
+      (throw 'exit (list "doom" "upgrade" "-p" (if force-p "-f"))))
 
-     ((print! "Doom is up-to-date!")))))
+     ((print! "Doom is up-to-date!")
+      (doom-cli-execute "sync" "-u")))))
 
 
 ;;
@@ -92,7 +93,7 @@ following shell commands:
 
                ((equal this-rev new-rev)
                 (print! (success "Doom is already up-to-date!"))
-                t)
+                nil)
 
                ((print! (info "A new version of Doom Emacs is available!\n\n  Old revision: %s (%s)\n  New revision: %s (%s)\n"
                               (substring this-rev 0 10)