aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-05-11 08:40:43 -0400
committerStefan Monnier2012-05-11 08:40:43 -0400
commitd9d1dfefe13b0f0a5f5402ab57bf8d22cd040486 (patch)
treeb57d89de47cd25fc45d59728ae833123921abab0
parent297834cdf39433f7bf8e63d6c784a3a2a9889b08 (diff)
downloademacs-d9d1dfefe13b0f0a5f5402ab57bf8d22cd040486.tar.gz
emacs-d9d1dfefe13b0f0a5f5402ab57bf8d22cd040486.zip
* net/rlogin.el (rlogin-mode-map): Fix last change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rlogin.el12
2 files changed, 10 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e6a3c0f106..e6183d92705 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-05-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * net/rlogin.el (rlogin-mode-map): Fix last change.
4
12012-05-09 Jason L. Wright <jason.wright@inl.gov> (tiny change) 52012-05-09 Jason L. Wright <jason.wright@inl.gov> (tiny change)
2 6
3 * mail/smtpmail.el (smtpmail-send-command): Send the command and 7 * mail/smtpmail.el (smtpmail-send-command): Send the command and
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index ac936ee1429..cef615dc320 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -114,12 +114,12 @@ this variable is set from that."
114 (let ((map (if (consp shell-mode-map) 114 (let ((map (if (consp shell-mode-map)
115 (cons 'keymap shell-mode-map) 115 (cons 'keymap shell-mode-map)
116 (copy-keymap shell-mode-map)))) 116 (copy-keymap shell-mode-map))))
117 (define-key rlogin-mode-map "\C-c\C-c" 'rlogin-send-Ctrl-C) 117 (define-key map "\C-c\C-c" 'rlogin-send-Ctrl-C)
118 (define-key rlogin-mode-map "\C-c\C-d" 'rlogin-send-Ctrl-D) 118 (define-key map "\C-c\C-d" 'rlogin-send-Ctrl-D)
119 (define-key rlogin-mode-map "\C-c\C-z" 'rlogin-send-Ctrl-Z) 119 (define-key map "\C-c\C-z" 'rlogin-send-Ctrl-Z)
120 (define-key rlogin-mode-map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash) 120 (define-key map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash)
121 (define-key rlogin-mode-map "\C-d" 'rlogin-delchar-or-send-Ctrl-D) 121 (define-key map "\C-d" 'rlogin-delchar-or-send-Ctrl-D)
122 (define-key rlogin-mode-map "\C-i" 'rlogin-tab-or-complete) 122 (define-key map "\C-i" 'rlogin-tab-or-complete)
123 map) 123 map)
124 "Keymap for `rlogin-mode'.") 124 "Keymap for `rlogin-mode'.")
125 125