From MAILER-DAEMON Mon Feb 04 19:00:20 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JMBEZ-0002LS-Sc
	for mharc-erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JMBEY-0002KK-In
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:18 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JMBEX-0002Io-1e
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:18 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JMBEW-0002Il-Sb
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:16 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1JMBEW-0004ou-UJ
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:17 -0500
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1JMBEV-0000H2-OB
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:15 -0500
Received: from localhost ([127.0.0.1] helo=mire.hcoop.net ident=mwolson)
	by mire.hcoop.net with smtp (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1JMBEU-0006Xi-Dx
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:15 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Mon, 04 Feb 2008 19:00:14 -0500
Date: Mon, 04 Feb 2008 19:00:14 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JMBEU-0006Xi-Dx@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix (erc-auto-query) to properly use
	`erc-auto-query'
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Feb 2008 00:00:18 -0000

commit 074f92f2462c5f04ffb2cf9206cfed220304d0b2
Author: Jeremy Maitin-Shepard <jbms@cmu.edu>
Date:   Mon Feb 4 13:25:44 2008 -0500

    Fix (erc-auto-query) to properly use `erc-auto-query'
    
    (erc-auto-query) previously called (erc-cmd-QUERY) with
    `erc-join-buffer' let-bound to `erc-auto-query', but (erc-cmd-QUERY)
    uses `erc-query-display' rather than `erc-join-buffer'.

diff --git a/erc.el b/erc.el
index 396febb..9c8b0b3 100644
--- a/erc.el
+++ b/erc.el
@@ -4020,7 +4020,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))))
 



From MAILER-DAEMON Mon Feb 04 19:00:24 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JMBEe-0002OP-0u
	for mharc-erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:24 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JMBEc-0002NY-2P
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JMBEa-0002MF-Pn
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:21 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JMBEa-0002M3-CD
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:20 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1JMBEa-0004pW-E6
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:20 -0500
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1JMBEZ-0000H9-81
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:19 -0500
Received: from localhost ([127.0.0.1] helo=mire.hcoop.net ident=mwolson)
	by mire.hcoop.net with smtp (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1JMBEX-0006Z1-PU
	for erc-commit@gnu.org; Mon, 04 Feb 2008 19:00:18 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Mon, 04 Feb 2008 19:00:17 -0500
Date: Mon, 04 Feb 2008 19:00:17 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JMBEX-0006Z1-PU@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add ChangeLog entry.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Feb 2008 00:00:22 -0000

commit 77da9d1a4500a1b6040f29f294ad18dd2d9f97f2
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Feb 4 17:52:27 2008 -0600

    Add ChangeLog entry.

diff --git a/ChangeLog b/ChangeLog
index f242c22..e6c5478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-04  Jeremy Maitin-Shepard  <jbms@cmu.edu>
+
+	* erc.el (erc-cmd-QUERY): Bind the value of `erc-auto-query' to
+	`erc-query-display' rather than `erc-join-buffer'.  This fixes a
+	bug where the value of erc-auto-query was being ignored.
+
 2008-01-31  Michael Olson  <mwolson@gnu.org>
 
 	* erc-dcc.el (erc-dcc-do-GET-command, erc-dcc-do-SEND-command):



From MAILER-DAEMON Wed Feb 20 16:00:28 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JRw3I-00035C-4Z
	for mharc-erc-commit@gnu.org; Wed, 20 Feb 2008 16:00:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JRw3G-00034b-7V
	for erc-commit@gnu.org; Wed, 20 Feb 2008 16:00:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JRw3B-00031R-FJ
	for erc-commit@gnu.org; Wed, 20 Feb 2008 16:00:25 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JRw3B-00031D-2u
	for erc-commit@gnu.org; Wed, 20 Feb 2008 16:00:21 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1JRw3A-00028h-Mv
	for erc-commit@gnu.org; Wed, 20 Feb 2008 16:00:20 -0500
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1JRw38-00043R-1E
	for erc-commit@gnu.org; Wed, 20 Feb 2008 16:00:19 -0500
Received: from localhost ([127.0.0.1] helo=mire.hcoop.net ident=mwolson)
	by mire.hcoop.net with smtp (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1JRw36-0001w0-5N
	for erc-commit@gnu.org; Wed, 20 Feb 2008 16:00:17 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 20 Feb 2008 16:00:16 -0500
Date: Wed, 20 Feb 2008 16:00:16 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JRw36-0001w0-5N@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc.el (erc-notice-face): Fix this
	face for Emacs 21 users.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Feb 2008 21:00:26 -0000

commit 0e3f94486f4a503143057499c836fcdfc6b72945
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Feb 20 14:53:14 2008 -0600

    erc.el (erc-notice-face): Fix this face for Emacs 21 users.

diff --git a/ChangeLog b/ChangeLog
index e6c5478..1a0b496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-20  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-notice-face): Fix this face for Emacs 21 users.
+
 2008-02-04  Jeremy Maitin-Shepard  <jbms@cmu.edu>
 
 	* erc.el (erc-cmd-QUERY): Bind the value of `erc-auto-query' to
diff --git a/erc.el b/erc.el
index 9c8b0b3..79f743a 100644
--- a/erc.el
+++ b/erc.el
@@ -1169,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"))



