From 6ef44cb72c995c9a59b2fa2b7f3b14173628ae99 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin@gnu.org>
Date: Wed, 29 Aug 2018 23:02:42 -0400
Subject: [PATCH] [emacs] assimilate shell-pop

---
 .gitmodules   |  3 +++
 init.org      | 11 +++++++++++
 lib/shell-pop |  1 +
 3 files changed, 15 insertions(+)
 create mode 160000 lib/shell-pop

diff --git a/.gitmodules b/.gitmodules
index 6a2f4a9..a4082c6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,6 +178,9 @@
 [submodule "shackle"]
 	path = lib/shackle
 	url = git@github.com:wasamasa/shackle.git
+[submodule "shell-pop"]
+	path = lib/shell-pop
+	url = git@github.com:kyagi/shell-pop-el.git
 [submodule "shrink-path"]
 	path = lib/shrink-path
 	url = git@gitlab.com:bennya/shrink-path.el.git
diff --git a/init.org b/init.org
index 56e7752..058401a 100644
--- a/init.org
+++ b/init.org
@@ -1208,6 +1208,17 @@ Emacs package that displays available keybindings in popup
    ("C-h C"   . helpful-command)))
 #+end_src
 
+** [[https://github.com/kyagi/shell-pop-el][shell-pop]]
+
+#+begin_src emacs-lisp
+(use-package shell-pop
+  :config
+  (add-to-list 'shackle-rules '("\\*eshell\\*" :regexp t :same t))
+  :custom
+  (shell-pop-universal-key "C-c e")
+  (shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell)))))
+#+end_src
+
 * Email
 ** [[https://notmuchmail.org][notmuch]]
 
diff --git a/lib/shell-pop b/lib/shell-pop
new file mode 160000
index 0000000..4a3a9d0
--- /dev/null
+++ b/lib/shell-pop
@@ -0,0 +1 @@
+Subproject commit 4a3a9d093ad1add792bba764c601aa28de302b34
-- 
2.20.1