diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 23:45:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 23:45:27 -0700 |
| commit | ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6 (patch) | |
| tree | e95220daac6b9ffb47966df747308a11c0623179 /lisp/net/rcirc.el | |
| parent | d5efd1d1b54595db795d6fddb32404cc74923d77 (diff) | |
| parent | b87a82007428428e2f24af64a59799402bb1651e (diff) | |
| download | emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.tar.gz emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.tar.bz2 emacs-ca23cc8840efb1354ebe16c6bb99bf1f8880e9b6.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/net/rcirc.el')
| -rw-r--r-- | lisp/net/rcirc.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 5822fc3cf32..663c1ded9f1 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -4,7 +4,7 @@ ;; Author: Ryan Yeske <rcyeske@gmail.com> ;; Maintainers: Ryan Yeske <rcyeske@gmail.com>, -;; Deniz Dogan <deniz.a.m.dogan@gmail.com> +;; Deniz Dogan <deniz@dogan.se> ;; Keywords: comm ;; This file is part of GNU Emacs. @@ -900,7 +900,6 @@ IRC command completion is performed only if '/' is the first input char." (define-key map (kbd "C-c C-m") 'rcirc-cmd-msg) (define-key map (kbd "C-c C-r") 'rcirc-cmd-nick) ; rename (define-key map (kbd "C-c C-o") 'rcirc-omit-mode) - (define-key map (kbd "M-o") 'rcirc-omit-mode) (define-key map (kbd "C-c C-p") 'rcirc-cmd-part) (define-key map (kbd "C-c C-q") 'rcirc-cmd-query) (define-key map (kbd "C-c C-t") 'rcirc-cmd-topic) |