diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/eshell/esh-mode.el | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0910d1fc2b4..a4f52b506fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-06-05 Leo Liu <sdl.web@gmail.com> + + * eshell/esh-mode.el (eshell-mode): Fix key bindings. + 2013-06-04 Leo Liu <sdl.web@gmail.com> * progmodes/compile.el (compile-goto-error): Add optional arg NOMSG. diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index ee857cf20f3..5346bd16fd2 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -326,11 +326,8 @@ and the hook `eshell-exit-hook'." (if mode-line-elt (setcar mode-line-elt 'eshell-command-running-string)))) - (define-key eshell-mode-map [return] 'eshell-send-input) - (define-key eshell-mode-map [(control ?m)] 'eshell-send-input) - (define-key eshell-mode-map [(control ?j)] 'eshell-send-input) - (define-key eshell-mode-map [(meta return)] 'eshell-queue-input) - (define-key eshell-mode-map [(meta control ?m)] 'eshell-queue-input) + (define-key eshell-mode-map "\r" 'eshell-send-input) + (define-key eshell-mode-map "\M-\r" 'eshell-queue-input) (define-key eshell-mode-map [(meta control ?l)] 'eshell-show-output) (define-key eshell-mode-map [(control ?a)] 'eshell-bol) |