From 209092c5780e16c85b4572dcc787ef44e9e6f452 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 22 Jun 2022 11:47:54 +0200
Subject: [PATCH] refactor(cli): don't reboot bin/doom on --pager

Also adds comments to explain why we're rebooting (or not) for these
settings.
---
 bin/doom | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/doom b/bin/doom
index 7abe2f97d..ccc84aadd 100755
--- a/bin/doom
+++ b/bin/doom
@@ -203,12 +203,12 @@ SEE ALSO:
     instead."
   (when color?
     (setq doom-print-backend (if (eq color? :yes) 'ansi)))
+  ;; For these settings to take full effect, the script must be restarted:
   (when (and (equal (doom-cli-context-step context) 0)
              (or ;; profile
                  debug?
                  emacsdir
-                 doomdir
-                 pager))
+                 doomdir))
     ;; TODO Implement after v3.0
     ;; (when profile
     ;;   (setenv "DOOMPROFILE" profile))
@@ -219,9 +219,10 @@ SEE ALSO:
       (setenv "EMACSDIR" emacsdir))
     (when doomdir
       (setenv "DOOMDIR" doomdir))
-    (when pager
-      (setenv "DOOMPAGER" pager))
     (exit! :restart))
+  ;; But these don't need a restart:
+  (when pager
+    (setenv "DOOMPAGER" pager))
   (when force?
     (setf (doom-cli-context-suppress-prompts-p context) t)
     (doom-log "User requested all prompts be suppressed"))