[Erc-commit] [commit][master] erc.el (erc-mode-map): Add binding for C-c C-x to erc-quit-server.

[mwolson]

commit 8d2731974700e71715fcf8df2ff50e39c8c44734
Author: Michael W. Olson <address@hidden>
Date:   Thu Jan 31 14:14:33 2008 -0500

    erc.el (erc-mode-map): Add binding for C-c C-x to erc-quit-server.

diff --git a/ChangeLog b/ChangeLog
index 74210b3..f242c22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
        will try sending or receiving a file with multiple consecutive
        spaces in its name, otherwise this fix will fail.
 
+       * erc.el (erc-mode-map): Add binding for C-c C-x to
+       erc-quit-server, since rcirc.el binds its quit command in a
+       similar manner.  Thanks to Jari Aalto for the suggestion.
+
 2008-01-28  Diane Murray  <address@hidden>
 
        * erc-list-old.el (list-old): Define module as list-old, not list.
diff --git a/erc.el b/erc.el
index 8b289a8..396febb 100644
--- a/erc.el
+++ b/erc.el
@@ -1110,6 +1110,7 @@ which the local user typed."
     (define-key map "\C-c\C-r" 'erc-remove-text-properties-region)
     (define-key map "\C-c\C-t" 'erc-set-topic)
     (define-key map "\C-c\C-u" 'erc-kill-input)
+    (define-key map "\C-c\C-x" 'erc-quit-server)
     (define-key map "\M-\t" 'ispell-complete-word)
     (define-key map "\t" 'erc-complete-word)