diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/telnet.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e639ebb5bf2..4a1d024c452 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * net/telnet.el (telnet-mode-map): Fix previous change. + 2010-10-12 Jan Djärv <jan.h.d@swipnet.se> * term/ns-win.el (ns-right-alternate-modifier): New defvar. diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el index caefafeef72..5d91245cdcb 100644 --- a/lisp/net/telnet.el +++ b/lisp/net/telnet.el @@ -63,7 +63,7 @@ LOGIN-NAME, which is optional, says what to log in as on that machine.") (defvar telnet-new-line "\r") (defvar telnet-mode-map (let ((map (nconc (make-sparse-keymap) comint-mode-map))) - (define-key telnet-mode-map "\C-m" 'telnet-send-input) + (define-key map "\C-m" 'telnet-send-input) ;; (define-key telnet-mode-map "\C-j" 'telnet-send-input) (define-key map "\C-c\C-q" 'send-process-next-char) (define-key map "\C-c\C-c" 'telnet-interrupt-subjob) |