From: Leo Liu Date: Wed, 5 Jun 2013 01:19:33 +0000 (+0800) Subject: * eshell/esh-mode.el (eshell-mode): Fix key bindings. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~78 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2587b005f0f11913c2158fe8c81b18ebfc0beca8;p=emacs.git * eshell/esh-mode.el (eshell-mode): Fix key bindings. --- 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 + + * eshell/esh-mode.el (eshell-mode): Fix key bindings. + 2013-06-04 Leo Liu * 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)