From 742f5b26ed30b47412cad2b89d96f31e7d7b8579 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 7 Jan 2018 15:25:35 -0500
Subject: [PATCH] Improve popup compatibility for eshell & multi-term

---
 modules/feature/popup/config.el         | 3 +++
 modules/tools/eshell/autoload/eshell.el | 2 +-
 modules/tools/eshell/config.el          | 5 +----
 modules/tools/term/config.el            | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/feature/popup/config.el b/modules/feature/popup/config.el
index a5a1cd889..f48ec8f07 100644
--- a/modules/feature/popup/config.el
+++ b/modules/feature/popup/config.el
@@ -144,6 +144,9 @@ ALIST supports one custom parameter: `size', which will resolve to
   (set! :popup "^\\*Help"
     '((slot . -1) (size . 0.2))
     '((select . t)))
+  (set! :popup "^\\*\\(?:term\\|doom eshell\\)"
+    '((size . 0.25))
+    '((select . t) (quit) (transient . 0)))
   (set! :popup "^\\*doom:"
     '((size . 0.35))
     '((select . t) (modeline . t) (quit) (transient))))
diff --git a/modules/tools/eshell/autoload/eshell.el b/modules/tools/eshell/autoload/eshell.el
index b15c4aa76..2b2fa81df 100644
--- a/modules/tools/eshell/autoload/eshell.el
+++ b/modules/tools/eshell/autoload/eshell.el
@@ -3,7 +3,7 @@
 (defvar +eshell-buffers ()
   "List of open eshell buffers.")
 
-(defvar +eshell-buffer-name "*doom:eshell*"
+(defvar +eshell-buffer-name "*doom eshell*"
   "The name to use for custom eshell buffers. This only affects `+eshell/open',
 `+eshell/open-popup' and `+eshell/open-workspace'.")
 
diff --git a/modules/tools/eshell/config.el b/modules/tools/eshell/config.el
index 49efa7074..cc7ea5d6c 100644
--- a/modules/tools/eshell/config.el
+++ b/modules/tools/eshell/config.el
@@ -60,11 +60,8 @@ redefines its keys every time `eshell-mode' is enabled."
           :i "C-n"      #'eshell-next-input
           :i "<down>"   #'eshell-next-input
           :m "<return>" #'+eshell/evil-append
-          :n [remap evil-window-split]     #'+eshell/split
-          :n [remap evil-window-vsplit]    #'+eshell/vsplit
           :n [remap evil-record-macro]     #'eshell-life-is-too-much
-          [remap kill-this-buffer] #'eshell-life-is-too-much
-          [remap +workspace/close-window-or-workspace] #'eshell-life-is-too-much))
+          [remap kill-this-buffer] #'eshell-life-is-too-much))
   (add-hook 'eshell-mode-hook #'+eshell|init-keymap)
 
   ;; Aliases
diff --git a/modules/tools/term/config.el b/modules/tools/term/config.el
index c3588e746..adb1d470b 100644
--- a/modules/tools/term/config.el
+++ b/modules/tools/term/config.el
@@ -4,4 +4,5 @@
   :commands (multi-term multi-term-next multi-term-prev)
   :config
   (setq multi-term-program (getenv "SHELL")
+        multi-term-dedicated-window-height 20
         multi-term-switch-after-close 'PREVIOUS))