From 3761f96c746d57dbb00b349c4c964e80f3b8deaf Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Mon, 4 Feb 2019 20:21:55 +0100
Subject: [PATCH] comint: Match Eshell bindings for prompt navigation

---
 evil-collection-comint.el | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/evil-collection-comint.el b/evil-collection-comint.el
index f0281a8..a2abcd8 100644
--- a/evil-collection-comint.el
+++ b/evil-collection-comint.el
@@ -40,12 +40,15 @@
       (kbd "C-d") #'evil-scroll-down))
 
   (evil-collection-define-key 'normal 'comint-mode-map
-    (kbd "C-j") #'comint-next-input
-    (kbd "C-k") #'comint-previous-input
-    (kbd "gj") #'comint-next-input
-    (kbd "gk") #'comint-previous-input
-    (kbd "]") #'comint-next-input
-    (kbd "[") #'comint-previous-input)
+    ;; Match Eshell bindings:
+    (kbd "C-j") #'comint-next-prompt
+    (kbd "C-k") #'comint-previous-prompt
+    (kbd "gj") #'comint-next-prompt
+    (kbd "gk") #'comint-previous-prompt
+    (kbd "]") #'comint-next-prompt
+    (kbd "[") #'comint-previous-prompt
+    (kbd "C-p") #'comint-previous-input
+    (kbd "C-n") #'comint-next-input)
 
   (evil-collection-define-key 'insert 'comint-mode-map
     (kbd "<up>") #'comint-previous-input