From c0500df5fb31cbfec987ca360659a703134a330c Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 25 Aug 2020 05:07:24 -0400
Subject: [PATCH] bin/doom: move debugger config to core-cli

And remove unnecessary path expansion.
---
 bin/doom         | 11 +----------
 core/core-cli.el |  9 +++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/doom b/bin/doom
index 4d12c5ea4..f6c47111c 100755
--- a/bin/doom
+++ b/bin/doom
@@ -63,15 +63,6 @@
 (load (expand-file-name "core/core.el" user-emacs-directory) nil t)
 (require 'core-cli)
 
-;; Use our own home-grown debugger to display and log errors + backtraces.
-;; Control over its formatting is important, because Emacs produces
-;; difficult-to-read debug information otherwise. By making its errors more
-;; presentable (and storing them somewhere users can access them later) we go a
-;; long way toward making it easier for users to write better bug reports.
-(setq debugger #'doom-cli--debugger
-      debug-on-error t
-      debug-ignored-errors nil)
-
 ;; HACK Load `cl' and site files manually to prevent polluting logs and stdout
 ;;      with deprecation and/or file load messages.
 (quiet! (if EMACS27+ (require 'cl))
@@ -93,7 +84,7 @@
              (pred stringp)
              (pred keywordp))
          command)
-    (let ((script (doom-path (getenv "__DOOMPOST")))
+    (let ((script (getenv "__DOOMPOST"))
           (coding-system-for-write 'utf-8-unix)
           (coding-system-for-read  'utf-8-unix))
       (with-temp-file script
diff --git a/core/core-cli.el b/core/core-cli.el
index caa1a2bb8..a1df68504 100644
--- a/core/core-cli.el
+++ b/core/core-cli.el
@@ -548,6 +548,15 @@ best to run Doom out of ~/.emacs.d and ~/.doom.d."
 
 (doom-log "Initializing Doom CLI")
 
+;; Use our own home-grown debugger to display and log errors + backtraces.
+;; Control over its formatting is important, because Emacs produces
+;; difficult-to-read debug information otherwise. By making its errors more
+;; presentable (and storing them somewhere users can access them later) we go a
+;; long way toward making it easier for users to write better bug reports.
+(setq debugger #'doom-cli--debugger
+      debug-on-error t
+      debug-ignored-errors nil)
+
 ;; Clean slate for the next invocation
 (delete-file doom-cli-log-file)
 (delete-file doom-cli-log-error-file)