aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2011-04-05 06:31:24 +0200
committerDeniz Dogan2011-04-05 06:31:24 +0200
commit0f6ee7d2d765a01b3c9a23ca1603ef517e3bf025 (patch)
tree11930e07c71c2c34f217d65e5211f26b988cd0e8
parent3b2ff876a5b9280a2c634137338cf78cd4ea588c (diff)
downloademacs-0f6ee7d2d765a01b3c9a23ca1603ef517e3bf025.tar.gz
emacs-0f6ee7d2d765a01b3c9a23ca1603ef517e3bf025.zip
* lisp/net/rcirc.el (rcirc-mode-map): Remove M-o binding.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0037d37110e..7a0e5a9cc97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-04-05 Deniz Dogan <deniz.a.m.dogan@gmail.com>
2
3 * net/rcirc.el (rcirc-mode-map): Remove M-o binding.
4
12011-04-05 Chong Yidong <cyd@stupidchicken.com> 52011-04-05 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * startup.el (command-line): Save the cursor's theme-face 7 * startup.el (command-line): Save the cursor's theme-face
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 5822fc3cf32..d35a5a37d0f 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -900,7 +900,6 @@ IRC command completion is performed only if '/' is the first input char."
900 (define-key map (kbd "C-c C-m") 'rcirc-cmd-msg) 900 (define-key map (kbd "C-c C-m") 'rcirc-cmd-msg)
901 (define-key map (kbd "C-c C-r") 'rcirc-cmd-nick) ; rename 901 (define-key map (kbd "C-c C-r") 'rcirc-cmd-nick) ; rename
902 (define-key map (kbd "C-c C-o") 'rcirc-omit-mode) 902 (define-key map (kbd "C-c C-o") 'rcirc-omit-mode)
903 (define-key map (kbd "M-o") 'rcirc-omit-mode)
904 (define-key map (kbd "C-c C-p") 'rcirc-cmd-part) 903 (define-key map (kbd "C-c C-p") 'rcirc-cmd-part)
905 (define-key map (kbd "C-c C-q") 'rcirc-cmd-query) 904 (define-key map (kbd "C-c C-q") 'rcirc-cmd-query)
906 (define-key map (kbd "C-c C-t") 'rcirc-cmd-topic) 905 (define-key map (kbd "C-c C-t") 'rcirc-cmd-topic)