From 1b44cf92151c8d31fc4573d28cdf07c0c90132c8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 29 Oct 2020 01:54:42 -0400 Subject: [PATCH] Fix #4176: eshell keybinds bound too soon eshell-mode-map is defined in esh-mode.el, which isn't loaded immediately by eshell.el. --- modules/term/eshell/config.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el index 26a3fc0d0..9e0842753 100644 --- a/modules/term/eshell/config.el +++ b/modules/term/eshell/config.el @@ -116,18 +116,20 @@ You should use `set-eshell-alias!' to change this.") (setq +eshell--default-aliases eshell-command-aliases-list eshell-command-aliases-list (append eshell-command-aliases-list - +eshell-aliases)))) + +eshell-aliases))))) + +(after! esh-mode (map! :map eshell-mode-map - :n "RET" #'+eshell/goto-end-of-prompt - :n [return] #'+eshell/goto-end-of-prompt + :n "RET" #'+eshell/goto-end-of-prompt + :n [return] #'+eshell/goto-end-of-prompt :ni "C-j" #'eshell-next-matching-input-from-input :ni "C-k" #'eshell-previous-matching-input-from-input :ig "C-d" #'+eshell/quit-or-delete-char - :i "C-c h" #'evil-window-left - :i "C-c j" #'evil-window-down - :i "C-c k" #'evil-window-up - :i "C-c l" #'evil-window-right + :i "C-c h" #'evil-window-left + :i "C-c j" #'evil-window-down + :i "C-c k" #'evil-window-up + :i "C-c l" #'evil-window-right "C-s" #'+eshell/search-history ;; Emacs bindings "C-e" #'end-of-line