From 081f09aac88fb65848b3297cd0bb575c34274801 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 28 Aug 2019 20:13:45 -0400
Subject: [PATCH] Fix 'doom run' #1724

---
 bin/doom | 74 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/bin/doom b/bin/doom
index c1a125050..416c861e7 100755
--- a/bin/doom
+++ b/bin/doom
@@ -81,40 +81,42 @@
     (error "%s does not exist" user-emacs-directory))
 
   ;; Bootstrap Doom
-  (load (expand-file-name "core/core.el" user-emacs-directory)
-        nil 'nomessage)
+  (if (not noninteractive)
+      (progn
+        (load (expand-file-name "init.el" user-emacs-directory)
+              nil 'nomessage)
+        (doom-run-all-startup-hooks-h))
+    (load (expand-file-name "core/core.el" user-emacs-directory)
+          nil 'nomessage)
+    (doom-initialize 'force-p)
+    (doom-initialize-modules)
 
-  (doom-initialize 'force-p)
-  (doom-initialize-modules)
-
-  (cond ((not noninteractive)
-         (doom-run-all-startup-hooks-h))
-        ((and (not (cdr args))
-              (member (car args) '("help" "h")))
-         (usage))
-        ((not args)
-         (print! (error "No command detected.\n"))
-         (usage))
-        ((require 'core-cli)
-         (let ((default-directory user-emacs-directory))
-           (setq argv nil)
-           (condition-case e
-               (doom-dispatch (car args) (cdr args))
-             (user-error
-              (print! (error "%s\n") (error-message-string e))
-              (print! (yellow "See 'doom help %s' for documentation on this command.") (car args)))
-             ((debug error)
-              (message "--------------------------------------------------\n")
-              (message "There was an unexpected error:")
-              (message "  %s (%s)" (get (car e) 'error-message) (car e))
-              (dolist (item (cdr e))
-                (message "  %s" item))
-              (unless debug-on-error
-                (message
-                 (concat "\nRun the command again with the -d (or --debug) option to enable debug\n"
-                         "mode and, hopefully, generate a stack trace. If you decide to file a bug\n"
-                         "report, please include it!\n\n"
-                         "Emacs outputs to standard error, so you'll need to redirect stderr to\n"
-                         "stdout to pipe this to a file or clipboard!\n\n"
-                         "  e.g. doom -d install 2>&1 | clipboard-program"))
-                (signal 'doom-error e))))))))
+    (cond ((and (not (cdr args))
+                (member (car args) '("help" "h")))
+           (usage))
+          ((not args)
+           (print! (error "No command detected.\n"))
+           (usage))
+          ((require 'core-cli)
+           (let ((default-directory user-emacs-directory))
+             (setq argv nil)
+             (condition-case e
+                 (doom-dispatch (car args) (cdr args))
+               (user-error
+                (print! (error "%s\n") (error-message-string e))
+                (print! (yellow "See 'doom help %s' for documentation on this command.") (car args)))
+               ((debug error)
+                (message "--------------------------------------------------\n")
+                (message "There was an unexpected error:")
+                (message "  %s (%s)" (get (car e) 'error-message) (car e))
+                (dolist (item (cdr e))
+                  (message "  %s" item))
+                (unless debug-on-error
+                  (message
+                   (concat "\nRun the command again with the -d (or --debug) option to enable debug\n"
+                           "mode and, hopefully, generate a stack trace. If you decide to file a bug\n"
+                           "report, please include it!\n\n"
+                           "Emacs outputs to standard error, so you'll need to redirect stderr to\n"
+                           "stdout to pipe this to a file or clipboard!\n\n"
+                           "  e.g. doom -d install 2>&1 | clipboard-program"))
+                  (signal 'doom-error e)))))))))