From 71d9ceead42611d83efc6cc58df3ea7cbc0dbdac Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 12 Mar 2025 18:21:39 -0400
Subject: [PATCH] fix: ensure empty DEBUG envvar is ignored

Also ensures the envvar is removed if it's empty, and doesn't permeate
an empty DEBUG when executing doom/reload.

Amend: 8c7711920e6d
Close: #8310
Co-authored-by: AjaiKN <AjaiKN@users.noreply.github.com>
---
 early-init.el      | 9 ++++++---
 lisp/doom-lib.el   | 2 +-
 lisp/lib/config.el | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/early-init.el b/early-init.el
index 0e76bc4ad..4859fe272 100644
--- a/early-init.el
+++ b/early-init.el
@@ -49,9 +49,12 @@
 
   ;; UX: Respect DEBUG envvar as an alternative to --debug-init, and to make
   ;;   startup more verbose sooner.
-  (when (getenv-internal "DEBUG")
-    (setq init-file-debug t
-          debug-on-error t))
+  (let ((debug (getenv-internal "DEBUG")))
+    (when (stringp debug)
+      (if (string-empty-p debug)
+          (setenv "DEBUG" nil)
+        (setq init-file-debug t
+              debug-on-error t))))
 
   (let (;; FIX: Unset `command-line-args' in noninteractive sessions, to
         ;;   ensure upstream switches aren't misinterpreted.
diff --git a/lisp/doom-lib.el b/lisp/doom-lib.el
index ed4b75578..a4f32e334 100644
--- a/lisp/doom-lib.el
+++ b/lisp/doom-lib.el
@@ -41,7 +41,7 @@ TYPE should be a keyword of any of the known doom-*-error errors (e.g. :font,
 (defvar doom-log-level
   (if init-file-debug
       (if-let* ((level (getenv-internal "DEBUG"))
-                (level (string-to-number level))
+                (level (if (string-empty-p level) 1 (string-to-number level)))
                 ((not (zerop level))))
           level
         2)
diff --git a/lisp/lib/config.el b/lisp/lib/config.el
index 97a585a12..4bac47ce3 100644
--- a/lisp/lib/config.el
+++ b/lisp/lib/config.el
@@ -45,7 +45,7 @@
           ("EMACSDIR" doom-emacs-dir)
           ("DOOMDIR" doom-user-dir)
           ("DOOMLOCALDIR" doom-local-dir)
-          ("DEBUG" (if doom-debug-mode (number-to-string doom-log-level) "")))
+          ("DEBUG" (if doom-debug-mode (number-to-string doom-log-level))))
        (with-current-buffer
            (compile (format ,command (expand-file-name doom-bin doom-bin-dir)) t)
          (let ((w (get-buffer-window (current-buffer))))