Fix #4176: eshell keybinds bound too soon

eshell-mode-map is defined in esh-mode.el, which isn't loaded
immediately by eshell.el.
This commit is contained in:
Henrik Lissner 2020-10-29 01:54:42 -04:00
parent 8eb8f41b33
commit 1b44cf9215
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -116,18 +116,20 @@ You should use `set-eshell-alias!' to change this.")
(setq +eshell--default-aliases eshell-command-aliases-list (setq +eshell--default-aliases eshell-command-aliases-list
eshell-command-aliases-list eshell-command-aliases-list
(append eshell-command-aliases-list (append eshell-command-aliases-list
+eshell-aliases)))) +eshell-aliases)))))
(after! esh-mode
(map! :map eshell-mode-map (map! :map eshell-mode-map
:n "RET" #'+eshell/goto-end-of-prompt :n "RET" #'+eshell/goto-end-of-prompt
:n [return] #'+eshell/goto-end-of-prompt :n [return] #'+eshell/goto-end-of-prompt
:ni "C-j" #'eshell-next-matching-input-from-input :ni "C-j" #'eshell-next-matching-input-from-input
:ni "C-k" #'eshell-previous-matching-input-from-input :ni "C-k" #'eshell-previous-matching-input-from-input
:ig "C-d" #'+eshell/quit-or-delete-char :ig "C-d" #'+eshell/quit-or-delete-char
:i "C-c h" #'evil-window-left :i "C-c h" #'evil-window-left
:i "C-c j" #'evil-window-down :i "C-c j" #'evil-window-down
:i "C-c k" #'evil-window-up :i "C-c k" #'evil-window-up
:i "C-c l" #'evil-window-right :i "C-c l" #'evil-window-right
"C-s" #'+eshell/search-history "C-s" #'+eshell/search-history
;; Emacs bindings ;; Emacs bindings
"C-e" #'end-of-line "C-e" #'end-of-line