[Emacs-diffs] /srv/bzr/emacs/trunk r112850: * eshell/esh-mode.el (eshell-mode): Fix key bindings.

[Leo Liu]

------------------------------------------------------------
revno: 112850
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-05 09:19:33 +0800
message:
  * eshell/esh-mode.el (eshell-mode): Fix key bindings.
modified:
  lisp/ChangeLog
  lisp/eshell/esh-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-04 23:52:06 +0000
+++ b/lisp/ChangeLog    2013-06-05 01:19:33 +0000
@@ -1,3 +1,7 @@
+2013-06-05  Leo Liu  <address@hidden>
+
+       * eshell/esh-mode.el (eshell-mode): Fix key bindings.
+
 2013-06-04  Leo Liu  <address@hidden>
 
        * progmodes/compile.el (compile-goto-error): Add optional arg NOMSG.

=== modified file 'lisp/eshell/esh-mode.el'
--- a/lisp/eshell/esh-mode.el   2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/esh-mode.el   2013-06-05 01:19:33 +0000
@@ -326,11 +326,8 @@
       (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)