aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-10-12 03:48:58 +0200
committerJuanma Barranquero2010-10-12 03:48:58 +0200
commit16366259f41b941da3d0105a812a2ceffa6a6585 (patch)
tree2a783258ef2257cdc4b650de750d1cd77b7e330e
parent98e2b86485ad27c2ed524bea1c481e1faaa09079 (diff)
downloademacs-16366259f41b941da3d0105a812a2ceffa6a6585.tar.gz
emacs-16366259f41b941da3d0105a812a2ceffa6a6585.zip
lisp/net/telnet.el (telnet-mode-map): Fix previous change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/telnet.el2
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 @@
12010-10-12 Juanma Barranquero <lekktu@gmail.com>
2
3 * net/telnet.el (telnet-mode-map): Fix previous change.
4
12010-10-12 Jan Djärv <jan.h.d@swipnet.se> 52010-10-12 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * term/ns-win.el (ns-right-alternate-modifier): New defvar. 7 * 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.")
63(defvar telnet-new-line "\r") 63(defvar telnet-new-line "\r")
64(defvar telnet-mode-map 64(defvar telnet-mode-map
65 (let ((map (nconc (make-sparse-keymap) comint-mode-map))) 65 (let ((map (nconc (make-sparse-keymap) comint-mode-map)))
66 (define-key telnet-mode-map "\C-m" 'telnet-send-input) 66 (define-key map "\C-m" 'telnet-send-input)
67 ;; (define-key telnet-mode-map "\C-j" 'telnet-send-input) 67 ;; (define-key telnet-mode-map "\C-j" 'telnet-send-input)
68 (define-key map "\C-c\C-q" 'send-process-next-char) 68 (define-key map "\C-c\C-q" 'send-process-next-char)
69 (define-key map "\C-c\C-c" 'telnet-interrupt-subjob) 69 (define-key map "\C-c\C-c" 'telnet-interrupt-subjob)