From 2a927019fa311d838d972f2a29a30617d9a547c5 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 23 Feb 2008 18:58:56 +0000 Subject: ERC: Sync from upstream. --- lisp/erc/erc.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lisp/erc/erc.el') diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index e98c9d29baa..6cbf5f0b7a0 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/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) @@ -1168,7 +1169,8 @@ See the variable `erc-command-indicator'." :group 'erc-faces) (defface erc-notice-face - (if (featurep 'xemacs) + (if (or (featurep 'xemacs) + (< emacs-major-version 22)) '((t (:bold t :foreground "blue"))) '((((class color) (min-colors 88)) (:bold t :foreground "SlateBlue")) @@ -4026,7 +4028,7 @@ and as second argument the event parsed as a vector." (string= target (erc-current-nick))) (not (erc-get-buffer query proc)) (not (erc-is-message-ctcp-and-not-action-p msg)) - (let ((erc-join-buffer erc-auto-query)) + (let ((erc-query-display erc-auto-query)) (erc-cmd-QUERY query)) nil)))) -- cgit v1.2.1