From MAILER-DAEMON Thu Jan 10 01:10:18 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCqcL-0000cO-Qi
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCqcJ-0000ZM-J3
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCqcH-0000Wd-Rv
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCqcH-0000WO-Dl
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:13 -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 1JCqcH-00048M-4n
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:13 -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 1JCqcG-0006tY-Cg
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:12 -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 1JCqcE-0006St-TJ
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:11 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 01:10:10 -0500
Date: Thu, 10 Jan 2008 01:10:10 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCqcE-0006St-TJ@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-ibuffer.el: Pass mode-name
	through format-mode-line.
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: Thu, 10 Jan 2008 06:10:16 -0000

commit cc57cf8daa661b34de9c4a6447cd6267e6b8ec7d
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Wed Jan 9 22:30:25 2008 -0500

    erc-ibuffer.el: Pass mode-name through format-mode-line.

diff --git a/ChangeLog b/ChangeLog
index 53cbede..9039867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* erc-ibuffer.el (erc-channel-modes):
+	Pass mode-name through format-mode-line
+
 2007-12-16  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-services.el (erc-nickserv-alist): Removed autodetect regexp,
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index 76c2d2b..3792b2c 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -158,8 +158,8 @@
 		  (format "l %d" erc-channel-user-limit)
 		"")
 	      ")")
-    (if (not (eq major-mode 'erc-mode))
-	mode-name
+    (if (not (derived-mode-p 'erc-mode))
+	(format-mode-line mode-name nil nil (current-buffer))
       "")))
 
 (define-ibuffer-column erc-nick (:name "Nick")



From MAILER-DAEMON Thu Jan 10 01:10:20 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCqcN-0000ea-FK
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCqcL-0000bH-2F
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCqcK-0000Zq-6C
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:16 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCqcJ-0000ZT-Mm
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:15 -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 1JCqcJ-00048m-7I
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:15 -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 1JCqcI-0006tg-Q2
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:14 -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 1JCqcH-0006TS-Cs
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:14 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 01:10:13 -0500
Date: Thu, 10 Jan 2008 01:10:13 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCqcH-0006TS-Cs@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Bookkeeping from Emacs.
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: Thu, 10 Jan 2008 06:10:17 -0000

commit 0818660988c12fa2cb42d985a41aeda753c9be92
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 9 22:35:08 2008 -0500

    Bookkeeping from Emacs.

diff --git a/ChangeLog b/ChangeLog
index 9039867..6e4abad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -191,8 +191,7 @@
 	(erc-modified-channels-display): If erc-track-switch-direction is
 	'importance, call erc-track-sort-by-importance.
 	(erc-track-face-priority): New function that returns a number
-	indicating the position of a face in
-	erc-track-faces-priority-list.
+	indicating the position of a face in erc-track-faces-priority-list.
 	(erc-track-sort-by-importance): New function that sorts
 	erc-modified-channels-list according to erc-track-face-priority.
 	(erc-track-get-active-buffer): Make 'oldest a rough opposite of
@@ -232,8 +231,7 @@
 	(erc-buffer-visible): Use erc-track-get-buffer-window.
 	(erc-modified-channels-update): Take
 	erc-track-remove-disconnected-buffers into account.
-	(erc-modified-channels-display): Run
-	`erc-track-list-changed-hook'.
+	(erc-modified-channels-display): Run `erc-track-list-changed-hook'.
 
 	* erc.el (erc-reuse-frames): New option that determines whether
 	new frames are always created.  Defaults to t.  This only has an
@@ -345,8 +343,7 @@
 
 2007-06-17  Michael Olson  <mwolson@gnu.org>
 
-	* erc-pkg.el: Update description to match what is currently in
-	ELPA.
+	* erc-pkg.el: Update description to match what is currently in ELPA.
 
 2007-06-14  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -406,7 +403,7 @@
 	(debclean): New rule to clean old Debian packages of ERC.
 	(debprepare): Don't modify the released tarball, but copy it as
 	the .orig.tar.gz file.
-	(debrelease. debrevision): Remove.
+	(debrelease, debrevision): Remove.
 	(debinstall): New target that copies the generated Debian file to
 	a distro-specific location.
 	(deb): New rule that chains together the stages in building a
@@ -820,7 +817,7 @@
 
 See ChangeLog.06 for earlier changes.
 
-    Copyright (C) 2007 Free Software Foundation, Inc.
+    Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/ChangeLog.01 b/ChangeLog.01
index 9c03d79..018610a 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -1035,7 +1035,7 @@
 
 	* erc-speak.el 1.1, erc.el 1.1: New file.
 
-    Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/ChangeLog.02 b/ChangeLog.02
index 0d793b5..93ded7a 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -2596,7 +2596,7 @@
 
 See ChangeLog.01 for earlier changes.
 
-    Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/ChangeLog.03 b/ChangeLog.03
index 61b2b1e..ea5f094 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -2140,7 +2140,7 @@
 
 See ChangeLog.02 for earlier changes.
 
-    Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/ChangeLog.04 b/ChangeLog.04
index a707bc3..b13cdb0 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -2069,7 +2069,7 @@
 
 See ChangeLog.03 for earlier changes.
 
-    Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/ChangeLog.05 b/ChangeLog.05
index ba6e098..fa6095d 100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@ -1217,7 +1217,7 @@
 
 See ChangeLog.04 for earlier changes.
 
-    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/ChangeLog.06 b/ChangeLog.06
index 46b1d38..1186c70 100644
--- a/ChangeLog.06
+++ b/ChangeLog.06
@@ -1496,7 +1496,7 @@
 
 See ChangeLog.05 for earlier changes.
 
-    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/NEWS b/NEWS
index 991bfe1..7d9cecf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 ERC NEWS                                                       -*- outline -*-
 
-Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 2006, 2007, 2008  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 * Changes in ERC 5.3
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 4c84138..d777b4e 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -1,6 +1,6 @@
 ;;; erc-autoaway.el --- Provides autoaway for ERC
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
diff --git a/erc-backend.el b/erc-backend.el
index 62b73f0..5fe0efd 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1,6 +1,6 @@
 ;;; erc-backend.el --- Backend network communication for ERC
 
-;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Filename: erc-backend.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
diff --git a/erc-button.el b/erc-button.el
index 81c604d..a74d56b 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -1,7 +1,7 @@
 ;; erc-button.el --- A way of buttonizing certain things in ERC buffers
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2006, 2007 Free Software Foundation, Inc.
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: irc, button, url, regexp
diff --git a/erc-capab.el b/erc-capab.el
index 2741029..4876dec 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -1,6 +1,6 @@
 ;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB
 
-;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
diff --git a/erc-compat.el b/erc-compat.el
index 626d812..0d31e86 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -1,6 +1,6 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
 
-;; Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
diff --git a/erc-dcc.el b/erc-dcc.el
index ed69e45..8158c09 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -1,6 +1,6 @@
 ;;; erc-dcc.el --- CTCP DCC module for ERC
 
-;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007
+;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007, 2008
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index 58d886a..ff04129 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -1,6 +1,6 @@
 ;;; erc-ezbounce.el ---  Handle EZBounce bouncer commands
 
-;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: comm
diff --git a/erc-fill.el b/erc-fill.el
index 98180e9..6ef5774 100644
--- a/erc-fill.el
+++ b/erc-fill.el
@@ -1,7 +1,7 @@
 ;;; erc-fill.el --- Filling IRC messages in various ways
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
-;;   2007 Free Software Foundation, Inc.
+;;   2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
diff --git a/erc-goodies.el b/erc-goodies.el
index 9131ce6..9612b00 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -1,6 +1,6 @@
 ;; erc-goodies.el --- Collection of ERC modules
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
diff --git a/erc-hecomplete.el b/erc-hecomplete.el
index 6876637..75cc50a 100644
--- a/erc-hecomplete.el
+++ b/erc-hecomplete.el
@@ -1,6 +1,6 @@
 ;;; erc-hecomplete.el --- Provides Nick name completion for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index 3792b2c..14ac365 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -1,6 +1,6 @@
 ;;; erc-ibuffer.el --- ibuffer integration with ERC
 
-;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/erc-identd.el b/erc-identd.el
index dcbe463..205ab19 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -1,6 +1,6 @@
 ;;; erc-identd.el --- RFC1413 (identd authentication protocol) server
 
-;; Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: comm, processes
diff --git a/erc-imenu.el b/erc-imenu.el
index cd5923f..37ae552 100644
--- a/erc-imenu.el
+++ b/erc-imenu.el
@@ -1,6 +1,6 @@
 ;;; erc-imenu.el -- Imenu support for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/erc-join.el b/erc-join.el
index dcc7e7f..b9b85bf 100644
--- a/erc-join.el
+++ b/erc-join.el
@@ -1,6 +1,6 @@
 ;;; erc-join.el --- autojoin channels on connect and reconnects
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: irc
diff --git a/erc-lang.el b/erc-lang.el
index b11721d..e3858eb 100644
--- a/erc-lang.el
+++ b/erc-lang.el
@@ -1,6 +1,6 @@
 ;;; erc-lang.el --- provide the LANG command to ERC
 
-;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/erc-log.el b/erc-log.el
index fe3e703..c48b5d9 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -1,6 +1,6 @@
 ;;; erc-log.el --- Logging facilities for ERC.
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Lawrence Mitchell <wence@gmx.li>
 ;; Keywords: IRC, chat, client, Internet, logging
diff --git a/erc-match.el b/erc-match.el
index 757ef66..a98b1d9 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -1,7 +1,7 @@
 ;;; erc-match.el --- Highlight messages matching certain regexps
 
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
-;;   2007 Free Software Foundation, Inc.
+;;   2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: comm, faces
diff --git a/erc-menu.el b/erc-menu.el
index dd2d9c2..c47f754 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -1,7 +1,7 @@
 ;; erc-menu.el -- Menu-bar definitions for ERC
 
 ;; Copyright (C) 2001, 2002, 2004, 2005, 2006,
-;;   2007 Free Software Foundation, Inc.
+;;   2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, menu
diff --git a/erc-netsplit.el b/erc-netsplit.el
index b20b7ad..5bcb432 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -1,6 +1,6 @@
 ;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/erc-networks.el b/erc-networks.el
index 28f6f0d..48efd41 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -1,6 +1,6 @@
 ;;; erc-networks.el --- IRC networks
 
-;; Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Keywords: comm
diff --git a/erc-notify.el b/erc-notify.el
index 34556a0..7f77730 100644
--- a/erc-notify.el
+++ b/erc-notify.el
@@ -1,6 +1,6 @@
 ;;; erc-notify.el --- Online status change notification
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Keywords: comm
diff --git a/erc-page.el b/erc-page.el
index 535c871..90a2009 100644
--- a/erc-page.el
+++ b/erc-page.el
@@ -1,6 +1,6 @@
 ;; erc-page.el - CTCP PAGE support for ERC
 
-;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation
+;; Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index a5a1bba..9fdbd36 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -1,6 +1,6 @@
 ;;; erc-pcomplete.el --- Provides programmable completion for ERC
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Sacha Chua <sacha@free.net.ph>
 ;; Keywords: comm, convenience
diff --git a/erc-replace.el b/erc-replace.el
index 8bc5fe3..d6713c6 100644
--- a/erc-replace.el
+++ b/erc-replace.el
@@ -1,6 +1,6 @@
 ;; erc-replace.el -- wash and massage messages inserted into the buffer
 
-;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Mario Lang (mlang@delysid.org)
diff --git a/erc-ring.el b/erc-ring.el
index ae526c1..00f1fca 100644
--- a/erc-ring.el
+++ b/erc-ring.el
@@ -1,7 +1,7 @@
 ;; erc-ring.el -- Command history handling for erc using ring.el
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
-;;   2007 Free Software Foundation, Inc.
+;;   2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: comm
diff --git a/erc-services.el b/erc-services.el
index 3635981..028d358 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -1,6 +1,6 @@
 ;;; erc-services.el --- Identify to NickServ
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-sound.el b/erc-sound.el
index 7a1a281..1ee8fbf 100644
--- a/erc-sound.el
+++ b/erc-sound.el
@@ -1,6 +1,6 @@
 ;;; erc-sound.el --- CTCP SOUND support for ERC
 
-;; Copyright (C) 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-speedbar.el b/erc-speedbar.el
index b11296c..cc8a085 100644
--- a/erc-speedbar.el
+++ b/erc-speedbar.el
@@ -1,7 +1,7 @@
 ;;; erc-speedbar.el --- Speedbar support for ERC
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
-;;   2007 Free Software Foundation, Inc.
+;;   2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/erc-spelling.el b/erc-spelling.el
index 3445be3..55cb213 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -1,6 +1,6 @@
 ;;; erc-spelling.el --- use flyspell in ERC
 
-;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Keywords: irc
diff --git a/erc-stamp.el b/erc-stamp.el
index ae9bb51..d3a05ee 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -1,6 +1,6 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, timestamp
diff --git a/erc-track.el b/erc-track.el
index 15de209..76a6922 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -1,7 +1,7 @@
 ;;; erc-track.el --- Track modified channel buffers
 
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
-;;   2007 Free Software Foundation, Inc.
+;;   2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, faces
diff --git a/erc-truncate.el b/erc-truncate.el
index 599e49e..ab712b7 100644
--- a/erc-truncate.el
+++ b/erc-truncate.el
@@ -1,6 +1,6 @@
 ;;; erc-truncate.el --- Functions for truncating ERC buffers
 
-;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: IRC, chat, client, Internet, logging
diff --git a/erc-xdcc.el b/erc-xdcc.el
index 0aed112..ed1d0c9 100644
--- a/erc-xdcc.el
+++ b/erc-xdcc.el
@@ -1,6 +1,6 @@
 ;;; erc-xdcc.el --- XDCC file-server support for ERC
 
-;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes
diff --git a/erc.el b/erc.el
index fb783ce..6ca09bc 100644
--- a/erc.el
+++ b/erc.el
@@ -1,7 +1,7 @@
 ;; erc.el --- An Emacs Internet Relay Chat client
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007 Free Software Foundation, Inc.
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),



From MAILER-DAEMON Thu Jan 10 01:10:21 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCqcP-0000gH-1L
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:21 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCqcN-0000eu-Kg
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:19 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCqcM-0000ct-B7
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:18 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCqcL-0000cS-Rq
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:18 -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 1JCqcL-00049K-Ic
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10: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 1JCqcL-0006tm-57
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:17 -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 1JCqcJ-0006U2-PD
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:16 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 01:10:15 -0500
Date: Thu, 10 Jan 2008 01:10:15 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCqcJ-0006U2-PD@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Update copyrights for 2008.
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: Thu, 10 Jan 2008 06:10:20 -0000

commit c2ebb37340aa75983ca2052f92e70e9fac28c295
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 9 22:41:01 2008 -0500

    Update copyrights for 2008.

diff --git a/erc-auto.in b/erc-auto.in
index 8ba706b..a391cce 100644
--- a/erc-auto.in
+++ b/erc-auto.in
@@ -1,6 +1,6 @@
 ;;; -*-emacs-lisp-*-
 
-;; Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2007, 2008 Free Software Foundation, Inc.
 
 (defvar generated-autoload-file)
 (defvar command-line-args-left)
diff --git a/erc-bbdb.el b/erc-bbdb.el
index 82e5973..d68b697 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -1,7 +1,7 @@
 ;;; erc-bbdb.el --- Integrating the BBDB into ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2005, 2006,
-;;   2007 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007
+;;   2008 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Mario Lang <mlang@delysid.org>
diff --git a/erc-chess.el b/erc-chess.el
index 2208fef..94c8414 100644
--- a/erc-chess.el
+++ b/erc-chess.el
@@ -1,6 +1,6 @@
 ;;; erc-chess.el --- CTCP chess playing support for ERC
 
-;; Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: games, comm
diff --git a/erc-list.el b/erc-list.el
index 9cd16ed..b170287 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -1,7 +1,7 @@
 ;;; erc-list.el --- Provide a faster channel listing mechanism
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
-;;   2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+;;   2008 Free Software Foundation, Inc.
 ;; Copyright (C) 2004 Brian Palmer
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
diff --git a/erc-nicklist.el b/erc-nicklist.el
index 2e1d2b6..5d2c721 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -1,6 +1,6 @@
 ;;; erc-nicklist.el --- Display channel nicknames in a side buffer.
 
-;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Filename: erc-nicklist.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
diff --git a/erc-speak.el b/erc-speak.el
index 35e870d..d830f1e 100644
--- a/erc-speak.el
+++ b/erc-speak.el
@@ -1,6 +1,7 @@
 ;;; erc-speak.el --- Speech-enable the ERC chat client
 
-;; Copyright 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+;; Copyright 2001, 2002, 2003, 2004, 2007,
+;;   2008 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-viper.el b/erc-viper.el
index 4cbf97e..3739b50 100644
--- a/erc-viper.el
+++ b/erc-viper.el
@@ -1,6 +1,6 @@
 ;;; erc-viper.el --- Viper compatibility hacks for ERC
 
-;; Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Edward O'Connor <ted@oconnor.cx>
 ;; Keywords: emulation



From MAILER-DAEMON Thu Jan 10 01:10:26 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCqcU-0000lH-8T
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCqcR-0000it-Ir
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCqcP-0000g9-4M
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:22 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCqcO-0000fs-G9
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10: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 1JCqcN-00049s-S8
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10: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 1JCqcN-0006ts-EK
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10: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 1JCqcM-0006Uc-3J
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:19 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 01:10:18 -0500
Date: Thu, 10 Jan 2008 01:10:18 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCqcM-0006Uc-3J@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Rename erc-list.el to erc-list-old.el.
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: Thu, 10 Jan 2008 06:10:24 -0000

commit 123b6d8bbf06075c75de9169e12647906eff525f
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 9 23:36:54 2008 -0500

    Rename erc-list.el to erc-list-old.el.

diff --git a/CREDITS b/CREDITS
index 37110ea..1bad707 100644
--- a/CREDITS
+++ b/CREDITS
@@ -46,7 +46,7 @@ Marcelo Toledo <marcelo@marcelotoledo.org>:
 
 Brian Palmer <bpalmer@gmail.com>
   * Made changes to erc.el (10 lines).
-  * Made changes to erc-list.el (>15 lines).
+  * Made changes to erc-list-old.el (>15 lines).
 
 Arne Schwabe <arne@rfc2549.org>:
   * Helped with handlers for 313 and 330 (erc.el).
diff --git a/erc-list-old.el b/erc-list-old.el
new file mode 100644
index 0000000..d6cfa3a
--- /dev/null
+++ b/erc-list-old.el
@@ -0,0 +1,416 @@
+;;; erc-list-old.el --- Provide a faster channel listing mechanism
+
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+;;   2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004 Brian Palmer
+
+;; Author: Mario Lang <mlang@lexx.delysid.org>
+;; Keywords: comm
+
+;; This file is part of ERC.
+
+;; ERC is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; ERC is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with ERC; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file provides a simple derived mode for viewing Channel lists.
+;; It also serves as a demonstration of how the new server hook facility
+;; can be used.
+
+;;; Code:
+
+(require 'erc)
+(require 'erc-networks)
+(require 'sort)
+(unless (fboundp 'make-overlay)
+  (require 'overlay))
+(eval-when-compile (require 'cl))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; User customizable variables.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defgroup erc-list-old nil
+  "Display IRC channels in another window when using /LIST"
+  :group 'erc)
+
+(defcustom erc-chanlist-progress-message t
+  "*Show progress message while accumulating channel list."
+  :group 'erc-list-old
+  :type 'boolean)
+
+(defcustom erc-no-list-networks nil
+  "*A list of network names on which the /LIST command refuses to work."
+  :group 'erc-list-old
+  :type '(repeat string))
+
+(defcustom erc-chanlist-frame-parameters nil
+  "*If nil, the channel list is displayed in a new window; if non-nil,
+this variable holds the frame parameters used to make a frame to
+display the channel list."
+  :group 'erc-list-old
+  :type 'list)
+
+(defcustom erc-chanlist-hide-modeline nil
+  "*If nil, the channel list buffer has a modeline, otherwise the modeline is hidden."
+  :group 'erc-list-old
+  :type 'boolean)
+
+(defface erc-chanlist-header-face '((t (:bold t)))
+  "Face used for the headers in erc's channel list."
+  :group 'erc-faces)
+
+(defface erc-chanlist-odd-line-face '((t (:inverse-video t)))
+  "Face used for the odd lines in erc's channel list."
+  :group 'erc-faces)
+
+(defface erc-chanlist-even-line-face '((t (:inverse-video nil)))
+  "Face used for the even lines in erc's channel list."
+  :group 'erc-faces)
+
+(defface erc-chanlist-highlight '((t (:foreground "red")))
+  "Face used to highlight the current line in the channel list."
+  :group 'erc-faces)
+
+;; This should perhaps be a defface that inherits values from the highlight face
+;; but xemacs does not support inheritance
+(defcustom erc-chanlist-highlight-face 'erc-chanlist-highlight
+  "Face used for highlighting the current line in a list."
+  :type 'face
+  :group 'erc-faces)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; All variables below this line are for internal use only.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar erc-chanlist-channel-line-regexp "^\\([#&\\*][^ \t\n]*\\)\\s-+[0-9]+"
+  "Regexp that matches a channel line in the channel list buffer.")
+
+(defvar erc-chanlist-buffer nil)
+(make-variable-buffer-local 'erc-chanlist-buffer)
+
+(defvar erc-chanlist-last-time 0
+  "A time value used to throttle the progress indicator.")
+
+(defvar erc-chanlist-frame nil
+  "The frame displaying the most recent channel list buffer.")
+
+(defvar erc-chanlist-sort-state 'channel
+  "The sort mode of the channel list buffer.  Either 'channel or 'users.")
+(make-variable-buffer-local 'erc-chanlist-sort-state)
+
+(defvar erc-chanlist-highlight-overlay nil
+  "The overlay used for erc chanlist highlighting")
+(make-variable-buffer-local 'erc-chanlist-highlight-overlay)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Define erc-chanlist-mode.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defcustom erc-chanlist-mode-hook nil
+  "Hook run by erc-chanlist-mode."
+  :group 'erc-list-old
+  :type 'hook)
+
+(define-derived-mode erc-chanlist-mode fundamental-mode "ERC Channel List"
+  "Mode for viewing a channel list of a particular server.
+
+\\{erc-chanlist-mode-map}"
+  (local-set-key "\C-c\C-j" 'erc-join-channel)
+  (local-set-key "j" 'erc-chanlist-join-channel)
+  (local-set-key "n" 'next-line)
+  (local-set-key "p" 'previous-line)
+  (local-set-key "q" 'erc-chanlist-quit)
+  (local-set-key "s" 'erc-chanlist-toggle-sort-state)
+  (local-set-key "t" 'toggle-truncate-lines)
+  (setq erc-chanlist-sort-state 'channel)
+  (setq truncate-lines t)
+  (add-hook 'post-command-hook 'erc-chanlist-post-command-hook 'append 'local))
+
+;; Define module:
+;;;###autoload (autoload 'erc-list-old-mode "erc-list-old")
+(define-erc-module list nil
+  "List channels nicely in a separate buffer."
+  ((defalias 'erc-cmd-LIST 'erc-list-channels))
+  ((defalias 'erc-cmd-LIST 'erc-list-channels-simple)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Functions.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defun erc-list-channels (&rest channel)
+  "Display a buffer containing a list of channels on the current server.
+Optional argument CHANNEL specifies a single channel to list (instead of every
+available channel)."
+  (interactive
+   (remove "" (split-string
+	       (read-from-minibuffer "List channels (RET for all): ") " ")))
+  (if (and (null channel)
+	   (erc-member-ignore-case (erc-network-name) erc-no-list-networks))
+      (erc-display-line "ERC is configured not to allow the /LIST command on this network!"
+			(current-buffer))
+    (erc-display-line (erc-make-notice (concat "Listing channel"
+					       (if channel
+						   "."
+						 "s.  This may take a while."))))
+    (erc-chanlist channel))
+  t)
+
+(defun erc-list-channels-simple (&optional line)
+  "Send the LIST command to the current server with optional channels LINE."
+  (when (string-match "^\\s-*\\(.*\\)$" line)
+    (let ((channels (match-string 1 line)))
+      (erc-log (format "cmd: LIST: %s" channels))
+      (erc-server-send
+       (if (string= channels "")
+	   "LIST"
+	 (concat "LIST :" channels))))
+    t))
+(put 'erc-list-channels-simple 'do-not-parse-args t)
+
+;;;###autoload
+(defun erc-chanlist (&optional channels)
+  "Show a channel listing of the current server in a special mode.
+Please note that this function only works with IRC servers which conform
+to RFC and send the LIST header (#321) at start of list transmission."
+  (interactive)
+  (erc-with-server-buffer
+    (erc-once-with-server-event
+     321
+     '(progn
+	(add-hook 'erc-server-322-functions 'erc-chanlist-322 nil t)
+
+	(erc-once-with-server-event
+	 323
+	 '(progn
+	    (remove-hook 'erc-server-322-functions 'erc-chanlist-322 t)
+	    (let ((buf erc-chanlist-buffer))
+	      (if (not (buffer-live-p buf))
+		  (error "`erc-chanlist-buffer' does not refer to a live buffer"))
+
+	      (set-buffer buf)
+	      (buffer-disable-undo)
+	      (let (buffer-read-only
+		    (sort-fold-case t))
+		(sort-lines nil (point-min) (point-max))
+		(setq erc-chanlist-sort-state 'channel)
+
+		(let ((sum (count-lines (point-min) (point-max))))
+		  (goto-char (point-min))
+		  (insert (substitute-command-keys
+			   (concat "'\\[erc-chanlist-toggle-sort-state]' toggle sort mode.\n"
+				   "'\\[erc-chanlist-quit]' kill this buffer.\n"
+				   "'\\[toggle-truncate-lines]' toggle line truncation.\n"
+				   "'\\[erc-chanlist-join-channel]' join the channel listed on the current line.\n\n")))
+		  (insert (format "%d channels (sorted by %s).\n\n"
+				  sum (if (eq erc-chanlist-sort-state 'channel)
+					  "channel name"
+					"number of users"))))
+
+		(insert (format "%-25s%5s %s\n------------------------ ----- ----------------------------\n"
+				"Channel"
+				"Users"
+				"Topic"))
+
+		;; Display the channel list buffer.
+		(if erc-chanlist-frame-parameters
+		    (progn
+		      (if (or (null erc-chanlist-frame)
+			      (not (frame-live-p erc-chanlist-frame)))
+			  (setq erc-chanlist-frame
+				(make-frame `((name . ,(format "Channels on %s"
+							       erc-session-server))
+					      ,@erc-chanlist-frame-parameters))))
+		      (select-frame erc-chanlist-frame)
+		      (switch-to-buffer buf)
+		      (erc-prettify-channel-list))
+		  (pop-to-buffer buf)
+		  (erc-prettify-channel-list))))
+	    (goto-char (point-min))
+	    (search-forward-regexp "^------" nil t)
+	    (forward-line 1)
+	    (erc-chanlist-highlight-line)
+	    (message "")
+	    t))
+
+	(setq erc-chanlist-buffer (get-buffer-create
+				   (format "*Channels on %s*"
+					   (erc-response.sender parsed))))
+	(with-current-buffer erc-chanlist-buffer
+	  (setq buffer-read-only nil)
+	  (erase-buffer)
+	  (erc-chanlist-mode)
+	  (setq erc-server-process proc)
+	  (if erc-chanlist-hide-modeline
+	      (setq mode-line-format nil))
+	  (setq buffer-read-only t))
+	t))
+
+    ;; Now that we've setup our callbacks, pull the trigger.
+    (if (interactive-p)
+	(message "Collecting channel list for server %s" erc-session-server))
+    (erc-server-send (if (null channels)
+			  "LIST"
+			(concat "LIST "
+				(mapconcat #'identity channels ","))))))
+
+(defun erc-chanlist-322 (proc parsed)
+  "Process an IRC 322 message.
+
+The message carries information about one channel for the LIST
+command."
+  (multiple-value-bind (channel num-users)
+      (cdr (erc-response.command-args parsed))
+    (let ((topic (erc-response.contents parsed)))
+      (with-current-buffer erc-chanlist-buffer
+	(save-excursion
+	  (goto-char (point-max))
+	  (let (buffer-read-only)
+	    (insert (format "%-26s%4s %s\n" (erc-controls-strip channel)
+			    num-users
+			    (erc-controls-strip topic))))
+
+	  ;; Maybe display a progress indicator in the minibuffer.
+	  (when (and erc-chanlist-progress-message
+		     (> (erc-time-diff
+			 erc-chanlist-last-time (erc-current-time))
+			3))
+	    (setq erc-chanlist-last-time (erc-current-time))
+	    (message "Accumulating channel list ... %c"
+		     (aref [?/ ?| ?\\ ?- ?! ?O ?o] (random 7))))
+
+	  ;; Return success to prevent other hook functions from being run.
+	  t)))))
+
+(defun erc-chanlist-post-command-hook ()
+  "Keep the current line highlighted."
+  (ignore-errors
+    (save-excursion
+      (beginning-of-line)
+      (if (looking-at erc-chanlist-channel-line-regexp)
+	  (erc-chanlist-highlight-line)
+	(erc-chanlist-dehighlight-line)))))
+
+(defun erc-chanlist-highlight-line ()
+  "Highlight the current line."
+  (unless erc-chanlist-highlight-overlay
+    (setq erc-chanlist-highlight-overlay
+	  (make-overlay (point-min) (point-min)))
+    ;; Detach it from the buffer.
+    (delete-overlay erc-chanlist-highlight-overlay)
+    (overlay-put erc-chanlist-highlight-overlay
+		 'face erc-chanlist-highlight-face)
+    ;; Expressly put it at a higher priority than the text
+    ;; properties used for faces later on. Gnu emacs promises that
+    ;; right now overlays are higher priority than text properties,
+    ;; but why take chances?
+    (overlay-put erc-chanlist-highlight-overlay 'priority 1))
+  (move-overlay erc-chanlist-highlight-overlay (point) (1+ (point-at-eol))))
+
+(defun erc-chanlist-dehighlight-line ()
+  "Remove the line highlighting."
+  (delete-overlay erc-chanlist-highlight-overlay))
+
+(defun erc-prettify-channel-list ()
+  "Make the channel list buffer look pretty.
+When this function runs, the current buffer must be the channel
+list buffer, or it does nothing."
+  (if (eq major-mode 'erc-chanlist-mode)
+      (save-excursion
+	(let ((inhibit-read-only t))
+	  (goto-char (point-min))
+	  (when (search-forward-regexp "^-------" nil t)
+	    (add-text-properties
+	     (point-min) (1+ (point-at-eol)) '(face erc-chanlist-header-face))
+	    (forward-line 1))
+
+	  (while (not (eobp))
+	    (add-text-properties
+	     (point) (1+ (point-at-eol)) '(face erc-chanlist-odd-line-face))
+	    (forward-line 1)
+	    (unless (eobp)
+	      (add-text-properties
+	       (point) (1+ (point-at-eol)) '(face erc-chanlist-even-line-face)))
+	    (forward-line 1))))))
+
+(defun erc-chanlist-toggle-sort-state ()
+  "Toggle the channel list buffer sorting method.
+Either sort by channel names or by number of users in each channel."
+  (interactive)
+  (let ((inhibit-read-only t)
+	(sort-fold-case t))
+    (save-excursion
+      (goto-char (point-min))
+      (search-forward-regexp "^-----" nil t)
+      (forward-line 1)
+      (unless (eobp)
+	(if (eq erc-chanlist-sort-state 'channel)
+	    (progn
+	      (sort-numeric-fields 2 (point) (point-max))
+	      (reverse-region (point) (point-max))
+	      (setq erc-chanlist-sort-state 'users))
+	  (sort-lines nil (point) (point-max))
+	  (setq erc-chanlist-sort-state 'channel))
+
+	(goto-char (point-min))
+	(if (search-forward-regexp "^[0-9]+ channels (sorted by \\(.*\\)).$"
+				   nil t)
+	    (replace-match (if (eq erc-chanlist-sort-state 'channel)
+			       "channel name"
+			     "number of users")
+			   nil nil nil 1))
+
+	(goto-char (point-min))
+	(search-forward-regexp "^-----" nil t)
+	(forward-line 1)
+	(recenter -1)
+
+	(erc-prettify-channel-list)))))
+
+(defun erc-chanlist-quit ()
+  "Quit Chanlist mode.
+Kill the channel list buffer, window, and frame (if there's a frame
+devoted to the channel list)."
+  (interactive)
+  (kill-buffer (current-buffer))
+  (if (eq (selected-frame) erc-chanlist-frame)
+      (delete-frame)
+    (delete-window)))
+
+(defun erc-chanlist-join-channel ()
+  "Join the channel listed on the current line of the channel list buffer.
+Private channels, which are shown as asterisks (*), are ignored."
+  (interactive)
+  (save-excursion
+    (beginning-of-line)
+    (when (looking-at erc-chanlist-channel-line-regexp)
+      (let ((channel-name (match-string 1)))
+	(when (and (stringp channel-name)
+		   (not (string= channel-name "*")))
+	  (run-at-time 0.5 nil 'erc-join-channel channel-name))))))
+
+(provide 'erc-list-old)
+
+;;; erc-list-old.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: 4a13196a-a61b-465a-9926-044dfbc7e5ff
diff --git a/erc-list.el b/erc-list.el
deleted file mode 100644
index b170287..0000000
--- a/erc-list.el
+++ /dev/null
@@ -1,416 +0,0 @@
-;;; erc-list.el --- Provide a faster channel listing mechanism
-
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-;;   2008 Free Software Foundation, Inc.
-;; Copyright (C) 2004 Brian Palmer
-
-;; Author: Mario Lang <mlang@lexx.delysid.org>
-;; Keywords: comm
-
-;; This file is part of ERC.
-
-;; ERC is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-
-;; ERC is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with ERC; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file provides a simple derived mode for viewing Channel lists.
-;; It also serves as a demonstration of how the new server hook facility
-;; can be used.
-
-;;; Code:
-
-(require 'erc)
-(require 'erc-networks)
-(require 'sort)
-(unless (fboundp 'make-overlay)
-  (require 'overlay))
-(eval-when-compile (require 'cl))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; User customizable variables.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defgroup erc-list nil
-  "Display IRC channels in another window when using /LIST"
-  :group 'erc)
-
-(defcustom erc-chanlist-progress-message t
-  "*Show progress message while accumulating channel list."
-  :group 'erc-list
-  :type 'boolean)
-
-(defcustom erc-no-list-networks nil
-  "*A list of network names on which the /LIST command refuses to work."
-  :group 'erc-list
-  :type '(repeat string))
-
-(defcustom erc-chanlist-frame-parameters nil
-  "*If nil, the channel list is displayed in a new window; if non-nil,
-this variable holds the frame parameters used to make a frame to
-display the channel list."
-  :group 'erc-list
-  :type 'list)
-
-(defcustom erc-chanlist-hide-modeline nil
-  "*If nil, the channel list buffer has a modeline, otherwise the modeline is hidden."
-  :group 'erc-list
-  :type 'boolean)
-
-(defface erc-chanlist-header-face '((t (:bold t)))
-  "Face used for the headers in erc's channel list."
-  :group 'erc-faces)
-
-(defface erc-chanlist-odd-line-face '((t (:inverse-video t)))
-  "Face used for the odd lines in erc's channel list."
-  :group 'erc-faces)
-
-(defface erc-chanlist-even-line-face '((t (:inverse-video nil)))
-  "Face used for the even lines in erc's channel list."
-  :group 'erc-faces)
-
-(defface erc-chanlist-highlight '((t (:foreground "red")))
-  "Face used to highlight the current line in the channel list."
-  :group 'erc-faces)
-
-;; This should perhaps be a defface that inherits values from the highlight face
-;; but xemacs does not support inheritance
-(defcustom erc-chanlist-highlight-face 'erc-chanlist-highlight
-  "Face used for highlighting the current line in a list."
-  :type 'face
-  :group 'erc-faces)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; All variables below this line are for internal use only.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar erc-chanlist-channel-line-regexp "^\\([#&\\*][^ \t\n]*\\)\\s-+[0-9]+"
-  "Regexp that matches a channel line in the channel list buffer.")
-
-(defvar erc-chanlist-buffer nil)
-(make-variable-buffer-local 'erc-chanlist-buffer)
-
-(defvar erc-chanlist-last-time 0
-  "A time value used to throttle the progress indicator.")
-
-(defvar erc-chanlist-frame nil
-  "The frame displaying the most recent channel list buffer.")
-
-(defvar erc-chanlist-sort-state 'channel
-  "The sort mode of the channel list buffer.  Either 'channel or 'users.")
-(make-variable-buffer-local 'erc-chanlist-sort-state)
-
-(defvar erc-chanlist-highlight-overlay nil
-  "The overlay used for erc chanlist highlighting")
-(make-variable-buffer-local 'erc-chanlist-highlight-overlay)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Define erc-chanlist-mode.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defcustom erc-chanlist-mode-hook nil
-  "Hook run by erc-chanlist-mode."
-  :group 'erc-list
-  :type 'hook)
-
-(define-derived-mode erc-chanlist-mode fundamental-mode "ERC Channel List"
-  "Mode for viewing a channel list of a particular server.
-
-\\{erc-chanlist-mode-map}"
-  (local-set-key "\C-c\C-j" 'erc-join-channel)
-  (local-set-key "j" 'erc-chanlist-join-channel)
-  (local-set-key "n" 'next-line)
-  (local-set-key "p" 'previous-line)
-  (local-set-key "q" 'erc-chanlist-quit)
-  (local-set-key "s" 'erc-chanlist-toggle-sort-state)
-  (local-set-key "t" 'toggle-truncate-lines)
-  (setq erc-chanlist-sort-state 'channel)
-  (setq truncate-lines t)
-  (add-hook 'post-command-hook 'erc-chanlist-post-command-hook 'append 'local))
-
-;; Define module:
-;;;###autoload (autoload 'erc-list-mode "erc-list")
-(define-erc-module list nil
-  "List channels nicely in a separate buffer."
-  ((defalias 'erc-cmd-LIST 'erc-list-channels))
-  ((defalias 'erc-cmd-LIST 'erc-list-channels-simple)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Functions.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;###autoload
-(defun erc-list-channels (&rest channel)
-  "Display a buffer containing a list of channels on the current server.
-Optional argument CHANNEL specifies a single channel to list (instead of every
-available channel)."
-  (interactive
-   (remove "" (split-string
-	       (read-from-minibuffer "List channels (RET for all): ") " ")))
-  (if (and (null channel)
-	   (erc-member-ignore-case (erc-network-name) erc-no-list-networks))
-      (erc-display-line "ERC is configured not to allow the /LIST command on this network!"
-			(current-buffer))
-    (erc-display-line (erc-make-notice (concat "Listing channel"
-					       (if channel
-						   "."
-						 "s.  This may take a while."))))
-    (erc-chanlist channel))
-  t)
-
-(defun erc-list-channels-simple (&optional line)
-  "Send the LIST command to the current server with optional channels LINE."
-  (when (string-match "^\\s-*\\(.*\\)$" line)
-    (let ((channels (match-string 1 line)))
-      (erc-log (format "cmd: LIST: %s" channels))
-      (erc-server-send
-       (if (string= channels "")
-	   "LIST"
-	 (concat "LIST :" channels))))
-    t))
-(put 'erc-list-channels-simple 'do-not-parse-args t)
-
-;;;###autoload
-(defun erc-chanlist (&optional channels)
-  "Show a channel listing of the current server in a special mode.
-Please note that this function only works with IRC servers which conform
-to RFC and send the LIST header (#321) at start of list transmission."
-  (interactive)
-  (erc-with-server-buffer
-    (erc-once-with-server-event
-     321
-     '(progn
-	(add-hook 'erc-server-322-functions 'erc-chanlist-322 nil t)
-
-	(erc-once-with-server-event
-	 323
-	 '(progn
-	    (remove-hook 'erc-server-322-functions 'erc-chanlist-322 t)
-	    (let ((buf erc-chanlist-buffer))
-	      (if (not (buffer-live-p buf))
-		  (error "`erc-chanlist-buffer' does not refer to a live buffer"))
-
-	      (set-buffer buf)
-	      (buffer-disable-undo)
-	      (let (buffer-read-only
-		    (sort-fold-case t))
-		(sort-lines nil (point-min) (point-max))
-		(setq erc-chanlist-sort-state 'channel)
-
-		(let ((sum (count-lines (point-min) (point-max))))
-		  (goto-char (point-min))
-		  (insert (substitute-command-keys
-			   (concat "'\\[erc-chanlist-toggle-sort-state]' toggle sort mode.\n"
-				   "'\\[erc-chanlist-quit]' kill this buffer.\n"
-				   "'\\[toggle-truncate-lines]' toggle line truncation.\n"
-				   "'\\[erc-chanlist-join-channel]' join the channel listed on the current line.\n\n")))
-		  (insert (format "%d channels (sorted by %s).\n\n"
-				  sum (if (eq erc-chanlist-sort-state 'channel)
-					  "channel name"
-					"number of users"))))
-
-		(insert (format "%-25s%5s %s\n------------------------ ----- ----------------------------\n"
-				"Channel"
-				"Users"
-				"Topic"))
-
-		;; Display the channel list buffer.
-		(if erc-chanlist-frame-parameters
-		    (progn
-		      (if (or (null erc-chanlist-frame)
-			      (not (frame-live-p erc-chanlist-frame)))
-			  (setq erc-chanlist-frame
-				(make-frame `((name . ,(format "Channels on %s"
-							       erc-session-server))
-					      ,@erc-chanlist-frame-parameters))))
-		      (select-frame erc-chanlist-frame)
-		      (switch-to-buffer buf)
-		      (erc-prettify-channel-list))
-		  (pop-to-buffer buf)
-		  (erc-prettify-channel-list))))
-	    (goto-char (point-min))
-	    (search-forward-regexp "^------" nil t)
-	    (forward-line 1)
-	    (erc-chanlist-highlight-line)
-	    (message "")
-	    t))
-
-	(setq erc-chanlist-buffer (get-buffer-create
-				   (format "*Channels on %s*"
-					   (erc-response.sender parsed))))
-	(with-current-buffer erc-chanlist-buffer
-	  (setq buffer-read-only nil)
-	  (erase-buffer)
-	  (erc-chanlist-mode)
-	  (setq erc-server-process proc)
-	  (if erc-chanlist-hide-modeline
-	      (setq mode-line-format nil))
-	  (setq buffer-read-only t))
-	t))
-
-    ;; Now that we've setup our callbacks, pull the trigger.
-    (if (interactive-p)
-	(message "Collecting channel list for server %s" erc-session-server))
-    (erc-server-send (if (null channels)
-			  "LIST"
-			(concat "LIST "
-				(mapconcat #'identity channels ","))))))
-
-(defun erc-chanlist-322 (proc parsed)
-  "Process an IRC 322 message.
-
-The message carries information about one channel for the LIST
-command."
-  (multiple-value-bind (channel num-users)
-      (cdr (erc-response.command-args parsed))
-    (let ((topic (erc-response.contents parsed)))
-      (with-current-buffer erc-chanlist-buffer
-	(save-excursion
-	  (goto-char (point-max))
-	  (let (buffer-read-only)
-	    (insert (format "%-26s%4s %s\n" (erc-controls-strip channel)
-			    num-users
-			    (erc-controls-strip topic))))
-
-	  ;; Maybe display a progress indicator in the minibuffer.
-	  (when (and erc-chanlist-progress-message
-		     (> (erc-time-diff
-			 erc-chanlist-last-time (erc-current-time))
-			3))
-	    (setq erc-chanlist-last-time (erc-current-time))
-	    (message "Accumulating channel list ... %c"
-		     (aref [?/ ?| ?\\ ?- ?! ?O ?o] (random 7))))
-
-	  ;; Return success to prevent other hook functions from being run.
-	  t)))))
-
-(defun erc-chanlist-post-command-hook ()
-  "Keep the current line highlighted."
-  (ignore-errors
-    (save-excursion
-      (beginning-of-line)
-      (if (looking-at erc-chanlist-channel-line-regexp)
-	  (erc-chanlist-highlight-line)
-	(erc-chanlist-dehighlight-line)))))
-
-(defun erc-chanlist-highlight-line ()
-  "Highlight the current line."
-  (unless erc-chanlist-highlight-overlay
-    (setq erc-chanlist-highlight-overlay
-	  (make-overlay (point-min) (point-min)))
-    ;; Detach it from the buffer.
-    (delete-overlay erc-chanlist-highlight-overlay)
-    (overlay-put erc-chanlist-highlight-overlay
-		 'face erc-chanlist-highlight-face)
-    ;; Expressly put it at a higher priority than the text
-    ;; properties used for faces later on. Gnu emacs promises that
-    ;; right now overlays are higher priority than text properties,
-    ;; but why take chances?
-    (overlay-put erc-chanlist-highlight-overlay 'priority 1))
-  (move-overlay erc-chanlist-highlight-overlay (point) (1+ (point-at-eol))))
-
-(defun erc-chanlist-dehighlight-line ()
-  "Remove the line highlighting."
-  (delete-overlay erc-chanlist-highlight-overlay))
-
-(defun erc-prettify-channel-list ()
-  "Make the channel list buffer look pretty.
-When this function runs, the current buffer must be the channel
-list buffer, or it does nothing."
-  (if (eq major-mode 'erc-chanlist-mode)
-      (save-excursion
-	(let ((inhibit-read-only t))
-	  (goto-char (point-min))
-	  (when (search-forward-regexp "^-------" nil t)
-	    (add-text-properties
-	     (point-min) (1+ (point-at-eol)) '(face erc-chanlist-header-face))
-	    (forward-line 1))
-
-	  (while (not (eobp))
-	    (add-text-properties
-	     (point) (1+ (point-at-eol)) '(face erc-chanlist-odd-line-face))
-	    (forward-line 1)
-	    (unless (eobp)
-	      (add-text-properties
-	       (point) (1+ (point-at-eol)) '(face erc-chanlist-even-line-face)))
-	    (forward-line 1))))))
-
-(defun erc-chanlist-toggle-sort-state ()
-  "Toggle the channel list buffer sorting method.
-Either sort by channel names or by number of users in each channel."
-  (interactive)
-  (let ((inhibit-read-only t)
-	(sort-fold-case t))
-    (save-excursion
-      (goto-char (point-min))
-      (search-forward-regexp "^-----" nil t)
-      (forward-line 1)
-      (unless (eobp)
-	(if (eq erc-chanlist-sort-state 'channel)
-	    (progn
-	      (sort-numeric-fields 2 (point) (point-max))
-	      (reverse-region (point) (point-max))
-	      (setq erc-chanlist-sort-state 'users))
-	  (sort-lines nil (point) (point-max))
-	  (setq erc-chanlist-sort-state 'channel))
-
-	(goto-char (point-min))
-	(if (search-forward-regexp "^[0-9]+ channels (sorted by \\(.*\\)).$"
-				   nil t)
-	    (replace-match (if (eq erc-chanlist-sort-state 'channel)
-			       "channel name"
-			     "number of users")
-			   nil nil nil 1))
-
-	(goto-char (point-min))
-	(search-forward-regexp "^-----" nil t)
-	(forward-line 1)
-	(recenter -1)
-
-	(erc-prettify-channel-list)))))
-
-(defun erc-chanlist-quit ()
-  "Quit Chanlist mode.
-Kill the channel list buffer, window, and frame (if there's a frame
-devoted to the channel list)."
-  (interactive)
-  (kill-buffer (current-buffer))
-  (if (eq (selected-frame) erc-chanlist-frame)
-      (delete-frame)
-    (delete-window)))
-
-(defun erc-chanlist-join-channel ()
-  "Join the channel listed on the current line of the channel list buffer.
-Private channels, which are shown as asterisks (*), are ignored."
-  (interactive)
-  (save-excursion
-    (beginning-of-line)
-    (when (looking-at erc-chanlist-channel-line-regexp)
-      (let ((channel-name (match-string 1)))
-	(when (and (stringp channel-name)
-		   (not (string= channel-name "*")))
-	  (run-at-time 0.5 nil 'erc-join-channel channel-name))))))
-
-(provide 'erc-list)
-
-;;; erc-list.el ends here
-;;
-;; Local Variables:
-;; indent-tabs-mode: t
-;; tab-width: 8
-;; End:
-
-;; arch-tag: 4a13196a-a61b-465a-9926-044dfbc7e5ff



From MAILER-DAEMON Thu Jan 10 01:10:28 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCqcW-0000nl-J3
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCqcS-0000jW-7f
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:24 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCqcR-0000i3-6U
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:23 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCqcQ-0000hk-JM
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:22 -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 1JCqcQ-0004AH-5s
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:22 -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 1JCqcP-0006ty-Mw
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:21 -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 1JCqcO-0006VB-BS
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:21 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 01:10:20 -0500
Date: Thu, 10 Jan 2008 01:10:20 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCqcO-0006VB-BS@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Check in new erc-list.el from Tom
	Tromey.
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: Thu, 10 Jan 2008 06:10:25 -0000

commit 59190af086e1bd7ae6096a63d453d64ffe579940
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 9 23:37:59 2008 -0500

    Check in new erc-list.el from Tom Tromey.

diff --git a/AUTHORS b/AUTHORS
index 41ec666..404162c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,4 +18,5 @@ plovre      Brian P Templeton <bpt@tunes.org>
 resolve     Damien Elmes <erc@repose.cx>
 sachachua   Sandra Jean Chua <sacha@free.net.ph>
 smoke       Tijs van Bakel <smoke@wanadoo.nl>
+tromey      Tom Tromey <tromey@redhat.com>
 wence       Lawrence Mitchell <wence@gmx.li>
diff --git a/CREDITS b/CREDITS
index 1bad707..ca1f4da 100644
--- a/CREDITS
+++ b/CREDITS
@@ -176,6 +176,9 @@ Giorgos Keramidas <keramida@ceid.upatras.gr>:
   * Added nickserv info for GRnet.
   * 15 lines changed total.
 
+Tom Tromey <tromey@redhat.com>:
+  * Contributed erc-list.el.
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/erc-list.el b/erc-list.el
new file mode 100644
index 0000000..5cb024b
--- /dev/null
+++ b/erc-list.el
@@ -0,0 +1,204 @@
+;;; erc-list.el --- /list support for ERC
+
+;; Copyright (C) 2008 Free Software Foundation, Inc.
+
+;; Author: Tom Tromey <tromey@redhat.com>
+;; Version: 0.1
+;; Keywords: comm
+
+;; This file is part of ERC.
+
+;; ERC is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; ERC is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with ERC; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file provides nice support for /list in ERC.
+
+;;; Code:
+
+;; This is implicitly the width of the channel name column.  Pick
+;; something small enough that the topic has a chance of being
+;; readable, but long enough that most channel names won't make for
+;; strange formatting.
+(defconst erc-list-nusers-column 25)
+
+;; Width of the number-of-users column.
+(defconst erc-list-topic-column (+ erc-list-nusers-column 10))
+
+;; The list buffer.  This is buffer local in the server buffer.
+(defvar erc-list-buffer nil)
+
+;; The argument to the last "/list".  This is buffer local in the
+;; server buffer.
+(defvar erc-list-last-argument nil)
+
+;; The server buffer corresponding to the list buffer.  This is buffer
+;; local in the list buffer.
+(defvar erc-list-server-buffer nil)
+
+;; Format a record for display.
+(defun erc-list-make-string (channel users topic)
+  (concat
+   channel
+   (erc-propertize " "
+		   'display (list 'space :align-to erc-list-nusers-column)
+		   'face 'fixed-pitch)
+   users
+   (erc-propertize " "
+		   'display (list 'space :align-to erc-list-topic-column)
+		   'face 'fixed-pitch)
+   topic))
+
+;; Insert a record into the list buffer.
+(defun erc-list-insert-item (channel users topic)
+  (save-excursion
+    (let ((buffer-read-only nil))
+      (goto-char (point-max))
+      (insert (erc-list-make-string channel users topic) "\n"))))
+
+(defun erc-list-join ()
+  "Join the irc channel named on this line."
+  (interactive)
+  (unless (eobp)
+    (beginning-of-line)
+    (unless (looking-at "\\([&#+!][^ \n]+\\)")
+      (error "Not looking at channel name?"))
+    (let ((chan (match-string 1)))
+      (with-current-buffer erc-list-server-buffer
+	(erc-join-channel chan)))))
+
+(defun erc-list-kill ()
+  "Kill the current ERC list buffer."
+  (interactive)
+  (kill-buffer (current-buffer)))
+
+(defun erc-list-revert ()
+  "Refresh the list of channels."
+  (interactive)
+  (with-current-buffer erc-list-server-buffer
+    (erc-cmd-LIST erc-list-last-argument)))
+
+(defun erc-list-menu-sort-by-column (&optional e)
+  "Sort the channel list by the column clicked on."
+  (interactive (list last-input-event))
+  (if e (mouse-select-window e))
+  (let* ((pos (event-start e))
+	 (obj (posn-object pos))
+	 (col (if obj
+		  (get-text-property (cdr obj) 'column-number (car obj))
+		(get-text-property (posn-point pos) 'column-number))))
+    (let ((buffer-read-only nil))
+      (if (= col 1)
+	  (sort-fields col (point-min) (point-max))
+	(sort-numeric-fields col (point-min) (point-max))))))
+
+(defvar erc-list-menu-mode-map nil
+  "Local keymap for `erc-list-mode' buffers.")
+
+(unless erc-list-menu-mode-map
+  (setq erc-list-menu-mode-map (make-keymap))
+  (suppress-keymap erc-list-menu-mode-map)
+  (define-key erc-list-menu-mode-map "k" 'erc-list-kill)
+  (define-key erc-list-menu-mode-map "j" 'erc-list-join)
+  (define-key erc-list-menu-mode-map "g" 'erc-list-revert)
+  (define-key erc-list-menu-mode-map "n" 'next-line)
+  (define-key erc-list-menu-mode-map "p" 'previous-line)
+  (define-key erc-list-menu-mode-map "q" 'quit-window))
+
+(defvar erc-list-menu-sort-button-map nil
+  "Local keymap for ERC list menu mode sorting buttons.")
+
+(unless erc-list-menu-sort-button-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [header-line mouse-1] 'erc-list-menu-sort-by-column)
+    (define-key map [follow-link] 'mouse-face)
+    (setq erc-list-menu-sort-button-map map)))
+
+;; Helper function that makes a buttonized column header.
+(defun erc-list-button (title column)
+  (erc-propertize title
+		  'column-number column
+		  'help-echo "mouse-1: sort by column"
+		  'mouse-face 'highlight
+		  'keymap erc-list-menu-sort-button-map))
+
+(define-derived-mode erc-list-menu-mode nil "ERC-List"
+  "Major mode for editing a list of irc channels."
+  (setq header-line-format
+	(concat
+	 (erc-propertize " "
+			 'display '(space :align-to 0)
+			 'face 'fixed-pitch)
+	 (erc-list-make-string (erc-list-button "Channel" 1)
+			       (erc-list-button "# Users" 2)
+			       "Topic")))
+  (setq truncate-lines t))
+
+(put 'erc-list-menu-mode 'mode-class 'special)
+
+;; Handle a "322" response.  This response tells us about a single
+;; channel.
+(defun erc-list-handle-322 (proc parsed)
+  (let* ((args (cdr (erc-response.command-args parsed)))
+	 (channel (car args))
+	 (nusers (car (cdr args)))
+	 (topic (erc-response.contents parsed)))
+    (with-current-buffer erc-list-buffer
+      (erc-list-insert-item channel nusers topic)))
+  ;; Don't let another hook run.
+  t)
+
+;; Helper function to install our 322 handler and make our buffer.
+(defun erc-list-install-322-handler ()
+  ;; Arrange for 322 responses to insert into our buffer.
+  (add-hook 'erc-server-322-functions 'erc-list-handle-322 t)
+  ;; Arrange for 323 (end of list) to end this.
+  (erc-once-with-server-event
+   323
+   '(progn
+      (remove-hook 'erc-server-322-functions 'erc-list-handle-322 t)))
+  ;; Find the list buffer, empty it, and display it.
+  (set (make-local-variable 'erc-list-buffer)
+       (get-buffer-create (concat "*Channels of "
+				  erc-server-announced-name
+				  "*")))
+  (let ((server-buffer (current-buffer)))
+    (with-current-buffer erc-list-buffer
+      (erc-list-menu-mode)
+      (setq buffer-read-only nil)
+      (erase-buffer)
+      (set (make-local-variable 'erc-list-server-buffer) server-buffer)
+      (setq buffer-read-only t)))
+  (pop-to-buffer erc-list-buffer)
+  t)
+
+;; The main entry point.
+(defun erc-cmd-LIST (&optional line)
+  (erc-with-server-buffer
+    (set (make-variable-buffer-local 'erc-list-last-argument) line)
+    (erc-once-with-server-event
+     321
+     '(progn
+	(erc-list-install-322-handler))))
+  (erc-server-send (concat "LIST :" (or line ""))))
+(put 'erc-cmd-LIST 'do-not-parse-args t)
+
+;;; erc-list.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:



From MAILER-DAEMON Thu Jan 10 01:10:28 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCqcW-0000nx-Oc
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCqcU-0000lL-CF
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCqcT-0000kM-LG
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:25 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCqcT-0000k9-4s
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:25 -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 1JCqcS-0004Ah-O0
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:24 -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 1JCqcS-0006u4-0Z
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:24 -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 1JCqcQ-0006Vk-L0
	for erc-commit@gnu.org; Thu, 10 Jan 2008 01:10:23 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 01:10:22 -0500
Date: Thu, 10 Jan 2008 01:10:22 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCqcQ-0006Vk-L0@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-list: Add module definition,
	strip initial space from arg.
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: Thu, 10 Jan 2008 06:10:26 -0000

commit ee94b3a1e03ddb62dcbe598f05da37c8deb6a4ba
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 10 00:34:25 2008 -0500

    erc-list: Add module definition, strip initial space from arg.

diff --git a/ChangeLog b/ChangeLog
index 6e4abad..b990c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-10  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-modules): Add list-old.
+
+	* erc-list.el: New file from Tom Tromey.  Use erc-propertize
+	instead of propertize.  Add simple module definition.
+	(erc-list-handle-322): Handle the case where we run the LIST
+	command, but do not go through the normal steps.
+	(erc-cmd-LIST): Add docstring.  Strip initial space from line if
+	it is non-nil.
+
+	* erc-list-old.el: Renamed from old erc-list.el.
+
 2008-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* erc-ibuffer.el (erc-channel-modes):
diff --git a/erc-list.el b/erc-list.el
index 5cb024b..256ae41 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -49,6 +49,13 @@
 ;; local in the list buffer.
 (defvar erc-list-server-buffer nil)
 
+;; Define module:
+;;;###autoload (autoload 'erc-list-mode "erc-list")
+(define-erc-module list nil
+  "List channels nicely in a separate buffer."
+  (nil)
+  (nil))
+
 ;; Format a record for display.
 (defun erc-list-make-string (channel users topic)
   (concat
@@ -156,8 +163,9 @@
 	 (channel (car args))
 	 (nusers (car (cdr args)))
 	 (topic (erc-response.contents parsed)))
-    (with-current-buffer erc-list-buffer
-      (erc-list-insert-item channel nusers topic)))
+    (when (buffer-live-p erc-list-buffer)
+      (with-current-buffer erc-list-buffer
+	(erc-list-insert-item channel nusers topic))))
   ;; Don't let another hook run.
   t)
 
@@ -187,13 +195,21 @@
 
 ;; The main entry point.
 (defun erc-cmd-LIST (&optional line)
+  "Show a listing of channels on the current server in a separate window.
+
+If LINE is specified, include it with the /LIST command.  It
+should usually be one or more channels, separated by commas.
+
+Please note that this function only works with IRC servers which conform
+to RFC and send the LIST header (#321) at start of list transmission."
   (erc-with-server-buffer
     (set (make-variable-buffer-local 'erc-list-last-argument) line)
     (erc-once-with-server-event
      321
      '(progn
 	(erc-list-install-322-handler))))
-  (erc-server-send (concat "LIST :" (or line ""))))
+  (erc-server-send (concat "LIST :" (or (and line (substring line 1))
+					""))))
 (put 'erc-cmd-LIST 'do-not-parse-args t)
 
 ;;; erc-list.el ends here
diff --git a/erc.el b/erc.el
index 6ca09bc..4b98b68 100644
--- a/erc.el
+++ b/erc.el
@@ -1840,6 +1840,7 @@ removed from the list will be disabled."
     (const :tag "irccontrols: Highlight or remove IRC control characters"
 	   irccontrols)
     (const :tag "list: List channels in a separate buffer" list)
+    (const :tag "list-old: List channels in a separate buffer (old)" list-old)
     (const :tag "log: Save buffers in logs" log)
     (const :tag "match: Highlight pals, fools, and other keywords" match)
     (const :tag "menu: Display a menu in ERC buffers" menu)



From MAILER-DAEMON Thu Jan 10 03:00:15 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCsKk-0000U7-U6
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCsKi-0000SB-15
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCsKg-0000Rt-BW
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCsKg-0000Rq-74
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:10 -0500
Received: from mx20.gnu.org ([199.232.41.8])
	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 1JCsKf-00036T-PZ
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:09 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@gnu.org>) id 1JCsKf-0006SF-67
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:09 -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 1JCsKe-0003Di-HT
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:08 -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 1JCsKc-0001oH-TH
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:07 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 03:00:06 -0500
Date: Thu, 10 Jan 2008 03:00:06 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCsKc-0001oH-TH@mire.hcoop.net>
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Erc-commit] [commit][master] Split message display in 321 and 322
	response handlers.
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: Thu, 10 Jan 2008 08:00:12 -0000

commit 4a3f2d06924fceda02c488f6f5690499da86e20d
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 10 02:51:29 2008 -0500

    Split message display in 321 and 322 response handlers.

diff --git a/ChangeLog b/ChangeLog
index b990c8e..e54a4b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2008-01-10  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-modules): Add list-old.
+	* erc-backend.el (321, 322): Split message-displaying parts into
+	new functions, which are added to each response's respective
+	hook.  This makes them easier to disable.
 
 	* erc-list.el: New file from Tom Tromey.  Use erc-propertize
 	instead of propertize.  Add simple module definition.
@@ -11,6 +13,8 @@
 
 	* erc-list-old.el: Renamed from old erc-list.el.
 
+	* erc.el (erc-modules): Add list-old.
+
 2008-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* erc-ibuffer.el (erc-channel-modes):
diff --git a/erc-backend.el b/erc-backend.el
index 5fe0efd..e5181fe 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1649,8 +1649,13 @@ See `erc-display-server-message'." nil
 
 (define-erc-response-handler (321)
   "LIST header." nil
-  (setq erc-channel-list nil)
-  (erc-display-message parsed 'notice proc 's321))
+  (setq erc-channel-list nil))
+
+(defun erc-server-321-message (proc parsed)
+  "Display a message for the 321 event."
+  (erc-display-message parsed 'notice proc 's321)
+  nil)
+(add-hook 'erc-server-321-functions 'erc-server-321-message t)
 
 (define-erc-response-handler (322)
   "LIST notice." nil
@@ -1658,10 +1663,17 @@ See `erc-display-server-message'." nil
     (multiple-value-bind (channel num-users)
         (cdr (erc-response.command-args parsed))
       (add-to-list 'erc-channel-list (list channel))
-      (erc-update-channel-topic channel topic)
+      (erc-update-channel-topic channel topic))))
+
+(defun erc-server-322-message (proc parsed)
+  "Display a message for the 322 event."
+  (let ((topic (erc-response.contents parsed)))
+    (multiple-value-bind (channel num-users)
+        (cdr (erc-response.command-args parsed))
       (erc-display-message
        parsed 'notice proc 's322
        ?c channel ?u num-users ?t (or topic "")))))
+(add-hook 'erc-server-322-functions 'erc-server-322-message t)
 
 (define-erc-response-handler (324)
   "Channel or nick modes." nil



From MAILER-DAEMON Thu Jan 10 03:00:16 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCsKm-0000Vg-2G
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCsKk-0000TO-Es
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCsKj-0000SK-7O
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:13 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCsKj-0000SG-4K
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:13 -0500
Received: from mx20.gnu.org ([199.232.41.8])
	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 1JCsKi-00036z-IA
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:12 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@gnu.org>) id 1JCsKh-0006TX-Qu
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:12 -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 1JCsKh-0003E8-NA
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:11 -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 1JCsKf-0001qO-Vb
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:00:11 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 03:00:09 -0500
Date: Thu, 10 Jan 2008 03:00:09 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCsKf-0001qO-Vb@mire.hcoop.net>
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Erc-commit] [commit][master] erc-list: Suppress extra output in
	server buffer when module enabled.
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: Thu, 10 Jan 2008 08:00:14 -0000

commit e92306873d7ef2ab5de61e61694a2ad29dc74ba3
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 10 02:58:54 2008 -0500

    erc-list: Suppress extra output in server buffer when module enabled.

diff --git a/ChangeLog b/ChangeLog
index e54a4b9..19b2d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,21 @@
 	hook.  This makes them easier to disable.
 
 	* erc-list.el: New file from Tom Tromey.  Use erc-propertize
-	instead of propertize.  Add simple module definition.
+	instead of propertize.  Require 'erc.
+	(list): New module definition.  Remove message-displaying
+	functions for 321 and 322 response handlers when enabling the
+	module, and restore them when disabling.  As a sanity check,
+	remove the erc-list-handle-322 function when disabling the module.
 	(erc-list-handle-322): Handle the case where we run the LIST
 	command, but do not go through the normal steps.
 	(erc-cmd-LIST): Add docstring.  Strip initial space from line if
-	it is non-nil.
+	it is non-nil.  Use make-local-variable to silence compiler
+	warning.  Capture current buffer and pass it to
+	erc-list-install-322-handler.
+	(erc-list-install-322-handler): Take server-buffer argument, so
+	that we are certain of being in the right buffer.  Use 4th
+	argument to add-hook, so that erc-server-322-functions is only
+	modified in one buffer.
 
 	* erc-list-old.el: Renamed from old erc-list.el.
 
diff --git a/erc-list.el b/erc-list.el
index 256ae41..fc8ec9b 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -29,6 +29,8 @@
 
 ;;; Code:
 
+(require 'erc)
+
 ;; This is implicitly the width of the channel name column.  Pick
 ;; something small enough that the topic has a chance of being
 ;; readable, but long enough that most channel names won't make for
@@ -53,8 +55,13 @@
 ;;;###autoload (autoload 'erc-list-mode "erc-list")
 (define-erc-module list nil
   "List channels nicely in a separate buffer."
-  (nil)
-  (nil))
+  ((remove-hook 'erc-server-321-functions 'erc-server-321-message)
+   (remove-hook 'erc-server-322-functions 'erc-server-322-message))
+  ((erc-with-all-buffers-of-server nil
+     #'erc-open-server-buffer-p
+     (remove-hook 'erc-server-322-functions 'erc-list-handle-322 t))
+   (add-hook 'erc-server-321-functions 'erc-server-321-message t)
+   (add-hook 'erc-server-322-functions 'erc-server-322-message t)))
 
 ;; Format a record for display.
 (defun erc-list-make-string (channel users topic)
@@ -170,27 +177,27 @@
   t)
 
 ;; Helper function to install our 322 handler and make our buffer.
-(defun erc-list-install-322-handler ()
-  ;; Arrange for 322 responses to insert into our buffer.
-  (add-hook 'erc-server-322-functions 'erc-list-handle-322 t)
-  ;; Arrange for 323 (end of list) to end this.
-  (erc-once-with-server-event
-   323
-   '(progn
-      (remove-hook 'erc-server-322-functions 'erc-list-handle-322 t)))
-  ;; Find the list buffer, empty it, and display it.
-  (set (make-local-variable 'erc-list-buffer)
-       (get-buffer-create (concat "*Channels of "
-				  erc-server-announced-name
-				  "*")))
-  (let ((server-buffer (current-buffer)))
+(defun erc-list-install-322-handler (server-buffer)
+  (with-current-buffer server-buffer
+    ;; Arrange for 322 responses to insert into our buffer.
+    (add-hook 'erc-server-322-functions 'erc-list-handle-322 t t)
+    ;; Arrange for 323 (end of list) to end this.
+    (erc-once-with-server-event
+     323
+     '(progn
+	(remove-hook 'erc-server-322-functions 'erc-list-handle-322 t)))
+    ;; Find the list buffer, empty it, and display it.
+    (set (make-local-variable 'erc-list-buffer)
+	 (get-buffer-create (concat "*Channels of "
+				    erc-server-announced-name
+				    "*")))
     (with-current-buffer erc-list-buffer
       (erc-list-menu-mode)
       (setq buffer-read-only nil)
       (erase-buffer)
       (set (make-local-variable 'erc-list-server-buffer) server-buffer)
-      (setq buffer-read-only t)))
-  (pop-to-buffer erc-list-buffer)
+      (setq buffer-read-only t))
+    (pop-to-buffer erc-list-buffer))
   t)
 
 ;; The main entry point.
@@ -203,11 +210,11 @@ should usually be one or more channels, separated by commas.
 Please note that this function only works with IRC servers which conform
 to RFC and send the LIST header (#321) at start of list transmission."
   (erc-with-server-buffer
-    (set (make-variable-buffer-local 'erc-list-last-argument) line)
+    (set (make-local-variable 'erc-list-last-argument) line)
     (erc-once-with-server-event
      321
-     '(progn
-	(erc-list-install-322-handler))))
+     (list 'progn
+	   (list 'erc-list-install-322-handler (current-buffer)))))
   (erc-server-send (concat "LIST :" (or (and line (substring line 1))
 					""))))
 (put 'erc-cmd-LIST 'do-not-parse-args t)



From MAILER-DAEMON Thu Jan 10 03:40:10 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JCsxO-0003rW-2b
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 03:40:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCsxM-0003rG-QN
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:40:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCsxL-0003r4-Ai
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:40:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCsxL-0003r1-8V
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:40:07 -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 1JCsxK-0001H2-VW
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:40:07 -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 1JCsxK-0004uT-8m
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:40:06 -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 1JCsxI-0003CQ-Q6
	for erc-commit@gnu.org; Thu, 10 Jan 2008 03:40:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 03:40:04 -0500
Date: Thu, 10 Jan 2008 03:40:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JCsxI-0003CQ-Q6@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Make setting topic work after running
	/LIST.
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: Thu, 10 Jan 2008 08:40:09 -0000

commit b634481a85c784685529084740b1e96a2ada7ecd
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 10 03:31:31 2008 -0500

    Make setting topic work after running /LIST.

diff --git a/ChangeLog b/ChangeLog
index 19b2d10..07c0d74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@
 	* erc-list-old.el: Renamed from old erc-list.el.
 
 	* erc.el (erc-modules): Add list-old.
+	(erc-set-topic): Handle case where there are no newlines in the
+	existing topic, which happens when /LIST is run.
 
 2008-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/erc.el b/erc.el
index 4b98b68..6bc7d76 100644
--- a/erc.el
+++ b/erc.el
@@ -3701,8 +3701,9 @@ If `point' is at the beginning of a channel name, use that as default."
     (read-from-minibuffer
      (concat "Set topic of " (erc-default-target) ": ")
      (when erc-channel-topic
-       (cons (apply 'concat (butlast (split-string erc-channel-topic "\C-o")))
-	     0)))))
+       (let ((ss (split-string erc-channel-topic "\C-o")))
+	 (cons (apply 'concat (if (cdr ss) (butlast ss) ss))
+	       0))))))
   (let ((topic-list (split-string topic "\C-o"))) ; strip off the topic setter
     (erc-cmd-TOPIC (concat (erc-default-target) " " (car topic-list)))))
 



From MAILER-DAEMON Thu Jan 10 17:50:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JD6E2-0007Xu-C0
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 17:50:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JD6E0-0007XF-MR
	for erc-commit@gnu.org; Thu, 10 Jan 2008 17:50:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JD6Dy-0007Wl-KO
	for erc-commit@gnu.org; Thu, 10 Jan 2008 17:50:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JD6Dy-0007Wa-6k
	for erc-commit@gnu.org; Thu, 10 Jan 2008 17:50:10 -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 1JD6Dx-0004fO-U8
	for erc-commit@gnu.org; Thu, 10 Jan 2008 17:50:10 -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 1JD6Dw-0003Hl-V4
	for erc-commit@gnu.org; Thu, 10 Jan 2008 17:50:08 -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 1JD6Dv-0005bc-CH
	for erc-commit@gnu.org; Thu, 10 Jan 2008 17:50:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 17:50:07 -0500
Date: Thu, 10 Jan 2008 17:50:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JD6Dv-0005bc-CH@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix pink notice text in tty bug.
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: Thu, 10 Jan 2008 22:50:13 -0000

commit 8a5c1106e8357bbec626877ad6d7b3eadb798352
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 10 17:40:14 2008 -0500

    Fix pink notice text in tty bug.

diff --git a/ChangeLog b/ChangeLog
index 07c0d74..1ca1775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
 	* erc.el (erc-modules): Add list-old.
 	(erc-set-topic): Handle case where there are no newlines in the
 	existing topic, which happens when /LIST is run.
+	(erc-notice-face): If we have less than 88 colors, make this
+	blue.  Otherwise the text will be pink in a tty, which looks
+	dreadful.  Thanks to e1f for the report.
 
 2008-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/erc.el b/erc.el
index 6bc7d76..716890c 100644
--- a/erc.el
+++ b/erc.el
@@ -1167,7 +1167,10 @@ This will only be used if `erc-header-line-face-method' is non-nil."
 See the variable `erc-command-indicator'."
   :group 'erc-faces)
 
-(defface erc-notice-face '((t (:bold t :foreground "SlateBlue")))
+(defface erc-notice-face
+  '((((class color) (min-colors 88))
+     (:bold t :foreground "SlateBlue"))
+    (t (:bold t :foreground "blue")))
   "ERC face for notices."
   :group 'erc-faces)
 



From MAILER-DAEMON Thu Jan 10 18:20:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JD6h0-00086L-T0
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JD6gy-00084W-Q1
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JD6gw-00083h-Vm
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JD6gw-00083e-Pj
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:06 -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 1JD6gw-00029E-E3
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:06 -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 1JD6gv-0004gx-7g
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:05 -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 1JD6gt-0006UN-MA
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:04 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 18:20:03 -0500
Date: Thu, 10 Jan 2008 18:20:03 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JD6gt-0006UN-MA@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Conditionally remove the erc-parsed
	property after displaying message.
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: Thu, 10 Jan 2008 23:20:09 -0000

commit 9ed4989fb4d0f2f3e4f5e87dc11ab7ae1554e837
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 10 18:15:52 2008 -0500

    Conditionally remove the erc-parsed property after displaying message.

diff --git a/ChangeLog b/ChangeLog
index 1ca1775..d99ca50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
 	(erc-notice-face): If we have less than 88 colors, make this
 	blue.  Otherwise the text will be pink in a tty, which looks
 	dreadful.  Thanks to e1f for the report.
+	(erc-remove-parsed-property): New option that determines whether
+	to remove the erc-parsed property after displaying a message.
+	This should have the effect of making ERC take up less memory.
+	(erc-display-line-1): Use it.
 
 2008-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/erc.el b/erc.el
index 716890c..92299fb 100644
--- a/erc.el
+++ b/erc.el
@@ -2321,6 +2321,15 @@ If ARG is non-nil, show the *erc-protocol* buffer."
 I.e. any char in it has the `invisible' property set."
   (text-property-any 0 (length string) 'invisible t string))
 
+(defcustom erc-remove-parsed-property t
+  "Whether to remove the erc-parsed text property after displaying a message.
+
+The default is to remove it, since it causes ERC to take up extra
+memory.  If you have code that relies on this property, then set
+this option to nil."
+  :type 'boolean
+  :group 'erc)
+
 (defun erc-display-line-1 (string buffer)
   "Display STRING in `erc-mode' BUFFER.
 Auxiliary function used in `erc-display-line'.  The line gets filtered to
@@ -2361,7 +2370,10 @@ If STRING is nil, the function does nothing."
 		(save-restriction
 		  (narrow-to-region insert-position (point))
 		  (run-hooks 'erc-insert-modify-hook)
-		  (run-hooks 'erc-insert-post-hook))))))
+		  (run-hooks 'erc-insert-post-hook)
+		  (when erc-remove-parsed-property
+		    (remove-text-properties (point-min) (point-max)
+					    '(erc-parsed nil))))))))
 	(erc-update-undo-list (- (or (marker-position erc-insert-marker)
 				     (point-max))
 				 insert-position))))))



From MAILER-DAEMON Thu Jan 10 18:20:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JD6h4-0008A8-5A
	for mharc-erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JD6h2-00087m-4C
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JD6gz-00085b-KP
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JD6gz-00085L-Aq
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:09 -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 1JD6gy-00029o-Di
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:09 -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 1JD6gx-0004hL-Uo
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:08 -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 1JD6gw-0006Wi-CM
	for erc-commit@gnu.org; Thu, 10 Jan 2008 18:20:07 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 10 Jan 2008 18:20:06 -0500
Date: Thu, 10 Jan 2008 18:20:06 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JD6gw-0006Wi-CM@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Rotate ChangeLog.
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: Thu, 10 Jan 2008 23:20:12 -0000

commit 443611c7fcf9dcc320bae8605f16db4536349ea5
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 10 18:18:51 2008 -0500

    Rotate ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index d99ca50..eb455d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,821 +39,10 @@
 	* erc-ibuffer.el (erc-channel-modes):
 	Pass mode-name through format-mode-line
 
-2007-12-16  Diane Murray  <disumu@x3y2z1.net>
 
-	* erc-services.el (erc-nickserv-alist): Removed autodetect regexp,
-	added identified regexp for OFTC.
-	(erc-nickserv-identification-autodetect): Make sure success-regex
-	is non-nil.
-	(erc-nickserv-identify-autodetect): Make sure identify-regex is
-	non-nil.  Doc fix.
+See ChangeLog.07 for earlier changes.
 
-2007-12-13  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-backend.el (PRIVMSG, QUIT, TOPIC, WALLOPS, 376, 004, 221)
-	(312, 315, 319, 330, 331, 333, 367, 368, 391, 405, 406, 412)
-	(421, 432, 433, 437, 442, 461, 474, 477, 482, 431): Doc fix.
-
-2007-12-09  Michael Olson  <mwolson@gnu.org>
-
-	* erc-services.el (erc-nickserv-alist): Fix regexps for GRnet.
-
-2007-12-09  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
-
-	* erc-backend.el, erc.el:
-	Parse 275 (secure connection) responses.
-
-	* erc-services.el: Add identification hooks for GRnet, the Greek
-	IRC network <http://www.irc.gr>.
-
-2007-12-08  David Kastrup  <dak@gnu.org>
-
-	* erc-stamp.el (erc-echo-timestamp):
-	* erc-lang.el (language):
-	* erc-backend.el (erc-server-connect): Fix buggy call to `message'.
-
-2007-12-07  Edward O'Connor  <ted@oconnor.cx>
-
-	* erc-services.el: Provide a hook that runs when nickserv confirms
-	that the user has successfully identified.
-	(services, erc-nickserv-identify-mode): Add and remove
-	erc-nickserv-identification-autodetect from
-	erc-server-NOTICE-functions.
-	(erc-nickserv-alist): Add SUCCESS-REGEXP to each entry.
-	(erc-nickserv-alist-identified-regexp)
-	(erc-nickserv-identification-autodetect): New functions.
-	(erc-nickserv-identified-hook): New hook.
-
-2007-12-06  D. Goel  <deego3@gmail.com>
-
-	* erc-match.el (erc-add-entry-to-list): Fix buggy call to `error'.
-
-2007-12-01  Glenn Morris  <rgm@gnu.org>
-
-	* erc-backend.el (erc-server-send-ping): Move after definition of
-	erc-server-send.
-
-2007-11-29  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
-
-	* erc-backend.el, erc.el:
-	Parse 307 (nick has identified) responses.
-
-2007-11-15  Juanma Barranquero  <lekktu@gmail.com>
-
-	* erc.el (erc-open):
-	* erc-backend.el (define-erc-response-handler):
-	* erc-log.el (log):
-	* erc-match.el (erc-log-matches): Fix typos in docstrings.
-
-2007-11-11  Michael Olson  <mwolson@gnu.org>
-
-	* erc-autoaway.el (erc-autoaway-possibly-set-away):
-	* erc-netsplit.el (erc-netsplit-timer):
-	* erc-notify.el (erc-notify-timer):
-	* erc-track.el (erc-user-is-active): Only run if we have
-	successfully established a connection to the server and have
-	logged in.  I suspect that sending messages too soon may make some
-	IRC servers not respond well, particularly when the network
-	connection is iffy or subject to traffic-shaping.
-
-2007-11-01  Michael Olson  <mwolson@gnu.org>
-
-	* erc-compat.el (erc-set-write-file-functions): New compatibility
-	function to set the write hooks appropriately.
-
-	* erc-log.el (erc-log-setup-logging): Use
-	erc-set-write-file-functions.  This fixes a byte-compiler warning.
-
-	* erc-stamp.el: Silence byte-compiler warning about
-	erc-fill-column.
-
-	* erc.el (erc-with-all-buffers-of-server): Bind the result of
-	mapcar to a variable in order to silence a byte-compiler warning.
-
-2007-10-29  Michael Olson  <mwolson@gnu.org>
-
-	* erc-ibuffer.el (erc-modified-channels-alist): Use
-	eval-when-compile, and explain why we are doing this.
-
-2007-10-25  Dan Nicolaescu  <dann@ics.uci.edu>
-
-	* erc-ibuffer.el (erc-modified-channels-alist): Pacify
-	byte-compiler.
-
-2007-10-13  Glenn Morris  <rgm@gnu.org>
-
-	* erc-track.el (erc-modified-channels-update): Use mapc rather
-	than mapcar.
-
-2007-10-12  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-join-channel): Prompt for channel key if C-u or
-	another prefix-arg was typed.
-
-	* NEWS: Noted this change.
-
-2007-10-07  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-cmd-ME'S): New command that handles the case where
-	someone types "/me's".  It concatenates the text " 's" to the
-	beginning of the input and then sends the result like a normal
-	"/me" command.
-	(erc-command-regexp): Permit single-quote character.
-
-2007-09-30  Aidan Kehoe  <kehoea@parhasard.net>  (tiny change)
-
-	* erc-log.el (erc-save-buffer-in-logs): Prevent spurious warnings
-	when looking at a log file and concurrently saving to it.
-
-2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
-
-	* erc.texi (Special-Features): Fix small typo.
-
-2007-09-16  Michael Olson  <mwolson@gnu.org>
-
-	* erc-track.el (erc-track-switch-direction): Mention
-	erc-track-faces-priority-list.  Thanks to Leo for the suggestion.
-
-2007-09-11  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
-
-	* erc-sound.el: Fix typo in setting up instructions.
-
-2007-09-10  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (elpa): Copy dir template rather than echoing a few
-	lines.  The reason for this is that the ELPA package for ERC was
-	getting a corrupt dir entry.
-
-	* dir-template: Template for the ELPA dir file.
-
-2007-09-08  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-log-filter-function): New option that specifies
-	the function to call for filtering text before writing it to a log
-	file.  Thanks to David O'Toole for the suggestion.
-	(erc-save-buffer-in-logs): Use erc-log-filter-function.  Make sure
-	we carry along the value of coding-system-for-write, because this
-	could potentially be shadowed by the temporary buffer.
-
-	* erc.el (erc-version-string): Update to 5.3, development version.
-
-2007-09-07  Glenn Morris  <rgm@gnu.org>
-
-	* erc.el (erc-toggle-debug-irc-protocol): Fix call to
-	erc-view-mode-enter.
-
-2007-08-08  Glenn Morris  <rgm@gnu.org>
-
-	* erc-log.el, erc.el: Replace `iff' in doc-strings and comments.
-
-2007-09-03  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-default-port): Make this an integer value rather
-	than a string.  Thanks to Luca Capello for the report.
-
-2007-08-27  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-cmd-GQUIT): If erc-kill-queries-on-quit is non-nil,
-	kill all query buffers after 4 seconds.
-
-2007-08-16  Michael Olson  <mwolson@gnu.org>
-
-	* NEWS: Add ERC 5.3 changes section, and mention jbms' erc-track
-	compatibility note.
-
-	* erc-track.el (erc-track-list-changed-hook): Turn this into a
-	customizable option.
-	(erc-track-switch-direction): Add 'importance option.
-	(erc-modified-channels-display): If erc-track-switch-direction is
-	'importance, call erc-track-sort-by-importance.
-	(erc-track-face-priority): New function that returns a number
-	indicating the position of a face in erc-track-faces-priority-list.
-	(erc-track-sort-by-importance): New function that sorts
-	erc-modified-channels-list according to erc-track-face-priority.
-	(erc-track-get-active-buffer): Make 'oldest a rough opposite of
-	'importance.
-
-2007-08-14  Jeremy Maitin-Shepard  <jbms@cmu.edu>
-
-	* erc-track.el (erc-track-remove-disconnected-buffers): New
-	variable which controls whether buffers associated with a server
-	that is disconnected should be removed from
-	`erc-modified-channels-alist'.  Existing behavior is to
-	unconditionally remove such buffers, which is achieved by setting
-	`erc-track-removed-disconnected-buffers' to t.  When set to t,
-	which is the new default value, such buffers remain in the list,
-	which I think is often the desired behavior, since the user may
-	likely wish to find out about activity that occurred in a channel
-	prior to it being disconnected.
-	(erc-track-list-changed-hook): New hook that is run whenever the
-	contents of `erc-modified-channels-alist' changes; it is useful
-	for users such as myself that don't use the default mode-line
-	notification but instead use a separate mechanism (which is tied
-	to my window manager) to provide notification of channel activity.
-	(erc-track-get-buffer-window): New function that acts as a wrapper
-	around `get-buffer-window' that handles the `selected-visible'
-	option of `erc-track-visibility'; previously, the value of
-	`erc-track-visibility' was passed directly to `get-buffer-window',
-	which does not support `selected-visible'; consequently,
-	`selected-visible' was not properly supported.
-	(erc-track-modified-channels): Fix a bug in the logic for removing
-	buffers from the list in certain cases.
-	(erc-track-position-in-mode-line): Add a supported value that
-	specifies that the tracking information should not be added to the
-	mode line at all.  The value of nil is used to indicate that the
-	information should not be added at all to the mode line.
-	(erc-track-add-to-mode-line): Check for position eq to t, rather
-	than non-nil.
-	(erc-buffer-visible): Use erc-track-get-buffer-window.
-	(erc-modified-channels-update): Take
-	erc-track-remove-disconnected-buffers into account.
-	(erc-modified-channels-display): Run `erc-track-list-changed-hook'.
-
-	* erc.el (erc-reuse-frames): New option that determines whether
-	new frames are always created.  Defaults to t.  This only has an
-	effect when erc-join-buffer is set to 'frame.
-	(erc-setup-buffer): Use it.
-
-2007-08-14  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-server-reconnect): If the server buffer has
-	been killed, use the current buffer instead.  If the current
-	buffer is not an ERC buffer, give an error.  This fixes a bug when
-	/reconnect is run from a channel buffer whose server buffer has
-	been deleted.  Thanks to jbms for the report.
-	(erc-process-sentinel-1): Take server buffer as an argument, so
-	that we can make sure that it is current.
-	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
-	(erc-process-sentinel-2): New function split from
-	erc-process-sentinel-1.  If server buffer is deleted during a
-	reconnect attempt, stop trying to reconnect.  Fix bug where
-	reconnect was not happening when erc-server-reconnect-attempts was
-	t.  Call erc-server-reconnect-p only once each time.  If we are
-	instructed to try connecting indefinitely, tell the user that they
-	can stop this by killing the server buffer.  Call the process
-	sentinel by means of run-at-time, so that there is time to kill
-	the buffer if need be; this also removes the need for a while
-	loop.  Refuse to reconnect again if erc-server-reconnect-timeout
-	is not an number.
-
-	* erc.el (erc-command-no-process-p): Fix bug: the return value of
-	erc-extract-command-from-line is a list rather than a single
-	symbol.  Thanks to jbms for the report.
-	(erc-cmd-RECONNECT): Use simpler logic, and use buffer-live-p
-	rather than bufferp.
-	(erc-send-current-line, erc-display-command, erc-display-msg):
-	Handle case where erc-server-process is nil, so that /reconnect
-	works.
-
-2007-08-12  Michael Olson  <mwolson@gnu.org>
-
-	* erc-identd.el (erc-identd-filter): Instead of sending an EOF
-	character, which now confuses freenode, stop the server process,
-	so that no new connections are accepted, and kill the current
-	client process.
-
-2007-07-29  Michael Olson  <mwolson@gnu.org>
-
-	* erc-list.el: Relicense to GPLv3.  Since the file was already
-	licensed under version 2 or later, it turns out that we do not
-	need the permission of all of the authors in order to proceed.
-
-2007-07-13  Michael Olson  <mwolson@gnu.org>
-
-	* erc-goodies.el (erc-get-bg-color-face, erc-get-fg-color-face):
-	Use erc-error rather than message and beep.
-
-	* erc-sound.el: Indentation fix.
-
-	* erc.el (erc-command-no-process-p): New function that determines
-	if its argument is an ERC command that can be run when the server
-	process is not alive.
-	(erc-cmd-SET, erc-cmd-CLEAR, erc-cmd-COUNTRY, erc-cmd-HELP)
-	(erc-cmd-LASTLOG, erc-cmd-QUIT, erc-cmd-GQUIT)
-	(erc-cmd-RECONNECT, erc-cmd-SERVER): Denote that these commands
-	can be run even when the server process is not alive.
-	(erc-send-current-line): Call erc-command-no-process-p if the
-	server process is not alive, to determine if we have a command
-	that can be run anyway.  Thanks to Tom Tromey for the bug report.
-	(erc-error): New function that either displays a message or throws
-	an error, depending on whether debug-on-error is non-nil.
-	(erc-cmd-SERVER, erc-send-current-line): Use it.
-
-2007-07-10  Michael Olson  <mwolson@gnu.org>
-
-	* Relicense all FSF-assigned code to GPLv3.
-
-2007-06-25  Michael Olson  <mwolson@gnu.org>
-
-	* erc.texi (Options): Fix typo.
-	(Getting Help and Reporting Bugs): Update webpage URL.  Make Gmane
-	part more readable.
-
-2007-06-20  Michael Olson  <mwolson@gnu.org>
-
-	* erc-stamp.el (erc-timestamp-format-left): New option that
-	specifies the left timestamp to use for
-	erc-insert-timestamp-left-and-right.
-	(erc-timestamp-format-right): New option that specifies the right
-	timestamp to use for erc-insert-timestamp-left-and-right.
-	(erc-insert-timestamp-function): Change default to
-	erc-insert-timestamp-left-and-right.
-	(erc-insert-away-timestamp-function): Ditto.
-	(erc-timestamp-last-inserted-left)
-	(erc-timestamp-last-inserted-right): New variables to keep track
-	of data for erc-insert-timestamp-left-and-right.
-	(erc-insert-timestamp-left-and-right): New function that places
-	timestamps on both the left and right sides of the screen, but
-	only if each timestamp has changed since it was last computed.
-	Thanks to offby1 for urging me to merge this.
-
-	* erc.el (erc-open-ssl-stream): Display informative error when
-	ssl.el not found.
-	(erc-tls): New function to connect using tls.el.
-	(erc-open-tls-stream): New function to initiate tls connection.
-	Display informative error when tls.el not found.
-
-2007-06-19  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el: Update header with accurate instructions.
-
-2007-06-17  Michael Olson  <mwolson@gnu.org>
-
-	* erc-pkg.el: Update description to match what is currently in ELPA.
-
-2007-06-14  Juanma Barranquero  <lekktu@gmail.com>
-
-	* erc-goodies.el (erc-scroll-to-bottom): Remove redundant check.
-
-2007-06-13  Michael Olson  <mwolson@gnu.org>
-
-	* erc-compat.el (erc-with-selected-window): New compatibility
-	macro that implements `with-selected-window'.
-
-	* erc-goodies.el (erc-scroll-to-bottom): Use it.  This fixes a bug
-	with buffer ordering where ERC buffers would move to the top.
-	Thanks to Ivan Kanis for the patch.
-
-2007-06-10  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-logging-enabled): Fix a bug that occurred when
-	`erc-log-channels-directory' had the name of a function.
-
-2007-06-06  Juanma Barranquero  <lekktu@gmail.com>
-
-	* erc.el (erc-show-channel-key-p, erc-startup-file-list):
-	Fix typo in docstring.
-
-2007-06-03  Michael Olson  <mwolson@gnu.org>
-
-	* erc-compat.el (erc-view-mode-enter): Make this its own function,
-	in order to document what we do, and provide sane fallback
-	behavior.
-
-	* erc.el (erc-toggle-debug-irc-protocol): Don't pass any arguments
-	to erc-view-mode-enter, since we don't do anything special with
-	the exit function.  This fixes a bug with Emacs 21 and Emacs 22.
-	Thanks to Leo for noticing.
-
-2007-05-30  Michael Olson  <mwolson@gnu.org>
-
-	* erc-compat.el (erc-user-emacs-directory): New variable that
-	determines where to find user-specific Emacs settings.  For Emacs,
-	this is usually ~/.emacs.d, and for XEmacs this is usually
-	~/.xemacs.
-
-	* erc.el (erc-startup-file-list): Use erc-user-emacs-directory.
-
-2007-05-28  Michael Olson  <mwolson@gnu.org>
-
-	* erc-button.el (erc-button-url-regexp): Recognize parentheses as
-	part of URLs.  Thanks to Lawrence Mitchell for the fix.
-
-2007-05-26  Michael Olson  <mwolson@gnu.org>
-
-	* erc.texi (Modules): Fix references to completion modules.
-
-2007-05-21  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (SOURCE): Remove erc-pkg.el.
-	(debclean): New rule to clean old Debian packages of ERC.
-	(debprepare): Don't modify the released tarball, but copy it as
-	the .orig.tar.gz file.
-	(debrelease, debrevision): Remove.
-	(debinstall): New target that copies the generated Debian file to
-	a distro-specific location.
-	(deb): New rule that chains together the stages in building a
-	Debian package.
-	(EXTRAS): Add erc-nicklist.el, since it is not release-quality.
-	(extras): Copy images directory.
-
-	* erc-nicklist.el (erc-nicklist-icons-directory): Use
-	locate-library to find the "images" directory.  This should be
-	more failsafe.  Thanks to Tom Tromey for the idea.
-
-2007-05-19  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (ELPA): New variable that contains the location of my
-	local ELPA repository.
-	(elpa): New rule that makes an ELPA package for ERC.
-
-2007-04-19  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-parse-prefix): New function that retrieves the
-	PREFIX server parameter from the current server and returns an
-	alist of prefix type to prefix character.
-	(erc-channel-receive-names): Use `erc-parse-prefix' to determine
-	whether the first character of a nick is a prefix character or
-	not.  This should fix a bug reported by bromine about needing to
-	type "%" first to complete nicks of people who are "hops" on
-	Slashnet.  This should also support for very exotic IRC server
-	setups, if any exist.
-	(erc-update-current-channel-member): Indentation.
-
-2007-04-15  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-generate-log-file-name-function): Docfix.
-	Mention how to deal with the case for putting log files in
-	different directories.  Change a customization type from `symbol'
-	to `function'.
-	(erc-log-channels-directory): Allow this to contain a function
-	name, which is called with the same args as in
-	`erc-generate-log-file-name-function'.  Thanks to andrewy for the
-	report and use case.
-	(erc-current-logfile): Detect if `erc-log-channels-directory' is a
-	function and call it with arguments if so.
-
-2007-04-12  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (define-erc-response-handler): Mention that hook
-	processing stops when the function returns non-nil.  This should
-	help avoid a nasty "gotcha" when making custom functions.  Thanks
-	to John Sullivan for the report.
-
-2007-04-08  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-nicklist.el (erc-nicklist-voiced-position): Fixed
-	customization mismatch.
-
-2007-04-01  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-version-string): Release ERC 5.2.
-
-	* erc-auto.in, erc-chess.el, erc-list.el, erc-speak.el:
-	* erc-viper.el: Update copyright notices.
-
-	* erc.texi: Make Emacs Lisp source code in this document
-	essentially public domain.  Update version to 5.2.
-	(Obtaining ERC): Mention extras tarball.
-	(Releases): Mention local GNU mirror.
-	(Sample Configuration): Remove notice.
-
-	* FOR-RELEASE (5.3): Add item for erc-nicklist.
-	Mark NEWS as done.  Mark extras tarball as done.
-
-	* Makefile (VERSION): Increment to 5.2.
-	(TESTING): Remove.
-	(EXTRAS): New variable containing the contents of our "Emacs 22
-	extras" tarball.
-	(SOURCE): Remove $(TESTING).
-	(MISC): Add COPYING and ChangeLog.06.  Fix ChangeLog.NNNN ->
-	ChangeLog.NN.
-	(release): Use $(SNAPDIR) instead of erc-$(VERSION).
-	(extras): New rule which implements the building of the extras
-	tarball.
-	(upload-extras): New rule to upload the extras tarball.  It's
-	yucky to replicate upload, but oh well.
-	(DISTRIBUTOR): New variable used to differentiate between building
-	packages for Ubuntu and Debian.
-	(debrelease, debrevision): Use it.
-	(debbuild): Run linda in addition to lintian.
-
-	* NEWS: Mention extras tarball.  Note which files have been
-	renamed.  Note that erc-list is enabled by default, except in
-	Emacs 22.
-
-	* README.extras: New file which serves as a README for the extras
-	tarball.
-
-2007-03-31  Michael Olson  <mwolson@gnu.org>
-
-	* NEWS: Update for the 5.2 release.
-
-	* FOR-RELEASE: Finish up 5.2 manual item.  Add documentation item
-	for 5.3.
-
-	* erc.texi (Sample Session): Flesh out.  Mention #erc.
-	(Modules): Defer to 5.3 release.
-	(Advanced Usage): Move Sample Configuration chapter ahead of
-	unfinished chapters.
-	(Sample Configuration): Write.
-	(Options): Mention how to see available ERC options.  Defer to 5.3
-	release.
-	(Tips and Tricks): Remove, since it seems better to just include
-	tips and tricks in the sample configuration, commented out.
-
-	* erc-bbdb.el (erc-bbdb-search-name-and-create): Make prompt more
-	informative about how to skip merging.
-	(erc-bbdb-insinuate-and-show-entry-1): Move contents of
-	erc-bbdb-insinuate-and-show-entry here.
-	(erc-bbdb-insinuate-and-show-entry): Run
-	erc-bbdb-insinuate-and-show-entry-1 "outside" of the calling
-	function, so that we can avoid triggering a process-filter error
-	if the user hits C-g.
-
-2007-03-30  Michael Olson  <mwolson@gnu.org>
-
-	* FOR-RELEASE: Solve C-c C-SPC keybinding dilemma.
-
-	* erc-autoaway.el (erc-autoaway-idle-method): Use `if' rather than
-	`cond' and `set' rather than `set-default'.
-
-	* erc-log.el: Avoid compiler warning by requiring erc-network
-	during compilation.
-	(erc-generate-log-file-name-function): Add tag to each option.
-	Add erc-generate-log-file-name-network.
-	(erc-generate-log-file-name-network): New function which generates
-	a log file name that uses network name rather than server name,
-	when possible.
-
-	* erc-track.el (track): Assimilate track-when-inactive module,
-	since there's no need to have two modules in one file -- an option
-	will do.  Remove track-modified-channels alias.  Call
-	erc-track-minor-mode-maybe, and tear down the minor mode when
-	disabling.
-	(erc-track-when-inactive): New option which determines whether to
-	track visible buffers when inactive.  The default is not to do so.
-	(erc-track-visibility): Mention erc-track-when-inactive.
-	(erc-buffer-visible): Use erc-track-when-inactive.
-	(erc-track-enable-keybindings): New option which determines
-	whether to enable the global-level tracking keybindings.  The
-	default is to do so, unless they would override another binding,
-	in which case we prompt the user about it.
-	(erc-track-minor-mode-map): Move global keybindings here.
-	(erc-track-minor-mode): New minor mode which only enables the
-	keybindings and does nothing else.
-	(erc-track-minor-mode-maybe): New function which starts
-	erc-track-minor-mode, but only if it hasn't already been started,
-	an ERC buffer exists, and the user OK's it, depending on the value
-	of `erc-track-enable-keybindings'.
-	(erc-track-switch-buffer): Display a message if someone calls this
-	without first enabling erc-track-mode.
-
-2007-03-17  Michael Olson  <mwolson@gnu.org>
-
-	* erc.texi (Development): Mention ErcDevelopment page on
-	emacswiki.
-	(Getting Started): Mention ~/.emacs.d/.ercrc.el and the Customize
-	interface.
-	(Sample Session): New section that has a very rough draft for a
-	sample ERC session.
-	(Special Features): New section that explains some of the special
-	features of ERC.  Taken from ErcFeatures on emacswiki, with
-	enhancements.
-
-2007-03-12  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-autoaway.el (erc-autoaway-idle-method): When setting the new
-	value, disable and re-enable `erc-autoaway-mode' only if it was
-	already enabled.  This fixes a bug where autoaway was enabled just
-	by loading the file.
-
-2007-03-10  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-capab.el: Added more information to the Usage section.
-	(erc-capab-identify-prefix): Doc fix.
-	(erc-capab-identify-unidentified): New face.
-	(290): Removed.  Definition moved to erc-backend.el.
-	(erc-capab-identify-send-messages): Renamed from
-	`erc-capab-send-identify-messages'.
-	(erc-capab-identify-setup): Use it.
-	(erc-capab-identify-get-unidentified-nickname): Renamed from
-	`erc-capab-get-unidentified-nickname'.
-	(erc-capab-identify-add-prefix): Use it.  Use
-	`erc-capab-identify-unidentified' as the face.
-
-	* erc-backend.el (290): Moved here from erc-capab.el.
-
-	* erc.el (erc-select): Added an autoload cookie.
-	(erc-message-type-member, erc-restore-text-properties): Use
-	`erc-get-parsed-vector'.
-	(erc-auto-query): Set the default to 'bury since many new users
-	expect private messages from others to be in dedicated query
-	buffers, not the server buffer.
-	(erc-common-server-suffixes): Use "freenode" for freenode.net, not
-	"OPN".  Added oftc.net.
-
-	* NEWS: Added note about erc-auto-query's new default setting.
-
-2007-03-03  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-open, erc): Docfixes.
-
-2007-03-02  Michael Olson  <mwolson@gnu.org>
-
-	* FOR-RELEASE: Make section for 5.3 release and move erc-backend
-	cleanup there.  Awaiting discussion before doing other things.
-	Add tasks for merging filename changes from the 5.2 release
-	branch, and for making a tarball of modules not in Emacs 22.  Add
-	item to remind me to update NEWS.  Mark backtab entry as done.
-
-	* erc-button.el (button): Add call to `erc-button-add-keys'.
-	(erc-button-keys-added): New variable tracking whether we've added
-	the keys yet.
-	(erc-button-add-keys): New function that adds the <backtab> key to
-	erc-mode-map.
-
-	* erc.texi: Change version to 5.2 (pre-release).
-
-2007-02-15  Michael Olson  <mwolson@gnu.org>
-
-	* CREDITS: Update.
-
-	* erc-backend.el (erc-server-send-ping-interval): Change to use a
-	default of 30 seconds.  Improve customize interface.
-	(erc-server-send-ping-timeout): New option that determines when to
-	consider a connection stalled and restart it.  The default is
-	after 120 seconds.
-	(erc-server-send-ping): Use erc-server-send-ping-timeout instead
-	of erc-server-send-ping-interval.  If
-	erc-server-send-ping-timeout is nil, do not ever kill and restart
-	a hung IRC process.
-
-	* erc.el (erc-modules): Include the name of the module in its
-	description.  This should make it easier for people to find and
-	enable a particular module.
-
-2007-02-15  Vivek Dasmohapatra  <vivek@etla.org>
-
-	* erc.el (erc-cmd-RECONNECT): Kill old process if it is still
-	alive.
-	(erc-message-english-PART): Properly escape "%" characters in
-	reason.
-
-	* erc-backend.el (erc-server-reconnecting): New variable that is
-	set when the user requests a reconnect, but the old process is
-	still alive.  This forces the reconnect to work even though the
-	process is killed manually during reconnect.
-	(erc-server-connect): Initialize it.
-	(erc-server-reconnect-p): Use it.
-	(erc-process-sentinel-1): Set it to nil after the first reconnect
-	attempt.
-
-2007-02-07  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-menu.el (erc-menu-definition): Fixed so that the separator
-	is between "Current channel" and "Pals, fools and other keywords",
-	not at the bottom of the "Current channel" submenu.
-
-2007-01-25  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-networks.el (erc-server-alist): Removed SSL server for now
-	since `erc-server-select' doesn't know to use `erc-ssl'.
-
-	* erc-networks.el (erc-server-alist, erc-networks-alist): Added
-	definitions for oftc.net.
-
-	* erc-services.el (erc-nickserv-alist): Fixed OFTC message regexp.
-
-2007-01-22  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-server-error-occurred): New variable that
-	indicates when an error has been signaled by the server.  This
-	should fix an infinite reconnect bug when giving some servers a
-	bogus :full-name.  Thanks to Angelina Carlton for the report.
-	(erc-server-connect): Initialize erc-server-error-occurred.
-	(erc-server-reconnect-p): Use it.
-	(ERROR): Set it.
-
-	* erc-services.el (erc-nickserv-alist): Alphabetize and add Ars
-	and QuakeNet.  Standardize look of entries.  Fix type mismatch
-	error in customize interface.
-	(erc-nickserv-passwords): Alphabetize and add missing entries from
-	erc-nickserv-alist.
-
-2007-01-21  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-header-line-format): Document how to disable the
-	header line, and add a customization type for it.  Also, make the
-	changes take effect immediately.
-
-2007-01-19  Michael Olson  <mwolson@gnu.org>
-
-	* erc.texi (Modules): Document new menu module.  Thanks to Leo
-	for noticing.
-
-2007-01-16  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-stamp.el (erc-insert-timestamp-left): Fixed so that the
-	whitespace string filler is hidden correctly when timestamps are
-	hidden.
-	(erc-toggle-timestamps): New function to use instead of
-	`erc-show-timestamps' and `erc-hide-timestamps'.
-
-	* erc.el (erc-restore-text-properties): Moved here from
-	erc-fill.el since it could be useful in general.
-
-	* erc-fill.el (erc-restore-text-properties): Removed.
-
-2007-01-13  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-command-regexp): New variable that is used to match
-	a command.
-	(erc-send-input): Use it.  This fixes a bug where paths --
-	"/usr/bin/foo", for example -- were being displayed as commands,
-	but still sent correctly.
-	(erc-extract-command-from-line): Use it.
-
-	* erc.texi (Modules): Document erc-capab-identify.
-
-2007-01-11  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-find-parsed-property): Moved here from erc-track.el
-	since it can be useful in general.
-
-	* erc-track.el (erc-find-parsed-property): Removed.
-
-	* erc-capab.el (erc-capab-find-parsed): Removed.
-	(erc-capab-identify-add-prefix): Use `erc-find-parsed-property'.
-
-	* erc.el (erc-open): Run `erc-before-connect' hook here.  This
-	makes sure the hook always gets called before a connection is
-	made, as some functions, like `erc-handle-irc-url', use `erc-open'
-	instead of `erc'.
-	(erc): Removed `erc-before-connect' hook.
-
-	* erc-menu.el (erc-menu-definition): Put items specific to
-	channels in a "Current channel" submenu.
-
-	* erc-backend.el (321, 323): Display channel list in server buffer
-	when not using the channel list module.
-
-	* erc.el: Updated copyright years.
-	(erc-version-string): Set to 5.2 (devel).
-	(erc-format-lag-time): Fixed to work when `erc-server-lag' is nil.
-	(erc-update-mode-line-buffer): Set the header face.
-
-2007-01-11  Michael Olson  <mwolson@gnu.org>
-
-	* erc-bbdb.el (erc-bbdb-popup-type): Fix customization type and
-	documentation.
-
-	* erc-services.el (erc-nickserv-identify-mode): Improve
-	documentation for nick-change option and move higher to fix
-	compiler warning.  Avoid a recursive load error.
-	(erc-nickserv-alist): Add simple entry for BitlBee, to avoid
-	"NickServ is AWAY: User is offline" error.  Oddly enough, bitlbee
-	was smart enough to recognize that as an authentication request
-	and log in regardless, which is why I didn't notice this earlier.
-	(erc-nickserv-alist-sender, erc-nickserv-alist-regexp)
-	(erc-nickserv-alist-nickserv, erc-nickserv-alist-ident-keyword)
-	(erc-nickserv-alist-use-nick-p)
-	(erc-nickserv-alist-ident-command): New accessors for
-	erc-nickserv-alist.  Using nth is unwieldy.
-	(erc-nickserv-identify-autodetect)
-	(erc-nickserv-identify-on-connect)
-	(erc-nickserv-identify-on-nick-change, erc-nickserv-identify): Use
-	the new accessors.
-
-2007-01-11  Diane Murray  <disumu@x3y2z1.net>
-
-	* NEWS: Added note for `erc-my-nick-face'.  Fixed capab-identify
-	wording.
-
-2007-01-10  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-mode-line-format): Added %l to documentation.
-	(erc-header-line-format): Removed "[IRC]".  Use the new %l
-	replacement character.  Doc fix.
-	(erc-format-channel-modes): Removed lag code.  Removed parentheses
-	from mode string.
-	(erc-format-lag-time): New function.
-	(erc-update-mode-line-buffer): Use it.
-
-2007-01-10  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el: Fix typo in url-irc-function instructions.
-
-2007-01-09  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-system-name): New option that determines the system
-	name to use when logging in.  The default is to figure this out by
-	calling `system-name'.
-	(erc-login): Use it.
-
-2007-01-07  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-modules): Add the menu module.  This should fix a
-	bug with incorrect ERC submenus being displayed.
-
-	* erc-menu.el: Turn this into a module.
-	(erc-menu-add, erc-menu-remove): New functions that add and remove
-	the ERC menu.
-
-
-See ChangeLog.06 for earlier changes.
-
-    Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+    Copyright (C) 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -876,5 +65,3 @@ See ChangeLog.06 for earlier changes.
 ;; coding: utf-8
 ;; add-log-time-zone-rule: t
 ;; End:
-
-;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496
diff --git a/ChangeLog.07 b/ChangeLog.07
new file mode 100644
index 0000000..c317fe6
--- /dev/null
+++ b/ChangeLog.07
@@ -0,0 +1,839 @@
+2007-12-16  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-services.el (erc-nickserv-alist): Removed autodetect regexp,
+	added identified regexp for OFTC.
+	(erc-nickserv-identification-autodetect): Make sure success-regex
+	is non-nil.
+	(erc-nickserv-identify-autodetect): Make sure identify-regex is
+	non-nil.  Doc fix.
+
+2007-12-13  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (PRIVMSG, QUIT, TOPIC, WALLOPS, 376, 004, 221)
+	(312, 315, 319, 330, 331, 333, 367, 368, 391, 405, 406, 412)
+	(421, 432, 433, 437, 442, 461, 474, 477, 482, 431): Doc fix.
+
+2007-12-09  Michael Olson  <mwolson@gnu.org>
+
+	* erc-services.el (erc-nickserv-alist): Fix regexps for GRnet.
+
+2007-12-09  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+	* erc-backend.el, erc.el:
+	Parse 275 (secure connection) responses.
+
+	* erc-services.el: Add identification hooks for GRnet, the Greek
+	IRC network <http://www.irc.gr>.
+
+2007-12-08  David Kastrup  <dak@gnu.org>
+
+	* erc-stamp.el (erc-echo-timestamp):
+	* erc-lang.el (language):
+	* erc-backend.el (erc-server-connect): Fix buggy call to `message'.
+
+2007-12-07  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc-services.el: Provide a hook that runs when nickserv confirms
+	that the user has successfully identified.
+	(services, erc-nickserv-identify-mode): Add and remove
+	erc-nickserv-identification-autodetect from
+	erc-server-NOTICE-functions.
+	(erc-nickserv-alist): Add SUCCESS-REGEXP to each entry.
+	(erc-nickserv-alist-identified-regexp)
+	(erc-nickserv-identification-autodetect): New functions.
+	(erc-nickserv-identified-hook): New hook.
+
+2007-12-06  D. Goel  <deego3@gmail.com>
+
+	* erc-match.el (erc-add-entry-to-list): Fix buggy call to `error'.
+
+2007-12-01  Glenn Morris  <rgm@gnu.org>
+
+	* erc-backend.el (erc-server-send-ping): Move after definition of
+	erc-server-send.
+
+2007-11-29  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+	* erc-backend.el, erc.el:
+	Parse 307 (nick has identified) responses.
+
+2007-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc.el (erc-open):
+	* erc-backend.el (define-erc-response-handler):
+	* erc-log.el (log):
+	* erc-match.el (erc-log-matches): Fix typos in docstrings.
+
+2007-11-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el (erc-autoaway-possibly-set-away):
+	* erc-netsplit.el (erc-netsplit-timer):
+	* erc-notify.el (erc-notify-timer):
+	* erc-track.el (erc-user-is-active): Only run if we have
+	successfully established a connection to the server and have
+	logged in.  I suspect that sending messages too soon may make some
+	IRC servers not respond well, particularly when the network
+	connection is iffy or subject to traffic-shaping.
+
+2007-11-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc-compat.el (erc-set-write-file-functions): New compatibility
+	function to set the write hooks appropriately.
+
+	* erc-log.el (erc-log-setup-logging): Use
+	erc-set-write-file-functions.  This fixes a byte-compiler warning.
+
+	* erc-stamp.el: Silence byte-compiler warning about
+	erc-fill-column.
+
+	* erc.el (erc-with-all-buffers-of-server): Bind the result of
+	mapcar to a variable in order to silence a byte-compiler warning.
+
+2007-10-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-ibuffer.el (erc-modified-channels-alist): Use
+	eval-when-compile, and explain why we are doing this.
+
+2007-10-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* erc-ibuffer.el (erc-modified-channels-alist): Pacify
+	byte-compiler.
+
+2007-10-13  Glenn Morris  <rgm@gnu.org>
+
+	* erc-track.el (erc-modified-channels-update): Use mapc rather
+	than mapcar.
+
+2007-10-12  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-join-channel): Prompt for channel key if C-u or
+	another prefix-arg was typed.
+
+	* NEWS: Noted this change.
+
+2007-10-07  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-cmd-ME'S): New command that handles the case where
+	someone types "/me's".  It concatenates the text " 's" to the
+	beginning of the input and then sends the result like a normal
+	"/me" command.
+	(erc-command-regexp): Permit single-quote character.
+
+2007-09-30  Aidan Kehoe  <kehoea@parhasard.net>  (tiny change)
+
+	* erc-log.el (erc-save-buffer-in-logs): Prevent spurious warnings
+	when looking at a log file and concurrently saving to it.
+
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
+
+	* erc.texi (Special-Features): Fix small typo.
+
+2007-09-16  Michael Olson  <mwolson@gnu.org>
+
+	* erc-track.el (erc-track-switch-direction): Mention
+	erc-track-faces-priority-list.  Thanks to Leo for the suggestion.
+
+2007-09-11  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
+
+	* erc-sound.el: Fix typo in setting up instructions.
+
+2007-09-10  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (elpa): Copy dir template rather than echoing a few
+	lines.  The reason for this is that the ELPA package for ERC was
+	getting a corrupt dir entry.
+
+	* dir-template: Template for the ELPA dir file.
+
+2007-09-08  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-log-filter-function): New option that specifies
+	the function to call for filtering text before writing it to a log
+	file.  Thanks to David O'Toole for the suggestion.
+	(erc-save-buffer-in-logs): Use erc-log-filter-function.  Make sure
+	we carry along the value of coding-system-for-write, because this
+	could potentially be shadowed by the temporary buffer.
+
+	* erc.el (erc-version-string): Update to 5.3, development version.
+
+2007-09-07  Glenn Morris  <rgm@gnu.org>
+
+	* erc.el (erc-toggle-debug-irc-protocol): Fix call to
+	erc-view-mode-enter.
+
+2007-08-08  Glenn Morris  <rgm@gnu.org>
+
+	* erc-log.el, erc.el: Replace `iff' in doc-strings and comments.
+
+2007-09-03  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-default-port): Make this an integer value rather
+	than a string.  Thanks to Luca Capello for the report.
+
+2007-08-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-cmd-GQUIT): If erc-kill-queries-on-quit is non-nil,
+	kill all query buffers after 4 seconds.
+
+2007-08-16  Michael Olson  <mwolson@gnu.org>
+
+	* NEWS: Add ERC 5.3 changes section, and mention jbms' erc-track
+	compatibility note.
+
+	* erc-track.el (erc-track-list-changed-hook): Turn this into a
+	customizable option.
+	(erc-track-switch-direction): Add 'importance option.
+	(erc-modified-channels-display): If erc-track-switch-direction is
+	'importance, call erc-track-sort-by-importance.
+	(erc-track-face-priority): New function that returns a number
+	indicating the position of a face in erc-track-faces-priority-list.
+	(erc-track-sort-by-importance): New function that sorts
+	erc-modified-channels-list according to erc-track-face-priority.
+	(erc-track-get-active-buffer): Make 'oldest a rough opposite of
+	'importance.
+
+2007-08-14  Jeremy Maitin-Shepard  <jbms@cmu.edu>
+
+	* erc-track.el (erc-track-remove-disconnected-buffers): New
+	variable which controls whether buffers associated with a server
+	that is disconnected should be removed from
+	`erc-modified-channels-alist'.  Existing behavior is to
+	unconditionally remove such buffers, which is achieved by setting
+	`erc-track-removed-disconnected-buffers' to t.  When set to t,
+	which is the new default value, such buffers remain in the list,
+	which I think is often the desired behavior, since the user may
+	likely wish to find out about activity that occurred in a channel
+	prior to it being disconnected.
+	(erc-track-list-changed-hook): New hook that is run whenever the
+	contents of `erc-modified-channels-alist' changes; it is useful
+	for users such as myself that don't use the default mode-line
+	notification but instead use a separate mechanism (which is tied
+	to my window manager) to provide notification of channel activity.
+	(erc-track-get-buffer-window): New function that acts as a wrapper
+	around `get-buffer-window' that handles the `selected-visible'
+	option of `erc-track-visibility'; previously, the value of
+	`erc-track-visibility' was passed directly to `get-buffer-window',
+	which does not support `selected-visible'; consequently,
+	`selected-visible' was not properly supported.
+	(erc-track-modified-channels): Fix a bug in the logic for removing
+	buffers from the list in certain cases.
+	(erc-track-position-in-mode-line): Add a supported value that
+	specifies that the tracking information should not be added to the
+	mode line at all.  The value of nil is used to indicate that the
+	information should not be added at all to the mode line.
+	(erc-track-add-to-mode-line): Check for position eq to t, rather
+	than non-nil.
+	(erc-buffer-visible): Use erc-track-get-buffer-window.
+	(erc-modified-channels-update): Take
+	erc-track-remove-disconnected-buffers into account.
+	(erc-modified-channels-display): Run `erc-track-list-changed-hook'.
+
+	* erc.el (erc-reuse-frames): New option that determines whether
+	new frames are always created.  Defaults to t.  This only has an
+	effect when erc-join-buffer is set to 'frame.
+	(erc-setup-buffer): Use it.
+
+2007-08-14  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-reconnect): If the server buffer has
+	been killed, use the current buffer instead.  If the current
+	buffer is not an ERC buffer, give an error.  This fixes a bug when
+	/reconnect is run from a channel buffer whose server buffer has
+	been deleted.  Thanks to jbms for the report.
+	(erc-process-sentinel-1): Take server buffer as an argument, so
+	that we can make sure that it is current.
+	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
+	(erc-process-sentinel-2): New function split from
+	erc-process-sentinel-1.  If server buffer is deleted during a
+	reconnect attempt, stop trying to reconnect.  Fix bug where
+	reconnect was not happening when erc-server-reconnect-attempts was
+	t.  Call erc-server-reconnect-p only once each time.  If we are
+	instructed to try connecting indefinitely, tell the user that they
+	can stop this by killing the server buffer.  Call the process
+	sentinel by means of run-at-time, so that there is time to kill
+	the buffer if need be; this also removes the need for a while
+	loop.  Refuse to reconnect again if erc-server-reconnect-timeout
+	is not an number.
+
+	* erc.el (erc-command-no-process-p): Fix bug: the return value of
+	erc-extract-command-from-line is a list rather than a single
+	symbol.  Thanks to jbms for the report.
+	(erc-cmd-RECONNECT): Use simpler logic, and use buffer-live-p
+	rather than bufferp.
+	(erc-send-current-line, erc-display-command, erc-display-msg):
+	Handle case where erc-server-process is nil, so that /reconnect
+	works.
+
+2007-08-12  Michael Olson  <mwolson@gnu.org>
+
+	* erc-identd.el (erc-identd-filter): Instead of sending an EOF
+	character, which now confuses freenode, stop the server process,
+	so that no new connections are accepted, and kill the current
+	client process.
+
+2007-07-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-list.el: Relicense to GPLv3.  Since the file was already
+	licensed under version 2 or later, it turns out that we do not
+	need the permission of all of the authors in order to proceed.
+
+2007-07-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc-goodies.el (erc-get-bg-color-face, erc-get-fg-color-face):
+	Use erc-error rather than message and beep.
+
+	* erc-sound.el: Indentation fix.
+
+	* erc.el (erc-command-no-process-p): New function that determines
+	if its argument is an ERC command that can be run when the server
+	process is not alive.
+	(erc-cmd-SET, erc-cmd-CLEAR, erc-cmd-COUNTRY, erc-cmd-HELP)
+	(erc-cmd-LASTLOG, erc-cmd-QUIT, erc-cmd-GQUIT)
+	(erc-cmd-RECONNECT, erc-cmd-SERVER): Denote that these commands
+	can be run even when the server process is not alive.
+	(erc-send-current-line): Call erc-command-no-process-p if the
+	server process is not alive, to determine if we have a command
+	that can be run anyway.  Thanks to Tom Tromey for the bug report.
+	(erc-error): New function that either displays a message or throws
+	an error, depending on whether debug-on-error is non-nil.
+	(erc-cmd-SERVER, erc-send-current-line): Use it.
+
+2007-07-10  Michael Olson  <mwolson@gnu.org>
+
+	* Relicense all FSF-assigned code to GPLv3.
+
+2007-06-25  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi (Options): Fix typo.
+	(Getting Help and Reporting Bugs): Update webpage URL.  Make Gmane
+	part more readable.
+
+2007-06-20  Michael Olson  <mwolson@gnu.org>
+
+	* erc-stamp.el (erc-timestamp-format-left): New option that
+	specifies the left timestamp to use for
+	erc-insert-timestamp-left-and-right.
+	(erc-timestamp-format-right): New option that specifies the right
+	timestamp to use for erc-insert-timestamp-left-and-right.
+	(erc-insert-timestamp-function): Change default to
+	erc-insert-timestamp-left-and-right.
+	(erc-insert-away-timestamp-function): Ditto.
+	(erc-timestamp-last-inserted-left)
+	(erc-timestamp-last-inserted-right): New variables to keep track
+	of data for erc-insert-timestamp-left-and-right.
+	(erc-insert-timestamp-left-and-right): New function that places
+	timestamps on both the left and right sides of the screen, but
+	only if each timestamp has changed since it was last computed.
+	Thanks to offby1 for urging me to merge this.
+
+	* erc.el (erc-open-ssl-stream): Display informative error when
+	ssl.el not found.
+	(erc-tls): New function to connect using tls.el.
+	(erc-open-tls-stream): New function to initiate tls connection.
+	Display informative error when tls.el not found.
+
+2007-06-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el: Update header with accurate instructions.
+
+2007-06-17  Michael Olson  <mwolson@gnu.org>
+
+	* erc-pkg.el: Update description to match what is currently in ELPA.
+
+2007-06-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc-goodies.el (erc-scroll-to-bottom): Remove redundant check.
+
+2007-06-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc-compat.el (erc-with-selected-window): New compatibility
+	macro that implements `with-selected-window'.
+
+	* erc-goodies.el (erc-scroll-to-bottom): Use it.  This fixes a bug
+	with buffer ordering where ERC buffers would move to the top.
+	Thanks to Ivan Kanis for the patch.
+
+2007-06-10  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-logging-enabled): Fix a bug that occurred when
+	`erc-log-channels-directory' had the name of a function.
+
+2007-06-06  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc.el (erc-show-channel-key-p, erc-startup-file-list):
+	Fix typo in docstring.
+
+2007-06-03  Michael Olson  <mwolson@gnu.org>
+
+	* erc-compat.el (erc-view-mode-enter): Make this its own function,
+	in order to document what we do, and provide sane fallback
+	behavior.
+
+	* erc.el (erc-toggle-debug-irc-protocol): Don't pass any arguments
+	to erc-view-mode-enter, since we don't do anything special with
+	the exit function.  This fixes a bug with Emacs 21 and Emacs 22.
+	Thanks to Leo for noticing.
+
+2007-05-30  Michael Olson  <mwolson@gnu.org>
+
+	* erc-compat.el (erc-user-emacs-directory): New variable that
+	determines where to find user-specific Emacs settings.  For Emacs,
+	this is usually ~/.emacs.d, and for XEmacs this is usually
+	~/.xemacs.
+
+	* erc.el (erc-startup-file-list): Use erc-user-emacs-directory.
+
+2007-05-28  Michael Olson  <mwolson@gnu.org>
+
+	* erc-button.el (erc-button-url-regexp): Recognize parentheses as
+	part of URLs.  Thanks to Lawrence Mitchell for the fix.
+
+2007-05-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi (Modules): Fix references to completion modules.
+
+2007-05-21  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (SOURCE): Remove erc-pkg.el.
+	(debclean): New rule to clean old Debian packages of ERC.
+	(debprepare): Don't modify the released tarball, but copy it as
+	the .orig.tar.gz file.
+	(debrelease, debrevision): Remove.
+	(debinstall): New target that copies the generated Debian file to
+	a distro-specific location.
+	(deb): New rule that chains together the stages in building a
+	Debian package.
+	(EXTRAS): Add erc-nicklist.el, since it is not release-quality.
+	(extras): Copy images directory.
+
+	* erc-nicklist.el (erc-nicklist-icons-directory): Use
+	locate-library to find the "images" directory.  This should be
+	more failsafe.  Thanks to Tom Tromey for the idea.
+
+2007-05-19  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (ELPA): New variable that contains the location of my
+	local ELPA repository.
+	(elpa): New rule that makes an ELPA package for ERC.
+
+2007-04-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-parse-prefix): New function that retrieves the
+	PREFIX server parameter from the current server and returns an
+	alist of prefix type to prefix character.
+	(erc-channel-receive-names): Use `erc-parse-prefix' to determine
+	whether the first character of a nick is a prefix character or
+	not.  This should fix a bug reported by bromine about needing to
+	type "%" first to complete nicks of people who are "hops" on
+	Slashnet.  This should also support for very exotic IRC server
+	setups, if any exist.
+	(erc-update-current-channel-member): Indentation.
+
+2007-04-15  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-generate-log-file-name-function): Docfix.
+	Mention how to deal with the case for putting log files in
+	different directories.  Change a customization type from `symbol'
+	to `function'.
+	(erc-log-channels-directory): Allow this to contain a function
+	name, which is called with the same args as in
+	`erc-generate-log-file-name-function'.  Thanks to andrewy for the
+	report and use case.
+	(erc-current-logfile): Detect if `erc-log-channels-directory' is a
+	function and call it with arguments if so.
+
+2007-04-12  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (define-erc-response-handler): Mention that hook
+	processing stops when the function returns non-nil.  This should
+	help avoid a nasty "gotcha" when making custom functions.  Thanks
+	to John Sullivan for the report.
+
+2007-04-08  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-nicklist.el (erc-nicklist-voiced-position): Fixed
+	customization mismatch.
+
+2007-04-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-version-string): Release ERC 5.2.
+
+	* erc-auto.in, erc-chess.el, erc-list.el, erc-speak.el:
+	* erc-viper.el: Update copyright notices.
+
+	* erc.texi: Make Emacs Lisp source code in this document
+	essentially public domain.  Update version to 5.2.
+	(Obtaining ERC): Mention extras tarball.
+	(Releases): Mention local GNU mirror.
+	(Sample Configuration): Remove notice.
+
+	* FOR-RELEASE (5.3): Add item for erc-nicklist.
+	Mark NEWS as done.  Mark extras tarball as done.
+
+	* Makefile (VERSION): Increment to 5.2.
+	(TESTING): Remove.
+	(EXTRAS): New variable containing the contents of our "Emacs 22
+	extras" tarball.
+	(SOURCE): Remove $(TESTING).
+	(MISC): Add COPYING and ChangeLog.06.  Fix ChangeLog.NNNN ->
+	ChangeLog.NN.
+	(release): Use $(SNAPDIR) instead of erc-$(VERSION).
+	(extras): New rule which implements the building of the extras
+	tarball.
+	(upload-extras): New rule to upload the extras tarball.  It's
+	yucky to replicate upload, but oh well.
+	(DISTRIBUTOR): New variable used to differentiate between building
+	packages for Ubuntu and Debian.
+	(debrelease, debrevision): Use it.
+	(debbuild): Run linda in addition to lintian.
+
+	* NEWS: Mention extras tarball.  Note which files have been
+	renamed.  Note that erc-list is enabled by default, except in
+	Emacs 22.
+
+	* README.extras: New file which serves as a README for the extras
+	tarball.
+
+2007-03-31  Michael Olson  <mwolson@gnu.org>
+
+	* NEWS: Update for the 5.2 release.
+
+	* FOR-RELEASE: Finish up 5.2 manual item.  Add documentation item
+	for 5.3.
+
+	* erc.texi (Sample Session): Flesh out.  Mention #erc.
+	(Modules): Defer to 5.3 release.
+	(Advanced Usage): Move Sample Configuration chapter ahead of
+	unfinished chapters.
+	(Sample Configuration): Write.
+	(Options): Mention how to see available ERC options.  Defer to 5.3
+	release.
+	(Tips and Tricks): Remove, since it seems better to just include
+	tips and tricks in the sample configuration, commented out.
+
+	* erc-bbdb.el (erc-bbdb-search-name-and-create): Make prompt more
+	informative about how to skip merging.
+	(erc-bbdb-insinuate-and-show-entry-1): Move contents of
+	erc-bbdb-insinuate-and-show-entry here.
+	(erc-bbdb-insinuate-and-show-entry): Run
+	erc-bbdb-insinuate-and-show-entry-1 "outside" of the calling
+	function, so that we can avoid triggering a process-filter error
+	if the user hits C-g.
+
+2007-03-30  Michael Olson  <mwolson@gnu.org>
+
+	* FOR-RELEASE: Solve C-c C-SPC keybinding dilemma.
+
+	* erc-autoaway.el (erc-autoaway-idle-method): Use `if' rather than
+	`cond' and `set' rather than `set-default'.
+
+	* erc-log.el: Avoid compiler warning by requiring erc-network
+	during compilation.
+	(erc-generate-log-file-name-function): Add tag to each option.
+	Add erc-generate-log-file-name-network.
+	(erc-generate-log-file-name-network): New function which generates
+	a log file name that uses network name rather than server name,
+	when possible.
+
+	* erc-track.el (track): Assimilate track-when-inactive module,
+	since there's no need to have two modules in one file -- an option
+	will do.  Remove track-modified-channels alias.  Call
+	erc-track-minor-mode-maybe, and tear down the minor mode when
+	disabling.
+	(erc-track-when-inactive): New option which determines whether to
+	track visible buffers when inactive.  The default is not to do so.
+	(erc-track-visibility): Mention erc-track-when-inactive.
+	(erc-buffer-visible): Use erc-track-when-inactive.
+	(erc-track-enable-keybindings): New option which determines
+	whether to enable the global-level tracking keybindings.  The
+	default is to do so, unless they would override another binding,
+	in which case we prompt the user about it.
+	(erc-track-minor-mode-map): Move global keybindings here.
+	(erc-track-minor-mode): New minor mode which only enables the
+	keybindings and does nothing else.
+	(erc-track-minor-mode-maybe): New function which starts
+	erc-track-minor-mode, but only if it hasn't already been started,
+	an ERC buffer exists, and the user OK's it, depending on the value
+	of `erc-track-enable-keybindings'.
+	(erc-track-switch-buffer): Display a message if someone calls this
+	without first enabling erc-track-mode.
+
+2007-03-17  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi (Development): Mention ErcDevelopment page on
+	emacswiki.
+	(Getting Started): Mention ~/.emacs.d/.ercrc.el and the Customize
+	interface.
+	(Sample Session): New section that has a very rough draft for a
+	sample ERC session.
+	(Special Features): New section that explains some of the special
+	features of ERC.  Taken from ErcFeatures on emacswiki, with
+	enhancements.
+
+2007-03-12  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-autoaway.el (erc-autoaway-idle-method): When setting the new
+	value, disable and re-enable `erc-autoaway-mode' only if it was
+	already enabled.  This fixes a bug where autoaway was enabled just
+	by loading the file.
+
+2007-03-10  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el: Added more information to the Usage section.
+	(erc-capab-identify-prefix): Doc fix.
+	(erc-capab-identify-unidentified): New face.
+	(290): Removed.  Definition moved to erc-backend.el.
+	(erc-capab-identify-send-messages): Renamed from
+	`erc-capab-send-identify-messages'.
+	(erc-capab-identify-setup): Use it.
+	(erc-capab-identify-get-unidentified-nickname): Renamed from
+	`erc-capab-get-unidentified-nickname'.
+	(erc-capab-identify-add-prefix): Use it.  Use
+	`erc-capab-identify-unidentified' as the face.
+
+	* erc-backend.el (290): Moved here from erc-capab.el.
+
+	* erc.el (erc-select): Added an autoload cookie.
+	(erc-message-type-member, erc-restore-text-properties): Use
+	`erc-get-parsed-vector'.
+	(erc-auto-query): Set the default to 'bury since many new users
+	expect private messages from others to be in dedicated query
+	buffers, not the server buffer.
+	(erc-common-server-suffixes): Use "freenode" for freenode.net, not
+	"OPN".  Added oftc.net.
+
+	* NEWS: Added note about erc-auto-query's new default setting.
+
+2007-03-03  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-open, erc): Docfixes.
+
+2007-03-02  Michael Olson  <mwolson@gnu.org>
+
+	* FOR-RELEASE: Make section for 5.3 release and move erc-backend
+	cleanup there.  Awaiting discussion before doing other things.
+	Add tasks for merging filename changes from the 5.2 release
+	branch, and for making a tarball of modules not in Emacs 22.  Add
+	item to remind me to update NEWS.  Mark backtab entry as done.
+
+	* erc-button.el (button): Add call to `erc-button-add-keys'.
+	(erc-button-keys-added): New variable tracking whether we've added
+	the keys yet.
+	(erc-button-add-keys): New function that adds the <backtab> key to
+	erc-mode-map.
+
+	* erc.texi: Change version to 5.2 (pre-release).
+
+2007-02-15  Michael Olson  <mwolson@gnu.org>
+
+	* CREDITS: Update.
+
+	* erc-backend.el (erc-server-send-ping-interval): Change to use a
+	default of 30 seconds.  Improve customize interface.
+	(erc-server-send-ping-timeout): New option that determines when to
+	consider a connection stalled and restart it.  The default is
+	after 120 seconds.
+	(erc-server-send-ping): Use erc-server-send-ping-timeout instead
+	of erc-server-send-ping-interval.  If
+	erc-server-send-ping-timeout is nil, do not ever kill and restart
+	a hung IRC process.
+
+	* erc.el (erc-modules): Include the name of the module in its
+	description.  This should make it easier for people to find and
+	enable a particular module.
+
+2007-02-15  Vivek Dasmohapatra  <vivek@etla.org>
+
+	* erc.el (erc-cmd-RECONNECT): Kill old process if it is still
+	alive.
+	(erc-message-english-PART): Properly escape "%" characters in
+	reason.
+
+	* erc-backend.el (erc-server-reconnecting): New variable that is
+	set when the user requests a reconnect, but the old process is
+	still alive.  This forces the reconnect to work even though the
+	process is killed manually during reconnect.
+	(erc-server-connect): Initialize it.
+	(erc-server-reconnect-p): Use it.
+	(erc-process-sentinel-1): Set it to nil after the first reconnect
+	attempt.
+
+2007-02-07  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-menu.el (erc-menu-definition): Fixed so that the separator
+	is between "Current channel" and "Pals, fools and other keywords",
+	not at the bottom of the "Current channel" submenu.
+
+2007-01-25  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-networks.el (erc-server-alist): Removed SSL server for now
+	since `erc-server-select' doesn't know to use `erc-ssl'.
+
+	* erc-networks.el (erc-server-alist, erc-networks-alist): Added
+	definitions for oftc.net.
+
+	* erc-services.el (erc-nickserv-alist): Fixed OFTC message regexp.
+
+2007-01-22  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-error-occurred): New variable that
+	indicates when an error has been signaled by the server.  This
+	should fix an infinite reconnect bug when giving some servers a
+	bogus :full-name.  Thanks to Angelina Carlton for the report.
+	(erc-server-connect): Initialize erc-server-error-occurred.
+	(erc-server-reconnect-p): Use it.
+	(ERROR): Set it.
+
+	* erc-services.el (erc-nickserv-alist): Alphabetize and add Ars
+	and QuakeNet.  Standardize look of entries.  Fix type mismatch
+	error in customize interface.
+	(erc-nickserv-passwords): Alphabetize and add missing entries from
+	erc-nickserv-alist.
+
+2007-01-21  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-header-line-format): Document how to disable the
+	header line, and add a customization type for it.  Also, make the
+	changes take effect immediately.
+
+2007-01-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi (Modules): Document new menu module.  Thanks to Leo
+	for noticing.
+
+2007-01-16  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-stamp.el (erc-insert-timestamp-left): Fixed so that the
+	whitespace string filler is hidden correctly when timestamps are
+	hidden.
+	(erc-toggle-timestamps): New function to use instead of
+	`erc-show-timestamps' and `erc-hide-timestamps'.
+
+	* erc.el (erc-restore-text-properties): Moved here from
+	erc-fill.el since it could be useful in general.
+
+	* erc-fill.el (erc-restore-text-properties): Removed.
+
+2007-01-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-command-regexp): New variable that is used to match
+	a command.
+	(erc-send-input): Use it.  This fixes a bug where paths --
+	"/usr/bin/foo", for example -- were being displayed as commands,
+	but still sent correctly.
+	(erc-extract-command-from-line): Use it.
+
+	* erc.texi (Modules): Document erc-capab-identify.
+
+2007-01-11  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-find-parsed-property): Moved here from erc-track.el
+	since it can be useful in general.
+
+	* erc-track.el (erc-find-parsed-property): Removed.
+
+	* erc-capab.el (erc-capab-find-parsed): Removed.
+	(erc-capab-identify-add-prefix): Use `erc-find-parsed-property'.
+
+	* erc.el (erc-open): Run `erc-before-connect' hook here.  This
+	makes sure the hook always gets called before a connection is
+	made, as some functions, like `erc-handle-irc-url', use `erc-open'
+	instead of `erc'.
+	(erc): Removed `erc-before-connect' hook.
+
+	* erc-menu.el (erc-menu-definition): Put items specific to
+	channels in a "Current channel" submenu.
+
+	* erc-backend.el (321, 323): Display channel list in server buffer
+	when not using the channel list module.
+
+	* erc.el: Updated copyright years.
+	(erc-version-string): Set to 5.2 (devel).
+	(erc-format-lag-time): Fixed to work when `erc-server-lag' is nil.
+	(erc-update-mode-line-buffer): Set the header face.
+
+2007-01-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-bbdb.el (erc-bbdb-popup-type): Fix customization type and
+	documentation.
+
+	* erc-services.el (erc-nickserv-identify-mode): Improve
+	documentation for nick-change option and move higher to fix
+	compiler warning.  Avoid a recursive load error.
+	(erc-nickserv-alist): Add simple entry for BitlBee, to avoid
+	"NickServ is AWAY: User is offline" error.  Oddly enough, bitlbee
+	was smart enough to recognize that as an authentication request
+	and log in regardless, which is why I didn't notice this earlier.
+	(erc-nickserv-alist-sender, erc-nickserv-alist-regexp)
+	(erc-nickserv-alist-nickserv, erc-nickserv-alist-ident-keyword)
+	(erc-nickserv-alist-use-nick-p)
+	(erc-nickserv-alist-ident-command): New accessors for
+	erc-nickserv-alist.  Using nth is unwieldy.
+	(erc-nickserv-identify-autodetect)
+	(erc-nickserv-identify-on-connect)
+	(erc-nickserv-identify-on-nick-change, erc-nickserv-identify): Use
+	the new accessors.
+
+2007-01-11  Diane Murray  <disumu@x3y2z1.net>
+
+	* NEWS: Added note for `erc-my-nick-face'.  Fixed capab-identify
+	wording.
+
+2007-01-10  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-mode-line-format): Added %l to documentation.
+	(erc-header-line-format): Removed "[IRC]".  Use the new %l
+	replacement character.  Doc fix.
+	(erc-format-channel-modes): Removed lag code.  Removed parentheses
+	from mode string.
+	(erc-format-lag-time): New function.
+	(erc-update-mode-line-buffer): Use it.
+
+2007-01-10  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el: Fix typo in url-irc-function instructions.
+
+2007-01-09  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-system-name): New option that determines the system
+	name to use when logging in.  The default is to figure this out by
+	calling `system-name'.
+	(erc-login): Use it.
+
+2007-01-07  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-modules): Add the menu module.  This should fix a
+	bug with incorrect ERC submenus being displayed.
+
+	* erc-menu.el: Turn this into a module.
+	(erc-menu-add, erc-menu-remove): New functions that add and remove
+	the ERC menu.
+
+
+See ChangeLog.06 for earlier changes.
+
+    Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 3, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+;; Local Variables:
+;; coding: utf-8
+;; add-log-time-zone-rule: t
+;; End:
+
+;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496



From MAILER-DAEMON Mon Jan 14 22:40:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JEceq-0006cd-6n
	for mharc-erc-commit@gnu.org; Mon, 14 Jan 2008 22:40:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JEceo-0006cY-VD
	for erc-commit@gnu.org; Mon, 14 Jan 2008 22:40:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JEcen-0006cM-I3
	for erc-commit@gnu.org; Mon, 14 Jan 2008 22:40:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JEcen-0006cJ-95
	for erc-commit@gnu.org; Mon, 14 Jan 2008 22:40:09 -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 1JEcen-0006Tl-2k
	for erc-commit@gnu.org; Mon, 14 Jan 2008 22:40:09 -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 1JEcem-0007Dh-8E
	for erc-commit@gnu.org; Mon, 14 Jan 2008 22:40:08 -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 1JEcek-00085W-LI
	for erc-commit@gnu.org; Mon, 14 Jan 2008 22:40:07 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Mon, 14 Jan 2008 22:40:06 -0500
Date: Mon, 14 Jan 2008 22:40:06 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JEcek-00085W-LI@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-coding-system-for-target: Pass
	the `target' argument along.
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, 15 Jan 2008 03:40:11 -0000

commit 10b6e1b5009893986b310c2d55b91ec7de010f54
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Jan 14 22:33:06 2008 -0500

    erc-coding-system-for-target: Pass the `target' argument along.

diff --git a/ChangeLog b/ChangeLog
index eb455d9..ad6245d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-15  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-coding-system): Docfix.
+	(erc-coding-system-for-target): Pass the `target' argument along
+	as the first and only argument.  It's not good to just depend on a
+	dynamic binding.
+
 2008-01-10  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (321, 322): Split message-displaying parts into
diff --git a/erc-backend.el b/erc-backend.el
index e5181fe..e2fb1d7 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -332,11 +332,10 @@ This is either a coding system, a cons, a function, or nil.
 
 If a cons, the encoding system for outgoing text is in the car
 and the decoding system for incoming text is in the cdr. The most
-interesting use for this is to put `undecided' in the cdr. If a
-function, it is called with no arguments and should return a
-coding system or a cons as described above. Note that you can use
-the dynamically bound variable `target' to get the current
-target. See `erc-coding-system-for-target'.
+interesting use for this is to put `undecided' in the cdr.
+
+If a function, it is called with the argument `target' and should
+return a coding system or a cons as described above.
 
 If you need to send non-ASCII text to people not using a client that
 does decoding on its own, you must tell ERC what encoding to use.
@@ -686,7 +685,7 @@ This is determined via `erc-encoding-coding-alist' or
               (when (string-match (car pat) target)
                 (throw 'match (cdr pat)))))))
       (and (functionp erc-server-coding-system)
-           (funcall erc-server-coding-system))
+           (funcall erc-server-coding-system target))
       erc-server-coding-system))
 
 (defun erc-decode-string-from-target (str target)



From MAILER-DAEMON Wed Jan 16 21:10:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFKCr-0003YA-Nl
	for mharc-erc-commit@gnu.org; Wed, 16 Jan 2008 21:10:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFKCq-0003WS-Ja
	for erc-commit@gnu.org; Wed, 16 Jan 2008 21:10:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFKCo-0003Tf-GT
	for erc-commit@gnu.org; Wed, 16 Jan 2008 21:10:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFKCn-0003TM-TM
	for erc-commit@gnu.org; Wed, 16 Jan 2008 21:10:09 -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 1JFKCn-0002TN-ID
	for erc-commit@gnu.org; Wed, 16 Jan 2008 21:10:09 -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 1JFKCm-0002W4-PT
	for erc-commit@gnu.org; Wed, 16 Jan 2008 21:10:08 -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 1JFKCl-00030f-F5
	for erc-commit@gnu.org; Wed, 16 Jan 2008 21:10:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 16 Jan 2008 21:10:07 -0500
Date: Wed, 16 Jan 2008 21:10:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFKCl-00030f-F5@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add support for Rizon network.
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: Thu, 17 Jan 2008 02:10:12 -0000

commit 66138951229d5738f5dbd86f26c79ac920ff813f
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 16 21:00:58 2008 -0500

    Add support for Rizon network.

diff --git a/ChangeLog b/ChangeLog
index ad6245d..b608ab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-17  Michael Olson  <mwolson@gnu.org>
+
+	* erc-services.el (erc-nickserv-passwords): Add Rizon to options.
+	(erc-nickserv-alist): Add support for Rizon.
+
+	* erc-networks.el (erc-server-alist): Add Rizon network.
+
 2008-01-15  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-server-coding-system): Docfix.
diff --git a/erc-networks.el b/erc-networks.el
index 48efd41..4e7090e 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -351,6 +351,7 @@
   ("Relicnet: Random server" Relicnet "irc.relic.net" 6667)
   ("Rezosup: Random server" Rezosup "irc.rezosup.org" 6667)
   ("Risanet: Random server" Risanet "irc.risanet.com" ((6667 6669)))
+  ("Rizon: Random server" Rizon "irc.rizon.net" (6633 (6660 6669) 6697 7000 8080 9999))
   ("Rubiks: Random server" Rubiks "irc.rubiks.net" 6667)
   ("Rusnet: EU, RU, Tomsk" Rusnet "irc.tsk.ru" ((6667 6669) (7770 7775) ))
   ("Rusnet: EU, RU, Vladivostok" Rusnet "irc.vladivostok.ru" ((6667 6669) (7770 7775) ))
diff --git a/erc-services.el b/erc-services.el
index 028d358..045b629 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -187,6 +187,7 @@ Example of use:
 			(const iip)
 			(const OFTC)
 			(const QuakeNet)
+			(const Rizon)
 			(const SlashNET)
 			(symbol :tag "Network name"))
 		(repeat :tag "Nickname and password"
@@ -256,6 +257,12 @@ Example of use:
      "NickServ"
      "IDENTIFY" nil nil
      "You\\s-are\\s-successfully\\s-identified\\s-as\\s-")
+    (Rizon
+     "NickServ!service@rizon.net"
+     "This\\s-nickname\\s-is\\s-registered\\s-and\\s-protected."
+     "NickServ"
+     "IDENTIFY" nil nil
+     "Password\\s-accepted\\s--\\s-you\\s-are\\s-now\\s-recognized.")
     (QuakeNet
      nil nil
      "Q@CServe.quakenet.org"



From MAILER-DAEMON Wed Jan 16 22:30:10 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFLSE-0006RD-3Z
	for mharc-erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFLSC-0006R0-D3
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFLSB-0006Qo-Ty
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFLSB-0006Ql-Ot
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:07 -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 1JFLSB-0007GV-JJ
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:07 -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 1JFLSA-0005VB-Hx
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:06 -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 1JFLS9-0005qu-4T
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 16 Jan 2008 22:30:05 -0500
Date: Wed, 16 Jan 2008 22:30:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFLS9-0005qu-4T@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-xdcc.el: Add local variables for
	proper indentation setup.
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: Thu, 17 Jan 2008 03:30:09 -0000

commit 924c923a29d295dcf888c98e7097a11e854189b9
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 16 21:05:19 2008 -0500

    erc-xdcc.el: Add local variables for proper indentation setup.

diff --git a/ChangeLog b/ChangeLog
index b608ab3..485f993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 
 	* erc-networks.el (erc-server-alist): Add Rizon network.
 
+	* erc-xdcc.el: Add local variables for proper indentation setup.
+
 2008-01-15  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-server-coding-system): Docfix.
diff --git a/erc-xdcc.el b/erc-xdcc.el
index ed1d0c9..a3b6aac 100644
--- a/erc-xdcc.el
+++ b/erc-xdcc.el
@@ -126,5 +126,11 @@ being evaluated and should return stings."
 
 (provide 'erc-xdcc)
 
-;; arch-tag: a13b62fe-2399-4562-af4e-f18a8dd4b9c8
 ;;; erc-xdcc.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: a13b62fe-2399-4562-af4e-f18a8dd4b9c8



From MAILER-DAEMON Wed Jan 16 22:30:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFLSG-0006Rs-AA
	for mharc-erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFLSF-0006Rc-40
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFLSD-0006R8-Rp
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFLSD-0006R5-O3
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:09 -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 1JFLSD-0007Gv-F2
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:09 -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 1JFLSC-0005VO-RE
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:08 -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 1JFLSB-0005rU-ED
	for erc-commit@gnu.org; Wed, 16 Jan 2008 22:30:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 16 Jan 2008 22:30:07 -0500
Date: Wed, 16 Jan 2008 22:30:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFLSB-0005rU-ED@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Don't let buttons in
	notices trump normal text.
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: Thu, 17 Jan 2008 03:30:11 -0000

commit e6638bbf2e2e0314c2b0c1d73bd50be5da5b1f40
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 16 22:26:34 2008 -0500

    erc-track: Don't let buttons in notices trump normal text.

diff --git a/ChangeLog b/ChangeLog
index 485f993..b2e6598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
 2008-01-17  Michael Olson  <mwolson@gnu.org>
 
+	* erc-networks.el (erc-server-alist): Add Rizon network.
+
 	* erc-services.el (erc-nickserv-passwords): Add Rizon to options.
 	(erc-nickserv-alist): Add support for Rizon.
 
-	* erc-networks.el (erc-server-alist): Add Rizon network.
+	* erc-track.el (erc-track-find-face): Don't let buttons in notices
+	trump default text.  Use catch/throw.  Default to first element of
+	FACES is nothing is found.
 
 	* erc-xdcc.el: Add local variables for proper indentation setup.
 
diff --git a/erc-track.el b/erc-track.el
index 76a6922..4512be2 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -821,15 +821,26 @@ Use `erc-make-mode-line-buffer-name' to create buttons."
 (defun erc-track-find-face (faces)
   "Return the face to use in the modeline from the faces in FACES.
 If `erc-track-faces-priority-list' is set, the one from FACES who is
-first in that list will be used."
+first in that list will be used.
+
+If `erc-track-faces-priority-list' is not set, the first element
+in FACES will be used.
+
+One exception is made for the `erc-button' face.  It is only
+allowed to take priority over other faces if it is paired with
+`erc-default-face' in the cdr of FACES."
   (let ((candidates erc-track-faces-priority-list)
-	candidate face)
-    (while (and candidates (not face))
-      (setq candidate (car candidates)
-	    candidates (cdr candidates))
-      (when (memq candidate faces)
-	(setq face candidate)))
-    face))
+	candidate)
+    ;; Remove erc-button unless it is paired with erc-default-face
+    (when (and (memq 'erc-button (cdr faces))
+	       (not (memq 'erc-default-face (cdr faces))))
+      (setq faces (cons (car faces) (remq 'erc-button (cdr faces)))))
+    ;; Take the highest priority face remaining
+    (or (catch 'face
+	  (dolist (candidate erc-track-faces-priority-list)
+	    (when (memq candidate faces)
+	      (throw 'face candidate))))
+	(car faces))))
 
 (defun erc-track-modified-channels ()
   "Hook function for `erc-insert-post-hook' to check if the current



From MAILER-DAEMON Wed Jan 16 23:40:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFMY0-0002nV-TY
	for mharc-erc-commit@gnu.org; Wed, 16 Jan 2008 23:40:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFMXz-0002nO-Hv
	for erc-commit@gnu.org; Wed, 16 Jan 2008 23:40:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFMXy-0002nC-7M
	for erc-commit@gnu.org; Wed, 16 Jan 2008 23:40:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFMXx-0002n9-UI
	for erc-commit@gnu.org; Wed, 16 Jan 2008 23:40:09 -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 1JFMXx-0003Bc-Hj
	for erc-commit@gnu.org; Wed, 16 Jan 2008 23:40:09 -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 1JFMXw-000858-Oz
	for erc-commit@gnu.org; Wed, 16 Jan 2008 23:40:08 -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 1JFMXv-0008Ge-DM
	for erc-commit@gnu.org; Wed, 16 Jan 2008 23:40:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 16 Jan 2008 23:40:07 -0500
Date: Wed, 16 Jan 2008 23:40:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFMXv-0008Ge-DM@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] New option erc-query-display affects
	how /QUERY buffers are displayed.
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: Thu, 17 Jan 2008 04:40:11 -0000

commit 56d2cae1879e01c82a4356340c7948c597ad76e2
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 16 23:29:54 2008 -0500

    New option erc-query-display affects how /QUERY buffers are displayed.

diff --git a/ChangeLog b/ChangeLog
index b2e6598..6f9d7ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2008-01-17  Michael Olson  <mwolson@gnu.org>
 
+	* erc.el (erc-join-buffer): Improve documentation.
+	(erc-query-display): New option indicating how to display a query
+	buffer that is made by using the /QUERY command.  The default is
+	to make a new buffer and bring it to the front.
+	(erc-cmd-QUERY): Use it.
+	(erc-auto-query): Default this to 'buffer instead, because I've
+	already seen bug reports about new users thinking that ERC didn't
+	display their test messages.
+	(erc-auto-query): Add explanatory :tag for nil choice.
+
 	* erc-networks.el (erc-server-alist): Add Rizon network.
 
 	* erc-services.el (erc-nickserv-passwords): Add Rizon to options.
diff --git a/erc.el b/erc.el
index 92299fb..56c3e8e 100644
--- a/erc.el
+++ b/erc.el
@@ -1468,12 +1468,15 @@ Turning on `erc-mode' runs the hook `erc-mode-hook'."
   "IRC port to use if it cannot be detected otherwise.")
 
 (defcustom erc-join-buffer 'buffer
-  "Determines how to display the newly created IRC buffer.
-'window - in another window,
-'window-noselect - in another window, but don't select that one,
-'frame - in another frame,
-'bury - bury it in a new buffer,
-any other value - in place of the current buffer."
+  "Determines how to display a newly created IRC buffer.
+
+The available choices are:
+
+  'window          - in another window,
+  'window-noselect - in another window, but don't select that one,
+  'frame           - in another frame,
+  'bury            - bury it in a new buffer,
+  any other value  - in place of the current buffer."
   :group 'erc-buffers
   :type '(choice (const window)
 		 (const window-noselect)
@@ -3170,6 +3173,23 @@ just as you provided it.  Use this command with care!"
    (t nil)))
 (put 'erc-cmd-QUOTE 'do-not-parse-args t)
 
+(defcustom erc-query-display 'buffer
+  "Indicates how to display query buffers when using the /QUERY
+command to talk to someone.
+
+The default behavior is to display the message in a new buffer
+and bring it to the front.  See the documentation for `erc-join-buffer' for
+available choices.
+
+See also `erc-auto-query' to decide how private messages from
+other people should be displayed."
+  :group 'erc-query
+  :type '(choice (const buffer)
+		 (const window)
+		 (const window-noselect)
+		 (const bury)
+		 (const frame)))
+
 (defun erc-cmd-QUERY (&optional user)
   "Open a query with USER.
 The type of query window/frame/etc will depend on the value of
@@ -3177,7 +3197,8 @@ The type of query window/frame/etc will depend on the value of
 exists - except this is broken now ;-)"
   (interactive
    (list (read-from-minibuffer "Start a query with: " nil)))
-  (let ((session-buffer (erc-server-buffer)))
+  (let ((session-buffer (erc-server-buffer))
+	(erc-join-buffer erc-query-display))
     (if user
 	(erc-query user session-buffer)
       ;; currently broken, evil hack to display help anyway
@@ -3851,7 +3872,7 @@ To change how this query window is displayed, use `let' to bind
     (erc-update-mode-line)
     buf))
 
-(defcustom erc-auto-query 'bury
+(defcustom erc-auto-query 'buffer
   "If non-nil, create a query buffer each time you receive a private message.
 
 If the buffer doesn't already exist it is created.  This can be
@@ -3859,7 +3880,7 @@ set to a symbol, to control how the new query window should
 appear.  See the documentation for `erc-join-buffer' for
 available choices."
   :group 'erc-query
-  :type '(choice (const nil)
+  :type '(choice (const :tag "Don't create query window" nil)
 		 (const buffer)
 		 (const window)
 		 (const window-noselect)



From MAILER-DAEMON Thu Jan 17 01:30:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFOGQ-0005eR-RG
	for mharc-erc-commit@gnu.org; Thu, 17 Jan 2008 01:30:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFOGP-0005eG-9m
	for erc-commit@gnu.org; Thu, 17 Jan 2008 01:30:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFOGO-0005dw-A8
	for erc-commit@gnu.org; Thu, 17 Jan 2008 01:30:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFOGO-0005dt-2P
	for erc-commit@gnu.org; Thu, 17 Jan 2008 01:30:08 -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 1JFOGN-0006bZ-U9
	for erc-commit@gnu.org; Thu, 17 Jan 2008 01:30:08 -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 1JFOGN-0003qh-17
	for erc-commit@gnu.org; Thu, 17 Jan 2008 01:30:07 -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 1JFOGL-0003mJ-NW
	for erc-commit@gnu.org; Thu, 17 Jan 2008 01:30:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 17 Jan 2008 01:30:05 -0500
Date: Thu, 17 Jan 2008 01:30:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFOGL-0003mJ-NW@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-dcc.el: Fix error in
	erc-dcc-send-sentinel.
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: Thu, 17 Jan 2008 06:30:09 -0000

commit 7312d2b4da9913419c7ed2d9ada173603ffe52d6
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 17 01:20:47 2008 -0500

    erc-dcc.el: Fix error in erc-dcc-send-sentinel.

diff --git a/CREDITS b/CREDITS
index ca1f4da..af13027 100644
--- a/CREDITS
+++ b/CREDITS
@@ -179,6 +179,9 @@ Giorgos Keramidas <keramida@ceid.upatras.gr>:
 Tom Tromey <tromey@redhat.com>:
   * Contributed erc-list.el.
 
+Brent Goodrick <bgoodr AT gmail.com>:
+  * Fixed a bug in erc-dcc-send-sentinel.
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index 6f9d7ef..124e1a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@
 	display their test messages.
 	(erc-auto-query): Add explanatory :tag for nil choice.
 
+	* erc-dcc.el (erc-dcc-send-sentinel): Better handle case where elt
+	is nil, in order to avoid an error.  Thanks to Brent Goodrick for
+	the initial patch.
+
 	* erc-networks.el (erc-server-alist): Add Rizon network.
 
 	* erc-services.el (erc-nickserv-passwords): Add Rizon to options.
diff --git a/erc-dcc.el b/erc-dcc.el
index 8158c09..146d36c 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -762,14 +762,14 @@ listening port."
   (erc-extract-nick (plist-get plist :nick)))
 
 (defun erc-dcc-send-sentinel (proc event)
-  (let* ((elt (erc-dcc-member :peer proc))
-         (buf (marker-buffer (plist-get elt :sent))))
+  (let* ((elt (erc-dcc-member :peer proc)))
     (cond
      ((string-match "^open from " event)
       (when elt
-        (with-current-buffer buf
-          (set-process-buffer proc buf)
-          (setq erc-dcc-entry-data elt))
+        (let ((buf (marker-buffer (plist-get elt :sent))))
+          (with-current-buffer buf
+            (set-process-buffer proc buf)
+            (setq erc-dcc-entry-data elt)))
         (run-hook-with-args 'erc-dcc-send-connect-hook proc))))))
 
 (defun erc-dcc-find-file (file)



From MAILER-DAEMON Thu Jan 17 02:20:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFP2q-0003X5-Gm
	for mharc-erc-commit@gnu.org; Thu, 17 Jan 2008 02:20:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFP2o-0003WS-R1
	for erc-commit@gnu.org; Thu, 17 Jan 2008 02:20:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFP2n-0003Vz-8C
	for erc-commit@gnu.org; Thu, 17 Jan 2008 02:20:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFP2n-0003Vu-3M
	for erc-commit@gnu.org; Thu, 17 Jan 2008 02:20:09 -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 1JFP2n-0007sP-4B
	for erc-commit@gnu.org; Thu, 17 Jan 2008 02:20:09 -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 1JFP2l-0006EV-4A
	for erc-commit@gnu.org; Thu, 17 Jan 2008 02:20:07 -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 1JFP2j-0005OD-RK
	for erc-commit@gnu.org; Thu, 17 Jan 2008 02:20:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 17 Jan 2008 02:20:05 -0500
Date: Thu, 17 Jan 2008 02:20:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFP2j-0005OD-RK@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-dcc: Split lambda form in
	erc-dcc-send-connect-hook into its own fun.
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: Thu, 17 Jan 2008 07:20:11 -0000

commit 0e65b81d70f1552ea1d528cbe57154c2313851d7
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 17 02:10:03 2008 -0500

    erc-dcc: Split lambda form in erc-dcc-send-connect-hook into its own fun.

diff --git a/ChangeLog b/ChangeLog
index 124e1a1..eff30d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 	* erc-dcc.el (erc-dcc-send-sentinel): Better handle case where elt
 	is nil, in order to avoid an error.  Thanks to Brent Goodrick for
 	the initial patch.
+	(erc-dcc-display-send): New function split from erc-dcc-send-hook.
+	(erc-dcc-send-connect-hook): Use it -- we don't like lambda forms
+	in hooks.
 
 	* erc-networks.el (erc-server-alist): Add Rizon network.
 
diff --git a/erc-dcc.el b/erc-dcc.el
index 146d36c..3c8d302 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -745,13 +745,14 @@ bytes sent."
          (format "DCC: Client confirmed too much!"))
         (delete-process proc))))))
 
+(defun erc-dcc-display-send (proc)
+  (erc-display-message
+   nil 'notice (erc-dcc-get-parent proc)
+   (format "DCC: SEND connect from %s"
+           (format-network-address (process-contact proc :remote)))))
+
 (defcustom erc-dcc-send-connect-hook
-  '((lambda (proc)
-      (erc-display-message
-       nil 'notice (erc-dcc-get-parent proc)
-       (format "DCC: SEND connect from %s"
-               (format-network-address (process-contact proc :remote)))))
-    erc-dcc-send-block)
+  '(erc-dcc-display-send erc-dcc-send-block)
   "*Hook run whenever the remote end of a DCC SEND offer connected to your
 listening port."
   :group 'erc-dcc



From MAILER-DAEMON Thu Jan 17 03:40:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFQII-0006Ls-3a
	for mharc-erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFQIF-0006K8-Nc
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFQIB-0006HP-RK
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFQIB-0006HM-Nx
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:07 -0500
Received: from mx20.gnu.org ([199.232.41.8])
	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 1JFQIB-0004V3-Jk
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:07 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@gnu.org>) id 1JFQIA-0003VQ-Lz
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:06 -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 1JFQIA-0002Y3-2A
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:06 -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 1JFQI8-00089y-Lg
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 17 Jan 2008 03:40:04 -0500
Date: Thu, 17 Jan 2008 03:40:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFQI8-00089y-Lg@mire.hcoop.net>
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Erc-commit] [commit][master] erc-dcc: Better handle case when
	client confirms too much.
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: Thu, 17 Jan 2008 08:40:12 -0000

commit 1f72adea933e56c542063c6ffe1ba3b92df50cd9
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 17 02:36:03 2008 -0500

    erc-dcc: Better handle case when client confirms too much.

diff --git a/ChangeLog b/ChangeLog
index eff30d5..61f3e5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
 	(erc-dcc-display-send): New function split from erc-dcc-send-hook.
 	(erc-dcc-send-connect-hook): Use it -- we don't like lambda forms
 	in hooks.
+	(erc-dcc-send-filter): Display byte count if the client confirmed
+	too much, and kill the buffer.  Otherwise a DoS might be possible
+	by making Emacs run out of RAM.
 
 	* erc-networks.el (erc-server-alist): Add Rizon network.
 
diff --git a/erc-dcc.el b/erc-dcc.el
index 3c8d302..7f678e0 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -742,7 +742,11 @@ bytes sent."
        ((> confirmed-marker sent-marker)
         (erc-display-message
          nil 'notice parent
-         (format "DCC: Client confirmed too much!"))
+         (format "DCC: Client confirmed too much (%s vs %s)!"
+                 (marker-position confirmed-marker)
+                 (marker-position sent-marker)))
+        (set-buffer-modified-p nil)
+        (kill-buffer (current-buffer))
         (delete-process proc))))))
 
 (defun erc-dcc-display-send (proc)



From MAILER-DAEMON Thu Jan 17 03:40:17 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFQIL-0006MY-A8
	for mharc-erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFQIJ-0006MN-3n
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFQIE-0006J4-6M
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFQID-0006Iv-Tt
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:09 -0500
Received: from mx20.gnu.org ([199.232.41.8])
	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 1JFQID-0004VG-Ql
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:10 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@gnu.org>) id 1JFQIC-0003Vu-Q6
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:09 -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 1JFQIC-0002YG-J9
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:08 -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 1JFQIB-0008DK-Aw
	for erc-commit@gnu.org; Thu, 17 Jan 2008 03:40:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 17 Jan 2008 03:40:07 -0500
Date: Thu, 17 Jan 2008 03:40:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFQIB-0008DK-Aw@mire.hcoop.net>
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Erc-commit] [commit][master] Detect whether connection is failed
	before proceeding further.
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: Thu, 17 Jan 2008 08:40:15 -0000

commit d3d4e19f6a98231e16b656239f2aa756c7f94f8a
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 17 03:31:18 2008 -0500

    Detect whether connection is failed before proceeding further.

diff --git a/ChangeLog b/ChangeLog
index 61f3e5f..adc7e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@
 	too much, and kill the buffer.  Otherwise a DoS might be possible
 	by making Emacs run out of RAM.
 
+	* erc-backend.el (erc-server-connect): Detect early on whether the
+	connection attempt has failed in order to avoid confusing error
+	messages.
+
 	* erc-networks.el (erc-server-alist): Add Rizon network.
 
 	* erc-services.el (erc-nickserv-passwords): Add Rizon to options.
diff --git a/erc-backend.el b/erc-backend.el
index e2fb1d7..1bb3e4a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -490,6 +490,8 @@ We will store server variables in the buffer given by BUFFER."
     (let ((process (funcall erc-server-connect-function
                             (format "erc-%s-%s" server port)
                             nil server port)))
+      (unless (processp process)
+        (error "Connection attempt failed"))
       (message "%s...done" msg)
       ;; Misc server variables
       (with-current-buffer buffer



From MAILER-DAEMON Thu Jan 17 18:10:16 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFdsG-0005QW-Ci
	for mharc-erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFdsE-0005PL-Q9
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFdsB-0005MH-1s
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFdsA-0005M9-SM
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:10 -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 1JFdsA-0004Gv-NL
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:10 -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 1JFds9-0006mR-C0
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:09 -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 1JFds7-00041I-W1
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:09 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 17 Jan 2008 18:10:07 -0500
Date: Thu, 17 Jan 2008 18:10:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFds7-00041I-W1@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] (erc-notice-face): Make this work
	with XEmacs.
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: Thu, 17 Jan 2008 23:10:15 -0000

commit 5058dd3243fa8e0a6e0d4db20a9b59892cbd0e16
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 17 17:05:18 2008 -0500

    (erc-notice-face): Make this work with XEmacs.

diff --git a/ChangeLog b/ChangeLog
index adc7e21..25c46ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	already seen bug reports about new users thinking that ERC didn't
 	display their test messages.
 	(erc-auto-query): Add explanatory :tag for nil choice.
+	(erc-notice-face): Make this work with XEmacs.
 
 	* erc-dcc.el (erc-dcc-send-sentinel): Better handle case where elt
 	is nil, in order to avoid an error.  Thanks to Brent Goodrick for
diff --git a/erc.el b/erc.el
index 56c3e8e..3a5d586 100644
--- a/erc.el
+++ b/erc.el
@@ -1168,9 +1168,11 @@ See the variable `erc-command-indicator'."
   :group 'erc-faces)
 
 (defface erc-notice-face
-  '((((class color) (min-colors 88))
-     (:bold t :foreground "SlateBlue"))
-    (t (:bold t :foreground "blue")))
+  (if (featurep 'xemacs)
+      '((t (:bold t :foreground "blue")))
+    '((((class color) (min-colors 88))
+       (:bold t :foreground "SlateBlue"))
+      (t (:bold t :foreground "blue"))))
   "ERC face for notices."
   :group 'erc-faces)
 



From MAILER-DAEMON Thu Jan 17 18:10:16 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFdsG-0005QN-5w
	for mharc-erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFdsE-0005PD-Lt
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFdsC-0005NX-TR
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFdsC-0005NC-H6
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:12 -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 1JFdsC-0004H9-8E
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:12 -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 1JFdsB-0006ml-NS
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:11 -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 1JFdsA-00041z-AP
	for erc-commit@gnu.org; Thu, 17 Jan 2008 18:10:11 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 17 Jan 2008 18:10:10 -0500
Date: Thu, 17 Jan 2008 18:10:10 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFdsA-00041z-AP@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Further change defaults and
	customization types for query buffer options.
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: Thu, 17 Jan 2008 23:10:15 -0000

commit 04d772a460965e1fe03c916b8d406ca2817cb331
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 17 18:03:03 2008 -0500

    Further change defaults and customization types for query buffer options.

diff --git a/ChangeLog b/ChangeLog
index 25c46ae..b3728bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,13 +3,15 @@
 	* erc.el (erc-join-buffer): Improve documentation.
 	(erc-query-display): New option indicating how to display a query
 	buffer that is made by using the /QUERY command.  The default is
-	to make a new buffer and bring it to the front.
-	(erc-cmd-QUERY): Use it.
-	(erc-auto-query): Default this to 'buffer instead, because I've
-	already seen bug reports about new users thinking that ERC didn't
-	display their test messages.
-	(erc-auto-query): Add explanatory :tag for nil choice.
+	to display the query in a new window.
+	(erc-cmd-QUERY): Use it.  Improve docstring.
+	(erc-auto-query): Default this to 'window-noselect instead,
+	because I've already seen bug reports about new users thinking
+	that ERC didn't display their test messages.  Improve
+	customization type.
 	(erc-notice-face): Make this work with XEmacs.
+	(erc-join-buffer): Mention 'buffer in docstring.  Improve
+	customization type.
 
 	* erc-dcc.el (erc-dcc-send-sentinel): Better handle case where elt
 	is nil, in order to avoid an error.  Thanks to Brent Goodrick for
diff --git a/erc.el b/erc.el
index 3a5d586..0d5eca9 100644
--- a/erc.el
+++ b/erc.el
@@ -1478,13 +1478,15 @@ The available choices are:
   'window-noselect - in another window, but don't select that one,
   'frame           - in another frame,
   'bury            - bury it in a new buffer,
+  'buffer          - in place of the current buffer,
   any other value  - in place of the current buffer."
   :group 'erc-buffers
-  :type '(choice (const window)
-		 (const window-noselect)
-		 (const frame)
-		 (const bury)
-		 (const buffer)))
+  :type '(choice (const :tag "Split window and select" window)
+		 (const :tag "Split window, don't select" window-noselect)
+		 (const :tag "New frame" frame)
+		 (const :tag "Bury in new buffer" bury)
+		 (const :tag "Use current buffer" buffer)
+		 (const :tag "Use current buffer" t)))
 
 (defcustom erc-frame-alist nil
   "*Alist of frame parameters for creating erc frames.
@@ -3175,28 +3177,31 @@ just as you provided it.  Use this command with care!"
    (t nil)))
 (put 'erc-cmd-QUOTE 'do-not-parse-args t)
 
-(defcustom erc-query-display 'buffer
+(defcustom erc-query-display 'window
   "Indicates how to display query buffers when using the /QUERY
 command to talk to someone.
 
-The default behavior is to display the message in a new buffer
-and bring it to the front.  See the documentation for `erc-join-buffer' for
-available choices.
+The default behavior is to display the message in a new window
+and bring it to the front.  See the documentation for
+`erc-join-buffer' for a description of the available choices.
 
 See also `erc-auto-query' to decide how private messages from
 other people should be displayed."
   :group 'erc-query
-  :type '(choice (const buffer)
-		 (const window)
-		 (const window-noselect)
-		 (const bury)
-		 (const frame)))
+  :type '(choice (const :tag "Split window and select" window)
+		 (const :tag "Split window, don't select" window-noselect)
+		 (const :tag "New frame" frame)
+		 (const :tag "Bury in new buffer" bury)
+		 (const :tag "Use current buffer" buffer)
+		 (const :tag "Use current buffer" t)))
 
 (defun erc-cmd-QUERY (&optional user)
   "Open a query with USER.
 The type of query window/frame/etc will depend on the value of
-`erc-join-buffer'.  If USER is omitted, close the current query buffer if one
-exists - except this is broken now ;-)"
+`erc-query-display'.
+
+If USER is omitted, close the current query buffer if one exists
+- except this is broken now ;-)"
   (interactive
    (list (read-from-minibuffer "Start a query with: " nil)))
   (let ((session-buffer (erc-server-buffer))
@@ -3874,20 +3879,22 @@ To change how this query window is displayed, use `let' to bind
     (erc-update-mode-line)
     buf))
 
-(defcustom erc-auto-query 'buffer
+(defcustom erc-auto-query 'window-noselect
   "If non-nil, create a query buffer each time you receive a private message.
+If the buffer doesn't already exist, it is created.
 
-If the buffer doesn't already exist it is created.  This can be
-set to a symbol, to control how the new query window should
-appear.  See the documentation for `erc-join-buffer' for
-available choices."
+This can be set to a symbol, to control how the new query window
+should appear.  The default behavior is to display the buffer in
+a new window, but not to select it.  See the documentation for
+`erc-join-buffer' for a description of the available choices."
   :group 'erc-query
   :type '(choice (const :tag "Don't create query window" nil)
-		 (const buffer)
-		 (const window)
-		 (const window-noselect)
-		 (const bury)
-		 (const frame)))
+		 (const :tag "Split window and select" window)
+		 (const :tag "Split window, don't select" window-noselect)
+		 (const :tag "New frame" frame)
+		 (const :tag "Bury in new buffer" bury)
+		 (const :tag "Use current buffer" buffer)
+		 (const :tag "Use current buffer" t)))
 
 (defcustom erc-query-on-unjoined-chan-privmsg t
   "If non-nil create query buffer on receiving any PRIVMSG at all.



From MAILER-DAEMON Fri Jan 18 01:00:18 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFkH3-0005kr-W2
	for mharc-erc-commit@gnu.org; Fri, 18 Jan 2008 01:00:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFkH1-0005jJ-1e
	for erc-commit@gnu.org; Fri, 18 Jan 2008 01:00:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFkGy-0005iP-5E
	for erc-commit@gnu.org; Fri, 18 Jan 2008 01:00:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFkGx-0005iM-MP
	for erc-commit@gnu.org; Fri, 18 Jan 2008 01:00:11 -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 1JFkGx-0006Jl-9n
	for erc-commit@gnu.org; Fri, 18 Jan 2008 01:00:11 -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 1JFkGw-0000Sc-GW
	for erc-commit@gnu.org; Fri, 18 Jan 2008 01:00:10 -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 1JFkGu-0004aR-QN
	for erc-commit@gnu.org; Fri, 18 Jan 2008 01:00:10 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 18 Jan 2008 01:00:08 -0500
Date: Fri, 18 Jan 2008 01:00:08 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFkGu-0004aR-QN@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Use target and network name by
	default in the mode line.
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: Fri, 18 Jan 2008 06:00:15 -0000

commit 044ddad99e270c2141852be13b2fb8a02591c112
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Jan 18 00:54:57 2008 -0500

    Use target and network name by default in the mode line.

diff --git a/ChangeLog b/ChangeLog
index b3728bb..e57d3a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-18  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-mode-line-format): Add %N and %S.  %N is the name of
+	the network, and %S is much like %s but with the network name
+	trumping the server name.  Default to "%S %a".  Thanks to e1f for
+	the suggestion.
+	(erc-format-network): New function that formats the network name.
+	(erc-format-target-and/or-network): New function that formats both
+	the network name and target, falling back on the server name if
+	the network name is not available.
+	(erc-update-mode-line-buffer): Add the new format spec items.
+
 2008-01-17  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-join-buffer): Improve documentation.
diff --git a/erc.el b/erc.el
index 0d5eca9..dc6f731 100644
--- a/erc.el
+++ b/erc.el
@@ -5862,7 +5862,7 @@ See `current-time' for details on the time format."
 
 ;; Mode line handling
 
-(defcustom erc-mode-line-format "%s %a"
+(defcustom erc-mode-line-format "%S %a"
   "A string to be formatted and shown in the mode-line in `erc-mode'.
 
 The string is formatted using `format-spec' and the result is set as the value
@@ -5873,12 +5873,16 @@ The following characters are replaced:
 %l: The estimated lag time to the server
 %m: The modes of the channel
 %n: The current nick name
+%N: The name of the network
 %o: The topic of the channel
 %p: The session port
 %t: The name of the target (channel, nickname, or servername:port)
 %s: In the server-buffer, this gets filled with the value of
     `erc-server-announced-name', in a channel, the value of
-    (erc-default-target) also get concatenated."
+    (erc-default-target) also get concatenated.
+%S: In the server-buffer, this gets filled with the value of
+    `erc-network', in a channel, the value of (erc-default-target)
+    also get concatenated."
   :group 'erc-mode-line-and-header
   :type 'string)
 
@@ -5972,6 +5976,29 @@ This should be a string with substitution variables recognized by
 	  (server-name server-name)
 	  (t (buffer-name (current-buffer))))))
 
+(defun erc-format-network ()
+  "Return the name of the network we are currently on."
+  (let ((network (erc-with-server-buffer erc-network)))
+    (if (and network (symbolp network))
+	(symbol-name network)
+      "")))
+
+(defun erc-format-target-and/or-network ()
+  "Return the network or the current target and network combined.
+If the name of the network is not available, then use the
+shortened server name instead."
+  (let ((network-name (or (erc-with-server-buffer erc-network)
+			  (erc-shorten-server-name
+			   (or erc-server-announced-name
+			       erc-session-server)))))
+    (when (and network-name (symbolp network-name))
+      (setq network-name (symbol-name network-name)))
+    (cond ((erc-default-target)
+	   (concat (erc-string-no-properties (erc-default-target))
+		   "@" network-name))
+	  (network-name network-name)
+	  (t (buffer-name (current-buffer))))))
+
 (defun erc-format-away-status ()
   "Return a formatted `erc-mode-line-away-status-format'
 if `erc-away' is non-nil."
@@ -6012,9 +6039,11 @@ if `erc-away' is non-nil."
 		 ?l (erc-format-lag-time)
 		 ?m (erc-format-channel-modes)
 		 ?n (or (erc-current-nick) "")
+		 ?N (erc-format-network)
 		 ?o (erc-controls-strip erc-channel-topic)
 		 ?p (erc-port-to-string erc-session-port)
 		 ?s (erc-format-target-and/or-server)
+		 ?S (erc-format-target-and/or-network)
 		 ?t (erc-format-target)))
 	  (process-status (cond ((and (erc-server-process-alive)
 				      (not erc-server-connected))



From MAILER-DAEMON Fri Jan 18 02:00:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFlD3-0001kl-2Q
	for mharc-erc-commit@gnu.org; Fri, 18 Jan 2008 02:00:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFlD0-0001kT-QX
	for erc-commit@gnu.org; Fri, 18 Jan 2008 02:00:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFlCx-0001hy-TA
	for erc-commit@gnu.org; Fri, 18 Jan 2008 02:00:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFlCx-0001hp-QM
	for erc-commit@gnu.org; Fri, 18 Jan 2008 02:00:07 -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 1JFlCx-0006oh-FV
	for erc-commit@gnu.org; Fri, 18 Jan 2008 02:00:07 -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 1JFlCw-000382-AE
	for erc-commit@gnu.org; Fri, 18 Jan 2008 02:00:06 -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 1JFlCu-0007Yc-Io
	for erc-commit@gnu.org; Fri, 18 Jan 2008 02:00:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 18 Jan 2008 02:00:04 -0500
Date: Fri, 18 Jan 2008 02:00:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFlCu-0007Yc-Io@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-dcc: Write out files as we
	receive them, fix several bugs.
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: Fri, 18 Jan 2008 07:00:11 -0000

commit 041575fdd7f005f4d33a23a80d666f48a139f92c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Jan 18 01:54:47 2008 -0500

    erc-dcc: Write out files as we receive them, fix several bugs.

diff --git a/ChangeLog b/ChangeLog
index e57d3a3..561a733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2008-01-18  Michael Olson  <mwolson@gnu.org>
 
+	* erc-dcc.el (erc-dcc-verbose): Rename from erc-verbose-dcc.
+	(erc-pack-int): Rewrite to not depend on a count argument.
+	(erc-unpack-int): Rewrite to remove 4-character limitation.
+	(erc-dcc-server): Call set-process-coding-system and
+	set-process-filter-multibyte so that the contents get sent out
+	without modification.
+	(erc-dcc-send-filter): Don't take a substring -- just pass the
+	whole string to erc-unpack-int.
+	(erc-dcc-receive-cache): New option that indicates the number of
+	bytes to let the receive buffer grow before flushing it.
+	(erc-dcc-file-name): New buffer-local variable to keep track of
+	the filename of the currently-received file.
+	(erc-dcc-get-file): Disable undo for a speed increase.  Set
+	erc-dcc-file-name.  Truncate the file before writing to it.
+	(erc-dcc-append-contents): New function to append the contents of
+	a buffer to a file and then erase the contents of the buffer.
+	(erc-dcc-get-filter): Flush buffer contents after exceeding
+	erc-dcc-receive-cache.  This allows large files to be downloaded
+	without storing the whole thing in memory.
+	(erc-dcc-get-sentinel): Flush any remaining contents before
+	closing.  No need to save buffer.
+
 	* erc.el (erc-mode-line-format): Add %N and %S.  %N is the name of
 	the network, and %S is much like %s but with the network name
 	trumping the server name.  Default to "%S %a".  Thanks to e1f for
diff --git a/erc-dcc.el b/erc-dcc.el
index 7f678e0..c9cec1d 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -70,7 +70,7 @@ Using DCC get and send, you can transfer files directly from and to other
 IRC users."
   :group 'erc)
 
-(defcustom erc-verbose-dcc t
+(defcustom erc-dcc-verbose nil
   "*If non-nil, be verbose about DCC activity reporting."
   :group 'erc-dcc
   :type 'boolean)
@@ -195,20 +195,22 @@ compared with `erc-nick-equal-p' which is IRC case-insensitive."
           (setq list (cdr list)))))
     result))
 
-;; msa wrote this nifty little frob to convert an n-byte integer to a packed
-;; string.
-(defun erc-pack-int (value count)
-  (if (> count 0)
-      (concat (erc-pack-int (/ value 256) (1- count))
-              (char-to-string (% value 256)))
-    ""))
+(defun erc-pack-int (value)
+  "Convert an integer into a packed string."
+  (let* ((len (ceiling (/ value 256.0)))
+         (str (make-string len ?a))
+         (i (1- len)))
+    (while (>= i 0)
+      (aset str i (% value 256))
+      (setq value (/ value 256))
+      (setq i (1- i)))
+    str))
 
 (defun erc-unpack-int (str)
-  "Unpack a 1-4 character packed string into an integer."
+  "Unpack a packed string into an integer."
   (let ((len (length str))
         (num 0)
         (count 0))
-    (erc-assert (<= len 4)) ;; this isn't going to fit in elisp bounds
     (while (< count len)
       (setq num (+ num (lsh (aref str (- len count 1)) (* 8 count))))
       (setq count (1+ count)))
@@ -311,6 +313,7 @@ created subprocess, or nil."
         process)
     (while (not process)
       (condition-case err
+          (progn
             (setq process
                   (make-network-process :name name
                                         :buffer nil
@@ -322,6 +325,11 @@ created subprocess, or nil."
                                         :sentinel sentinel
                                         :log #'erc-dcc-server-accept
                                         :server t))
+            (when (processp process)
+              (when (fboundp 'set-process-coding-system)
+                (set-process-coding-system process 'binary 'binary))
+              (when (fboundp 'set-process-filter-multibyte)
+                (set-process-filter-multibyte process nil))))
         (file-error
          (unless (and (string= "Cannot bind server socket" (cadr err))
                       (string= "address already in use" (caddr err)))
@@ -698,7 +706,7 @@ bytes sent."
          (confirmed-marker (plist-get elt :sent))
          (sent-marker (plist-get elt :sent)))
     (with-current-buffer (process-buffer proc)
-      (when erc-verbose-dcc
+      (when erc-dcc-verbose
         (erc-display-message
          nil 'notice (erc-dcc-get-parent proc)
          (format "DCC: Confirmed %d, sent %d, sending block now"
@@ -713,8 +721,7 @@ bytes sent."
         (length string)))))
 
 (defun erc-dcc-send-filter (proc string)
-  (erc-assert (= (% (length string) 4) 0))
-  (let* ((size (erc-unpack-int (substring string (- (length string) 4))))
+  (let* ((size (erc-unpack-int string))
          (elt (erc-dcc-member :peer proc))
          (parent (plist-get elt :parent))
          (sent-marker (plist-get elt :sent))
@@ -819,8 +826,15 @@ other client."
 
 ;;; GET handling
 
+(defcustom erc-dcc-receive-cache (* 1024 512)
+  "Number of bytes to let the receive buffer grow before flushing it."
+  :group 'erc-dcc
+  :type 'integer)
+
 (defvar erc-dcc-byte-count nil)
 (make-variable-buffer-local 'erc-dcc-byte-count)
+(defvar erc-dcc-file-name nil)
+(make-variable-buffer-local 'erc-dcc-file-name)
 
 (defun erc-dcc-get-file (entry file parent-proc)
   "This function does the work of setting up a transfer from the remote client
@@ -830,6 +844,7 @@ filter and a process sentinel, and making the connection."
          proc)
     (with-current-buffer buffer
       (fundamental-mode)
+      (buffer-disable-undo (current-buffer))
       ;; This is necessary to have the buffer saved as-is in GNU
       ;; Emacs.
       ;; XEmacs change: We don't have `set-buffer-multibyte', setting
@@ -840,7 +855,10 @@ filter and a process sentinel, and making the connection."
       (setq mode-line-process '(":%s")
             buffer-file-type t
             buffer-read-only t)
-      (set-visited-file-name file)
+      (setq erc-dcc-file-name file)
+
+      ;; Truncate the given file to size 0 before appending to it.
+      (write-region (point) (point) erc-dcc-file-name nil 'nomessage)
 
       (setq erc-server-process parent-proc
             erc-dcc-entry-data entry)
@@ -852,7 +870,6 @@ filter and a process sentinel, and making the connection."
                      (string-to-number (plist-get entry :port))
                      entry))
       (set-process-buffer proc buffer)
-      ;; The following two lines make saving as-is work under Windows
       (set-process-coding-system proc 'binary 'binary)
       (set-buffer-file-coding-system 'binary t)
 
@@ -861,6 +878,14 @@ filter and a process sentinel, and making the connection."
       (setq entry (plist-put entry :start-time (erc-current-time)))
       (setq entry (plist-put entry :peer proc)))))
 
+(defun erc-dcc-append-contents (buffer file)
+  "Append the contents of BUFFER to FILE.
+The contents of the BUFFER will then be erased."
+  (with-current-buffer buffer
+    (let ((coding-system-for-write 'binary))
+      (write-region (point-min) (point-max) erc-dcc-file-name t 'nomessage)
+      (erase-buffer))))
+
 (defun erc-dcc-get-filter (proc str)
   "This is the process filter for transfers from other clients to this one.
 It reads incoming bytes from the network and stores them in the DCC
@@ -873,8 +898,10 @@ rather than every 1024 byte block, but nobody seems to care."
       (insert (string-make-unibyte str))
 
       (setq erc-dcc-byte-count (+ (length str) erc-dcc-byte-count))
-      (erc-assert (= erc-dcc-byte-count (1- (point-max))))
-      (and erc-verbose-dcc
+      (when (> (point-max) erc-dcc-receive-cache)
+        (erc-dcc-append-contents (current-buffer) erc-dcc-file-name))
+
+      (and erc-dcc-verbose
            (erc-display-message
             nil 'notice erc-server-process
             'dcc-get-bytes-received
@@ -890,7 +917,7 @@ rather than every 1024 byte block, but nobody seems to care."
         (delete-process proc))
        (t
         (process-send-string
-         proc (erc-pack-int erc-dcc-byte-count 4)))))))
+         proc (erc-pack-int erc-dcc-byte-count)))))))
 
 
 (defun erc-dcc-get-sentinel (proc event)
@@ -902,15 +929,16 @@ transfer is complete."
     (delete-process proc)
     (setq buffer-read-only nil)
     (setq erc-dcc-list (delete erc-dcc-entry-data erc-dcc-list))
+    (unless (= (point-min) (point-max))
+      (erc-dcc-append-contents (current-buffer) erc-dcc-file-name))
     (erc-display-message
      nil 'notice erc-server-process
      'dcc-get-complete
-     ?f (file-name-nondirectory buffer-file-name)
+     ?f erc-dcc-file-name
      ?s (number-to-string (buffer-size))
      ?t (format "%.0f"
                 (erc-time-diff (plist-get erc-dcc-entry-data :start-time)
-                               (erc-current-time))))
-    (save-buffer))
+                               (erc-current-time)))))
   (kill-buffer (process-buffer proc))
   (delete-process proc))
 



From MAILER-DAEMON Fri Jan 18 03:20:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFmSS-0003o2-Pa
	for mharc-erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFmSR-0003nx-0G
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFmSO-0003mH-0Y
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFmSN-0003m9-SY
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:07 -0500
Received: from mx20.gnu.org ([199.232.41.8])
	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 1JFmSN-0008Jn-Lt
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:07 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@gnu.org>) id 1JFmSM-0001Ph-Rn
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:06 -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 1JFmSM-0007D9-D5
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:06 -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 1JFmSK-0002Ug-P4
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:20:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 18 Jan 2008 03:20:04 -0500
Date: Fri, 18 Jan 2008 03:20:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFmSK-0002Ug-P4@mire.hcoop.net>
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Erc-commit] [commit][master] erc-dcc: Make it possible to have
	separate listen and public hosts.
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: Fri, 18 Jan 2008 08:20:11 -0000

commit 71de6b09b44565a4730f251fb44cdc84eb81d863
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Jan 18 03:12:01 2008 -0500

    erc-dcc: Make it possible to have separate listen and public hosts.

diff --git a/ChangeLog b/ChangeLog
index 561a733..6ea1d66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,12 @@
 	without storing the whole thing in memory.
 	(erc-dcc-get-sentinel): Flush any remaining contents before
 	closing.  No need to save buffer.
+	(erc-dcc-listen-host): New option that determines which IP address
+	to listen on.
+	(erc-dcc-public-host): New option that determines which IP address
+	to advertise when sending a file.  This is useful for people who
+	are on a local subnet.  Together, these two options replace
+	erc-dcc-host.
 
 	* erc.el (erc-mode-line-format): Add %N and %S.  %N is the name of
 	the network, and %S is much like %s but with the network name
diff --git a/erc-dcc.el b/erc-dcc.el
index c9cec1d..243d09a 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -258,15 +258,24 @@ The result is also a string."
 
 ;;; Server code
 
-(defcustom erc-dcc-host nil
-  "*IP address to use for outgoing DCC offers.
-Should be set to a string or nil, if nil, automatic detection of the
-host interface to use will be attempted."
+(defcustom erc-dcc-listen-host nil
+  "IP address to listen on when offering files.
+Should be set to a string or nil.  If nil, automatic detection of
+the host interface to use will be attempted."
   :group 'erc-dcc
   :type (list 'choice (list 'const :tag "Auto-detect" nil)
               (list 'string :tag "IP-address"
                     :valid-regexp erc-dcc-ipv4-regexp)))
 
+(defcustom erc-dcc-public-host nil
+  "IP address to use for outgoing DCC offers.
+Should be set to a string or nil.  If nil, use the value of
+`erc-dcc-listen-host'."
+  :group 'erc-dcc
+  :type (list 'choice (list 'const :tag "Same as erc-dcc-listen-host" nil)
+              (list 'string :tag "IP-address"
+                    :valid-regexp erc-dcc-ipv4-regexp)))
+
 (defcustom erc-dcc-send-request 'ask
   "*How to treat incoming DCC Send requests.
 'ask - Report the Send request, and wait for the user to manually accept it
@@ -284,7 +293,7 @@ host interface to use will be attempted."
   "Determine the IP address we are using.
 If variable `erc-dcc-host' is non-nil, use it.  Otherwise call
 `erc-dcc-get-host' on the erc-server-process."
-  (or erc-dcc-host (erc-dcc-get-host erc-server-process)
+  (or erc-dcc-listen-host (erc-dcc-get-host erc-server-process)
       (error "Unable to determine local address")))
 
 (defcustom erc-dcc-port-range nil
@@ -819,7 +828,8 @@ other client."
         (process-send-string
          pproc (format "PRIVMSG %s :\C-aDCC SEND %s %s %d %d\C-a\n"
                        nick (erc-dcc-file-to-name file)
-                       (erc-ip-to-decimal (nth 0 contact))
+                       (erc-ip-to-decimal (or erc-dcc-public-host
+                                              (nth 0 contact)))
                        (nth 1 contact)
                        size)))
     (error "`make-network-process' not supported by your Emacs")))
@@ -927,15 +937,15 @@ transfer is complete."
   ;; FIXME, we should look at EVENT, and also check size.
   (with-current-buffer (process-buffer proc)
     (delete-process proc)
-    (setq buffer-read-only nil)
     (setq erc-dcc-list (delete erc-dcc-entry-data erc-dcc-list))
     (unless (= (point-min) (point-max))
+      (setq erc-dcc-byte-count (+ (buffer-size) erc-dcc-byte-count))
       (erc-dcc-append-contents (current-buffer) erc-dcc-file-name))
     (erc-display-message
      nil 'notice erc-server-process
      'dcc-get-complete
      ?f erc-dcc-file-name
-     ?s (number-to-string (buffer-size))
+     ?s (number-to-string erc-dcc-byte-count)
      ?t (format "%.0f"
                 (erc-time-diff (plist-get erc-dcc-entry-data :start-time)
                                (erc-current-time)))))



From MAILER-DAEMON Fri Jan 18 03:30:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JFmcA-00076L-14
	for mharc-erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFmc7-000757-Sg
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFmc5-00072c-CY
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFmc5-00072S-3s
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:09 -0500
Received: from mx20.gnu.org ([199.232.41.8])
	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 1JFmc4-0000po-OQ
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:09 -0500
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@gnu.org>) id 1JFmc2-0002Uk-Q7
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:07 -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 1JFmc2-0008Rw-Dw
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:06 -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 1JFmc0-00034L-Vt
	for erc-commit@gnu.org; Fri, 18 Jan 2008 03:30:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 18 Jan 2008 03:30:04 -0500
Date: Fri, 18 Jan 2008 03:30:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JFmc0-00034L-Vt@mire.hcoop.net>
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
Subject: [Erc-commit] [commit][master] Makefile (EXTRAS): Include
	erc-list-old.el.
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: Fri, 18 Jan 2008 08:30:12 -0000

commit ee38f467ad502905141f02468f499a7c0d95073f
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Jan 18 03:20:47 2008 -0500

    Makefile (EXTRAS): Include erc-list-old.el.

diff --git a/ChangeLog b/ChangeLog
index 6ea1d66..66e869b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-18  Michael Olson  <mwolson@gnu.org>
 
+	* Makefile (EXTRAS): Include erc-list-old.el.
+
 	* erc-dcc.el (erc-dcc-verbose): Rename from erc-verbose-dcc.
 	(erc-pack-int): Rewrite to not depend on a count argument.
 	(erc-unpack-int): Rewrite to remove 4-character limitation.
diff --git a/Makefile b/Makefile
index 4abef18..d35c60d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ UNCOMPILED = erc-bbdb.el erc-chess.el erc-ibuffer.el erc-speak.el \
 		erc-speedbar.el erc-compat.el
 
 # Files to include in the extras pack for Emacs 22
-EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-nicklist.el \
-		erc-speak.el README.extras COPYING
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-list-old.el \
+		erc-nicklist.el erc-speak.el README.extras COPYING
 
 ALLSOURCE = $(wildcard *.el)
 SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED) erc-pkg.el, $(ALLSOURCE))



From MAILER-DAEMON Fri Jan 18 21:10:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG39x-0002ei-T9
	for mharc-erc-commit@gnu.org; Fri, 18 Jan 2008 21:10:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG39w-0002eF-5g
	for erc-commit@gnu.org; Fri, 18 Jan 2008 21:10:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG39u-0002dp-JC
	for erc-commit@gnu.org; Fri, 18 Jan 2008 21:10:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG39u-0002dl-Ew
	for erc-commit@gnu.org; Fri, 18 Jan 2008 21:10:10 -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 1JG39u-0007Tf-9v
	for erc-commit@gnu.org; Fri, 18 Jan 2008 21:10:10 -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 1JG39t-0002GZ-E8
	for erc-commit@gnu.org; Fri, 18 Jan 2008 21:10:09 -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 1JG39s-0006M3-5i
	for erc-commit@gnu.org; Fri, 18 Jan 2008 21:10:09 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 18 Jan 2008 21:10:08 -0500
Date: Fri, 18 Jan 2008 21:10:08 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG39s-0006M3-5i@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix error in process filter
	introduced by recent change.
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: Sat, 19 Jan 2008 02:10:12 -0000

commit e87c2617c155f0dedb32f413ec7dda90651afed7
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Jan 18 21:05:30 2008 -0500

    Fix error in process filter introduced by recent change.

diff --git a/ChangeLog b/ChangeLog
index 66e869b..1ffc02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-format-network, erc-format-target-and/or-network):
+	Use erc-network-name function instead, and check to see whether
+	that function is bound.  This fixes an error in process filter for
+	people who did not have erc-services or erc-networks loaded.
+
 2008-01-18  Michael Olson  <mwolson@gnu.org>
 
 	* Makefile (EXTRAS): Include erc-list-old.el.
diff --git a/erc.el b/erc.el
index dc6f731..40559be 100644
--- a/erc.el
+++ b/erc.el
@@ -5978,7 +5978,7 @@ This should be a string with substitution variables recognized by
 
 (defun erc-format-network ()
   "Return the name of the network we are currently on."
-  (let ((network (erc-with-server-buffer erc-network)))
+  (let ((network (and (fboundp 'erc-network-name) (erc-network-name))))
     (if (and network (symbolp network))
 	(symbol-name network)
       "")))
@@ -5987,7 +5987,7 @@ This should be a string with substitution variables recognized by
   "Return the network or the current target and network combined.
 If the name of the network is not available, then use the
 shortened server name instead."
-  (let ((network-name (or (erc-with-server-buffer erc-network)
+  (let ((network-name (or (and (fboundp 'erc-network-name) (erc-network-name))
 			  (erc-shorten-server-name
 			   (or erc-server-announced-name
 			       erc-session-server)))))



From MAILER-DAEMON Fri Jan 18 23:50:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG5el-0003R2-8c
	for mharc-erc-commit@gnu.org; Fri, 18 Jan 2008 23:50:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG5ej-0003Qx-CB
	for erc-commit@gnu.org; Fri, 18 Jan 2008 23:50:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG5ei-0003Ql-3Y
	for erc-commit@gnu.org; Fri, 18 Jan 2008 23:50:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG5eh-0003Qi-UV
	for erc-commit@gnu.org; Fri, 18 Jan 2008 23:50:07 -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 1JG5eh-0001EN-JY
	for erc-commit@gnu.org; Fri, 18 Jan 2008 23:50:07 -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 1JG5eg-0000SR-MU
	for erc-commit@gnu.org; Fri, 18 Jan 2008 23:50:06 -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 1JG5ef-00043K-Ee
	for erc-commit@gnu.org; Fri, 18 Jan 2008 23:50:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Fri, 18 Jan 2008 23:50:05 -0500
Date: Fri, 18 Jan 2008 23:50:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG5ef-00043K-Ee@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-unmorse: Deal with the morse
	style that has "/ " at end of every letter.
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: Sat, 19 Jan 2008 04:50:10 -0000

commit 2c14ed8d5a83a45b7626f5e75eef9f4e07d0f1d6
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Jan 18 23:40:12 2008 -0500

    erc-unmorse: Deal with the morse style that has "/ " at end of every letter.

diff --git a/ChangeLog b/ChangeLog
index 1ffc02f..6eebb17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-19  Michael Olson  <mwolson@gnu.org>
 
+	* erc-goodies.el (erc-unmorse): Improve regexp for detecting
+	morse.  Deal with the morse style that has "/ " at the end of
+	every letter.
+
 	* erc.el (erc-format-network, erc-format-target-and/or-network):
 	Use erc-network-name function instead, and check to see whether
 	that function is bound.  This fixes an error in process filter for
diff --git a/erc-goodies.el b/erc-goodies.el
index 9612b00..4beedc4 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -496,8 +496,19 @@ channel that has weird people talking in morse to each other.
 
 See also `unmorse-region'."
   (goto-char (point-min))
-  (when (re-search-forward "[.-]+\\([.-]+[/ ]\\)+[.-]+" nil t)
-    (unmorse-region (match-beginning 0) (match-end 0))))
+  (when (re-search-forward "[.-]+\\([.-]*/? *\\)+[.-]+/?" nil t)
+    (save-restriction
+      (narrow-to-region (match-beginning 0) (match-end 0))
+      ;; Turn " / " into "  "
+      (goto-char (point-min))
+      (while (re-search-forward " / " nil t)
+        (replace-match "  "))
+      ;; Turn "/ " into "/"
+      (goto-char (point-min))
+      (while (re-search-forward "/ " nil t)
+        (replace-match "/"))
+      ;; Unmorse region
+      (unmorse-region (point-min) (point-max)))))
 
 ;;; erc-occur
 (defun erc-occur (string &optional proc)



From MAILER-DAEMON Sat Jan 19 00:40:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG6R8-0000aH-VB
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG6R6-0000Zi-Sz
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG6R5-0000ZV-Cw
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG6R5-0000ZP-5Q
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:07 -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 1JG6R5-00009s-10
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:07 -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 1JG6R4-0002Gm-7p
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:06 -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 1JG6R2-0005eh-SN
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 00:40:04 -0500
Date: Sat, 19 Jan 2008 00:40:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG6R2-0005eh-SN@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-page.el,
	erc-replace.el: Fix header and footer.
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: Sat, 19 Jan 2008 05:40:09 -0000

commit 04695aeb6d6937e2f5b4e0a4db8d7482cd7010c3
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 00:18:13 2008 -0500

    erc-page.el, erc-replace.el: Fix header and footer.

diff --git a/ChangeLog b/ChangeLog
index 6eebb17..b66c857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	morse.  Deal with the morse style that has "/ " at the end of
 	every letter.
 
+	* erc-page.el, erc-replace.el: Fix header and footer.
+
 	* erc.el (erc-format-network, erc-format-target-and/or-network):
 	Use erc-network-name function instead, and check to see whether
 	that function is bound.  This fixes an error in process filter for
diff --git a/erc-page.el b/erc-page.el
index 90a2009..ff30bca 100644
--- a/erc-page.el
+++ b/erc-page.el
@@ -104,5 +104,11 @@ receive pages if `erc-page-mode' is on."
 
 (provide 'erc-page)
 
-;; arch-tag: 82fd2e0e-6060-4dd2-9788-8c1411e844de
 ;;; erc-page.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: 82fd2e0e-6060-4dd2-9788-8c1411e844de
diff --git a/erc-replace.el b/erc-replace.el
index d6713c6..45ce20e 100644
--- a/erc-replace.el
+++ b/erc-replace.el
@@ -1,6 +1,7 @@
 ;; erc-replace.el -- wash and massage messages inserted into the buffer
 
-;; Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006, 2007,
+;;   2008 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Mario Lang (mlang@delysid.org)
@@ -88,5 +89,11 @@ It replaces text according to `erc-replace-alist'."
 
 (provide 'erc-replace)
 
-;; arch-tag: dd904a59-d8a6-47f8-ac3a-76b698289a18
 ;;; erc-replace.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: dd904a59-d8a6-47f8-ac3a-76b698289a18



From MAILER-DAEMON Sat Jan 19 00:40:17 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG6RF-0000c9-JU
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG6RD-0000bx-Mq
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG6RB-0000bl-52
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:15 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG6RA-0000bg-W0
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:13 -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 1JG6RA-0000AZ-Mq
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:12 -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 1JG6RA-0002Gz-3F
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:12 -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 1JG6R8-0005i8-Jz
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:11 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 00:40:10 -0500
Date: Sat, 19 Jan 2008 00:40:10 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG6R8-0005i8-Jz@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-goodies: Tweak Imenu setup and
	scrolltobottom removal.
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: Sat, 19 Jan 2008 05:40:15 -0000

commit 1ace236c79d1219c57f5181719e80e7d5f302040
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 00:35:22 2008 -0500

    erc-goodies: Tweak Imenu setup and scrolltobottom removal.

diff --git a/ChangeLog b/ChangeLog
index 5340312..3576e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
 	* erc-goodies.el (erc-unmorse): Improve regexp for detecting
 	morse.  Deal with the morse style that has "/ " at the end of
 	every letter.
+	(erc-imenu-setup): New function that sets up Imenu support.  Add
+	it instead of a lambda form to erc-mode-hook.
+	(scrolltobottom): Remove erc-scroll-to-bottom from all ERC buffers
+	when module is removed.
 
 	* erc-page.el, erc-replace.el: Fix header and footer.
 
diff --git a/erc-goodies.el b/erc-goodies.el
index 4beedc4..30ee5ec 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -33,10 +33,14 @@
 
 (require 'erc)
 
-;; Imenu Autoload
-(add-hook 'erc-mode-hook
-          (lambda ()
-            (setq imenu-create-index-function 'erc-create-imenu-index)))
+;;; Imenu support
+
+(defun erc-imenu-setup ()
+  "Setup Imenu support in an ERC buffer."
+  (set (make-local-variable 'imenu-create-index-function)
+       'erc-create-imenu-index))
+
+(add-hook 'erc-mode-hook 'erc-imenu-setup)
 (autoload 'erc-create-imenu-index "erc-imenu" "Imenu index creation function")
 
 ;;; Automatically scroll to bottom
@@ -55,7 +59,10 @@ argument to `recenter'."
 You have to activate or deactivate it in already created windows
 separately."
   ((add-hook 'erc-mode-hook 'erc-add-scroll-to-bottom))
-  ((remove-hook 'erc-mode-hook 'erc-add-scroll-to-bottom)))
+  ((remove-hook 'erc-mode-hook 'erc-add-scroll-to-bottom)
+   (dolist (buffer (erc-buffer-list))
+     (with-current-buffer buffer
+       (remove-hook 'window-scroll-functions 'erc-scroll-to-bottom t)))))
 
 (defun erc-add-scroll-to-bottom ()
   "A hook function for `erc-mode-hook' to recenter output at bottom of window.



From MAILER-DAEMON Sat Jan 19 00:40:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG6RA-0000bC-4h
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG6R8-0000a2-2O
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG6R7-0000Zq-Id
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG6R7-0000Zn-Ds
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:09 -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 1JG6R7-0000A2-8N
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:09 -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 1JG6R6-0002Gt-Kt
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:08 -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 1JG6R5-0005fz-AF
	for erc-commit@gnu.org; Sat, 19 Jan 2008 00:40:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 00:40:07 -0500
Date: Sat, 19 Jan 2008 00:40:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG6R5-0005fz-AF@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-button: Improve module definition.
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: Sat, 19 Jan 2008 05:40:10 -0000

commit fa53f87377697bc21372c36d8b4380248664c652
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 00:21:55 2008 -0500

    erc-button: Improve module definition.

diff --git a/ChangeLog b/ChangeLog
index b66c857..5340312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-19  Michael Olson  <mwolson@gnu.org>
 
+	* erc-button.el (button): Undo XEmacs-specific change to all ERC
+	buffers when module is removed.
+	(erc-button-setup): Rename from erc-button-add-keys, and move
+	XEmacs-specific stuff here.
+
 	* erc-goodies.el (erc-unmorse): Improve regexp for detecting
 	morse.  Deal with the morse style that has "/ " at the end of
 	every letter.
diff --git a/erc-button.el b/erc-button.el
index a74d56b..7183aa6 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -57,16 +57,14 @@
   ((add-hook 'erc-insert-modify-hook 'erc-button-add-buttons 'append)
    (add-hook 'erc-send-modify-hook 'erc-button-add-buttons 'append)
    (add-hook 'erc-complete-functions 'erc-button-next)
-   (add-hook 'erc-mode-hook 'erc-button-add-keys))
+   (add-hook 'erc-mode-hook 'erc-button-setup))
   ((remove-hook 'erc-insert-modify-hook 'erc-button-add-buttons)
    (remove-hook 'erc-send-modify-hook 'erc-button-add-buttons)
    (remove-hook 'erc-complete-functions 'erc-button-next)
-   (remove-hook 'erc-mode-hook 'erc-button-add-keys)))
-
-;; Make XEmacs use `erc-button-face'.
-(when (featurep 'xemacs)
-  (add-hook 'erc-mode-hook
-            (lambda () (set (make-local-variable 'widget-button-face) nil))))
+   (remove-hook 'erc-mode-hook 'erc-button-setup)
+   (when (featurep 'xemacs)
+     (dolist (buffer (erc-buffer-list))
+       (kill-local-variable 'widget-button-face)))))
 
 ;;; Variables
 
@@ -247,8 +245,12 @@ constituents.")
   "Internal variable used to keep track of whether we've added the
 global-level ERC button keys yet.")
 
-(defun erc-button-add-keys ()
+(defun erc-button-setup ()
   "Add ERC mode-level button movement keys.  This is only done once."
+  ;; Make XEmacs use `erc-button-face'.
+  (when (featurep 'xemacs)
+    (set (make-local-variable 'widget-button-face) nil))
+  ;; Add keys.
   (unless erc-button-keys-added
     (define-key erc-mode-map (kbd "<backtab>") 'erc-button-previous)
     (setq erc-button-keys-added t)))



From MAILER-DAEMON Sat Jan 19 03:40:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG9FN-00042P-0m
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG9FL-000423-0y
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG9FI-00041r-Qr
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG9FI-00041o-Jy
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:08 -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 1JG9FI-000480-Ce
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:08 -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 1JG9FH-00023p-Kd
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:07 -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 1JG9FG-00048P-0N
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:07 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 03:40:06 -0500
Date: Sat, 19 Jan 2008 03:40:06 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG9FG-00048P-0N@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-button: Fix mistake in recent
	change to the module def.
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: Sat, 19 Jan 2008 08:40:11 -0000

commit 1fef19fe5e854f8daa2b358746c264af87f7d667
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 03:01:41 2008 -0500

    erc-button: Fix mistake in recent change to the module def.

diff --git a/erc-button.el b/erc-button.el
index 7183aa6..748d19b 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -64,7 +64,8 @@
    (remove-hook 'erc-mode-hook 'erc-button-setup)
    (when (featurep 'xemacs)
      (dolist (buffer (erc-buffer-list))
-       (kill-local-variable 'widget-button-face)))))
+       (with-current-buffer buffer
+         (kill-local-variable 'widget-button-face))))))
 
 ;;; Variables
 



From MAILER-DAEMON Sat Jan 19 03:40:16 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG9FQ-00043F-9D
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG9FN-00042m-QT
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:13 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG9FM-00042J-DF
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:12 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG9FL-000428-Vk
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:12 -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 1JG9FL-00048O-Kl
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:11 -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 1JG9FL-000240-56
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:11 -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 1JG9FJ-0004Au-7y
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:10 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 03:40:09 -0500
Date: Sat, 19 Jan 2008 03:40:09 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG9FJ-0004Au-7y@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-bbdb.el: Work around XEmacs 21.4
	bug in run-at-timer call.
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: Sat, 19 Jan 2008 08:40:14 -0000

commit b5331cc366b908cbfcb68e8f383124df8c6d94e9
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 03:03:43 2008 -0500

    erc-bbdb.el: Work around XEmacs 21.4 bug in run-at-timer call.

diff --git a/ChangeLog b/ChangeLog
index 3576e88..cdb10b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-19  Michael Olson  <mwolson@gnu.org>
 
+	* erc-bbdb.el (erc-bbdb-insinuate-and-show-entry): Work around bug
+	in XEmacs 21.4 that throws an error when the first argument to
+	run-at-time is nil.
+
 	* erc-button.el (button): Undo XEmacs-specific change to all ERC
 	buffers when module is removed.
 	(erc-button-setup): Rename from erc-button-add-keys, and move
diff --git a/erc-bbdb.el b/erc-bbdb.el
index d68b697..5d6ed78 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -169,7 +169,7 @@ their \"displayed name\"."
 (defun erc-bbdb-insinuate-and-show-entry (create-p proc nick name finger-host silent &optional chan new-nick)
   ;; run this outside of the IRC filter process, to avoid an annoying
   ;; error when the user hits C-g
-  (run-at-time nil nil
+  (run-at-time 0.1 nil
 	       #'erc-bbdb-insinuate-and-show-entry-1
 	       create-p proc nick name finger-host silent chan new-nick))
 



From MAILER-DAEMON Sat Jan 19 03:40:20 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG9FU-00044Z-9a
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:20 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG9FQ-00043M-Fy
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:16 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG9FP-000432-KS
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:15 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG9FO-00042w-Sq
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:15 -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 1JG9FO-00048s-JV
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:14 -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 1JG9FO-00024J-3J
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:14 -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 1JG9FM-0004Cm-Hx
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:13 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 03:40:12 -0500
Date: Sat, 19 Jan 2008 03:40:12 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG9FM-0004Cm-Hx@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Activate
	erc-track-minor-mode as soon as connection is attempted.
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: Sat, 19 Jan 2008 08:40:17 -0000

commit e01bea08551eb7f856933fb7db02f4972fbf4844
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 03:22:01 2008 -0500

    erc-track: Activate erc-track-minor-mode as soon as connection is attempted.

diff --git a/ChangeLog b/ChangeLog
index cdb10b9..882c945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,13 @@
 
 	* erc-page.el, erc-replace.el: Fix header and footer.
 
+	* erc-track.el (erc-track-minor-mode-maybe): Take an optional
+	buffer arg so that we can put this in erc-connect-pre-hook.  If
+	given this argument, include it in the check to determine whether
+	to activate erc-track-minor-mode.
+	(track): Add erc-track-minor-mode-maybe to erc-connect-pre-hook,
+	so that we can use it as soon as a connection is attempted.
+
 	* erc.el (erc-format-network, erc-format-target-and/or-network):
 	Use erc-network-name function instead, and check to see whether
 	that function is bound.  This fixes an error in process filter for
diff --git a/erc-track.el b/erc-track.el
index 4512be2..267da1c 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -560,13 +560,15 @@ module, otherwise the keybindings will not do anything useful."
   :global t
   :group 'erc-track)
 
-(defun erc-track-minor-mode-maybe ()
+(defun erc-track-minor-mode-maybe (&optional buffer)
   "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'."
-  (unless (or erc-track-minor-mode
-	      ;; don't start the minor mode until we have an ERC
-	      ;; process running, because we don't want to prompt the
-	      ;; user while starting Emacs
-	      (null (erc-buffer-list)))
+  (when (and (not erc-track-minor-mode)
+	     ;; don't start the minor mode until we have an ERC
+	     ;; process running, because we don't want to prompt the
+	     ;; user while starting Emacs
+	     (or (and (buffer-live-p buffer)
+		      (with-current-buffer buffer (eq major-mode 'erc-mode)))
+		 (erc-buffer-list)))
     (cond ((eq erc-track-enable-keybindings 'ask)
 	   (let ((key (or (and (key-binding (kbd "C-c C-SPC")) "C-SPC")
 			  (and (key-binding (kbd "C-c C-@")) "C-@"))))
@@ -616,6 +618,7 @@ module, otherwise the keybindings will not do anything useful."
        (add-hook 'erc-insert-post-hook 'erc-track-modified-channels)
        (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))
      ;; enable the tracking keybindings
+     (add-hook 'erc-connect-pre-hook 'erc-track-minor-mode-maybe)
      (erc-track-minor-mode-maybe)))
   ;; Disable:
   ((when (boundp 'erc-track-when-inactive)
@@ -637,6 +640,7 @@ module, otherwise the keybindings will not do anything useful."
        (remove-hook 'erc-disconnected-hook 'erc-modified-channels-update)
        (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels))
      ;; disable the tracking keybindings
+     (remove-hook 'erc-connect-pre-hook 'erc-track-minor-mode-maybe)
      (when erc-track-minor-mode
        (erc-track-minor-mode -1)))))
 



From MAILER-DAEMON Sat Jan 19 03:40:23 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG9FW-000467-Vf
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:23 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG9FU-00044b-AY
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:20 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG9FS-00043z-IN
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:19 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG9FR-00043s-U0
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:17 -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 1JG9FR-00049a-IV
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40: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 1JG9FR-00024P-30
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:17 -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 1JG9FP-0004FF-6a
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:16 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 03:40:15 -0500
Date: Sat, 19 Jan 2008 03:40:15 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG9FP-0004FF-6a@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-goodies.el: Do scrolltobottom in
	all existing ERC buffers when activated.
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: Sat, 19 Jan 2008 08:40:21 -0000

commit 2a41ef26f6d043441b987f41f94aff7e593caf25
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 03:27:40 2008 -0500

    erc-goodies.el: Do scrolltobottom in all existing ERC buffers when activated.

diff --git a/ChangeLog b/ChangeLog
index 882c945..fd8ca2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,9 @@
 	(erc-imenu-setup): New function that sets up Imenu support.  Add
 	it instead of a lambda form to erc-mode-hook.
 	(scrolltobottom): Remove erc-scroll-to-bottom from all ERC buffers
-	when module is removed.
+	when module is removed.  Activate the functionality in all ERC
+	buffers when the module is activated, rather than leaving it up to
+	the user.
 
 	* erc-page.el, erc-replace.el: Fix header and footer.
 
diff --git a/erc-goodies.el b/erc-goodies.el
index 30ee5ec..4f8ce39 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -55,10 +55,11 @@ argument to `recenter'."
   :type '(choice integer (const nil)))
 
 (define-erc-module scrolltobottom nil
-  "This mode causes the prompt to stay at the end of the window.
-You have to activate or deactivate it in already created windows
-separately."
-  ((add-hook 'erc-mode-hook 'erc-add-scroll-to-bottom))
+  "This mode causes the prompt to stay at the end of the window."
+  ((add-hook 'erc-mode-hook 'erc-add-scroll-to-bottom)
+   (dolist (buffer (erc-buffer-list))
+     (with-current-buffer buffer
+       (erc-add-scroll-to-bottom))))
   ((remove-hook 'erc-mode-hook 'erc-add-scroll-to-bottom)
    (dolist (buffer (erc-buffer-list))
      (with-current-buffer buffer



From MAILER-DAEMON Sat Jan 19 03:40:26 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JG9FZ-00046y-K3
	for mharc-erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JG9FW-00045x-EZ
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JG9FV-00045E-E2
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:21 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JG9FU-000454-Vz
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40: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 1JG9FU-0004AE-Ll
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40: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 1JG9FT-00024W-SZ
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:20 -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 1JG9FS-0004GV-7o
	for erc-commit@gnu.org; Sat, 19 Jan 2008 03:40:19 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 19 Jan 2008 03:40:18 -0500
Date: Sat, 19 Jan 2008 03:40:18 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JG9FS-0004GV-7o@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-goodies: New move-to-prompt
	module, which is enabled by default.
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: Sat, 19 Jan 2008 08:40:23 -0000

commit 17648a61717aa8273a7624bf220ef7a1d8befcf5
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 19 03:37:06 2008 -0500

    erc-goodies: New move-to-prompt module, which is enabled by default.

diff --git a/ChangeLog b/ChangeLog
index fd8ca2c..f18719d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,15 @@
 	when module is removed.  Activate the functionality in all ERC
 	buffers when the module is activated, rather than leaving it up to
 	the user.
+	(move-to-prompt): New module that moves to the ERC prompt if a
+	user tries to type elsewhere in the buffer, and then inserts their
+	keystrokes there.  This is mostly taken from Johan Bockgard's init
+	file.
+	(erc-move-to-prompt): New function that implements this.
+	(erc-move-to-prompt-xemacs): New function that implements this for
+	XEmacs.
+	(erc-move-to-prompt-init-xemacs): New function to perform the
+	extra initialization step needed for XEmacs.
 
 	* erc-page.el, erc-replace.el: Fix header and footer.
 
@@ -32,6 +41,8 @@
 	Use erc-network-name function instead, and check to see whether
 	that function is bound.  This fixes an error in process filter for
 	people who did not have erc-services or erc-networks loaded.
+	(erc-modules): Add move-to-prompt module and enable it by
+	default.  Thanks to e1f for the suggestion.
 
 2008-01-18  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc-goodies.el b/erc-goodies.el
index 4f8ce39..c29f155 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -130,6 +130,43 @@ Put this function on `erc-insert-post-hook' and/or `erc-send-post-hook'."
 If a command's function symbol is in this list, the typed command
 does not appear in the ERC buffer after the user presses ENTER.")
 
+;;; Move to prompt when typing text
+(define-erc-module move-to-prompt nil
+  "This mode causes the point to be moved to the prompt when typing text."
+  ((if (featurep 'xemacs)
+       (progn
+         (add-hook 'erc-mode-hook 'erc-move-to-prompt-init-xemacs)
+         (dolist (buffer (erc-buffer-list))
+           (with-current-buffer buffer
+             (erc-move-to-prompt-init-xemacs))))
+     (define-key erc-mode-map [remap self-insert-command]
+       'erc-move-to-prompt)))
+  ((if (featurep 'xemacs)
+       (progn
+         (remove-hook 'erc-mode-hook 'erc-move-to-prompt-init-xemacs)
+         (dolist (buffer (erc-buffer-list))
+           (with-current-buffer buffer
+             (remove-hook 'pre-command-hook 'erc-move-to-prompt-xemacs t))))
+     (define-key erc-mode-map [remap self-insert-command]
+       'self-insert-command))))
+
+(defun erc-move-to-prompt ()
+  "Move the point to the ERC prompt."
+  (interactive)
+  (when (and erc-input-marker (<= (point) erc-input-marker))
+    (goto-char (point-max)))
+  (call-interactively 'self-insert-command))
+
+(defun erc-move-to-prompt-xemacs ()
+  "Move the point to the ERC prompt if this is a self-inserting command."
+  (when (and erc-input-marker (<= (point) erc-input-marker)
+             (eq 'self-insert-command this-command))
+    (goto-char (point-max))))
+
+(defun erc-move-to-prompt-init-xemacs ()
+  "Initialize the move-to-prompt module for XEmacs."
+  (add-hook 'pre-command-hook 'erc-move-to-prompt-xemacs nil t))
+
 (define-erc-module noncommands nil
   "This mode distinguishies non-commands.
 Commands listed in `erc-insert-this' know how to display
diff --git a/erc.el b/erc.el
index 40559be..7262c25 100644
--- a/erc.el
+++ b/erc.el
@@ -1812,7 +1812,7 @@ buffer rather than a server buffer.")
 
 (defcustom erc-modules '(netsplit fill button match track completion readonly
 				  ring autojoin noncommands irccontrols
-				  stamp menu list)
+				  move-to-prompt stamp menu list)
   "A list of modules which ERC should enable.
 If you set the value of this without using `customize' remember to call
 \(erc-update-modules) after you change it.  When using `customize', modules
@@ -1854,6 +1854,8 @@ removed from the list will be disabled."
     (const :tag "log: Save buffers in logs" log)
     (const :tag "match: Highlight pals, fools, and other keywords" match)
     (const :tag "menu: Display a menu in ERC buffers" menu)
+    (const :tag "move-to-prompt: Move to the prompt when typing text"
+	   move-to-prompt)
     (const :tag "netsplit: Detect netsplits" netsplit)
     (const :tag "noncommands: Don't display non-IRC commands after evaluation"
 	   noncommands)



From MAILER-DAEMON Sun Jan 20 17:40:16 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JGips-0008HV-AI
	for mharc-erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JGipq-0008HC-QT
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JGipp-0008Gx-6u
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JGipp-0008Gu-2F
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:13 -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 1JGipo-0000lC-RA
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:12 -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 1JGipn-0004jr-U9
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:11 -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 1JGipm-0007LQ-71
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:11 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 20 Jan 2008 17:40:10 -0500
Date: Sun, 20 Jan 2008 17:40:10 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JGipm-0007LQ-71@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add module definitions for erc-dcc.el
	and erc-xdcc.el.
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: Sun, 20 Jan 2008 22:40:15 -0000

commit 773a3206b463e2ed21225e16e6401757d82eff21
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 20 17:29:59 2008 -0500

    Add module definitions for erc-dcc.el and erc-xdcc.el.

diff --git a/ChangeLog b/ChangeLog
index f18719d..3ba17ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-20  Michael Olson  <mwolson@gnu.org>
+
+	* erc-dcc.el, erc-xdcc.el: Add simple module definitions.
+
+	* erc.el (erc-modules): Add dcc and xdcc.
+
 2008-01-19  Michael Olson  <mwolson@gnu.org>
 
 	* erc-bbdb.el (erc-bbdb-insinuate-and-show-entry): Work around bug
diff --git a/erc-dcc.el b/erc-dcc.el
index 243d09a..2aca064 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -60,6 +60,12 @@
   (require 'cl)
   (require 'pcomplete))
 
+;;;###autoload (autoload 'erc-dcc-mode "erc-dcc")
+(define-erc-module dcc nil
+  "Provide Direct Client-to-Client support for ERC."
+  ((add-hook 'erc-server-401-functions 'erc-dcc-no-such-nick))
+  ((remove-hook 'erc-server-401-functions 'erc-dcc-no-such-nick)))
+
 (defgroup erc-dcc nil
   "DCC stands for Direct Client Communication, where you and your
 friend's client programs connect directly to each other,
@@ -1169,8 +1175,6 @@ other client."
       (if (processp peer) (delete-process peer)))
     nil))
 
-(add-hook 'erc-server-401-functions 'erc-dcc-no-such-nick)
-
 (provide 'erc-dcc)
 
 ;;; erc-dcc.el ends here
diff --git a/erc-xdcc.el b/erc-xdcc.el
index a3b6aac..b58a7b6 100644
--- a/erc-xdcc.el
+++ b/erc-xdcc.el
@@ -62,6 +62,11 @@ being evaluated and should return stings."
   :group 'erc-dcc
   :type '(repeat (repeat :tag "Message" (choice string sexp))))
 
+;;;###autoload (autoload 'erc-xdcc-mode "erc-xdcc")
+(define-erc-module xdcc nil
+  "Act as an XDCC file-server."
+  nil nil)
+
 ;;;###autoload
 (defun erc-xdcc-add-file (file)
   "Add a file to `erc-xdcc-files'."
diff --git a/erc.el b/erc.el
index 7262c25..8994eb0 100644
--- a/erc.el
+++ b/erc.el
@@ -1844,6 +1844,7 @@ removed from the list will be disabled."
 	   capab-identify)
     (const :tag "completion: Complete nicknames and commands (programmable)"
 	   completion)
+    (const :tag "dcc: Provide Direct Client-to-Client support" dcc)
     (const :tag "hecomplete: Complete nicknames and commands (old)" hecomplete)
     (const :tag "fill: Wrap long lines" fill)
     (const :tag "identd: Launch an identd server on port 8113" identd)
@@ -1878,6 +1879,7 @@ removed from the list will be disabled."
     (const :tag "track: Track channel activity in the mode-line" track)
     (const :tag "truncate: Truncate buffers to a certain size" truncate)
     (const :tag "unmorse: Translate morse code in messages" unmorse)
+    (const :tag "xdcc: Act as an XDCC file-server" xdcc)
     (repeat :tag "Others" :inline t symbol))
   :group 'erc)
 



From MAILER-DAEMON Sun Jan 20 17:40:18 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JGipu-0008If-CF
	for mharc-erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JGips-0008Hi-Gx
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:16 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JGipr-0008HL-PT
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:16 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JGipr-0008HI-Mu
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:15 -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 1JGipr-0000lc-HT
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:15 -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 1JGipq-0004kV-UA
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:14 -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 1JGipp-0007Oo-GG
	for erc-commit@gnu.org; Sun, 20 Jan 2008 17:40:14 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 20 Jan 2008 17:40:13 -0500
Date: Sun, 20 Jan 2008 17:40:13 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JGipp-0007Oo-GG@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-goodies: Fix off-by-one error in
	move-to-prompt module.
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: Sun, 20 Jan 2008 22:40:16 -0000

commit 277b75be519ee36d706ba1ba31b64cbd15a59964
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 20 17:31:37 2008 -0500

    erc-goodies: Fix off-by-one error in move-to-prompt module.

diff --git a/ChangeLog b/ChangeLog
index 3ba17ce..8e6d89d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-20  Michael Olson  <mwolson@gnu.org>
 
+	* erc-goodies.el (erc-move-to-prompt, erc-move-to-prompt-xemacs):
+	Fix off-by-one error that caused the point to move when placed at
+	the beginning of some already-typed text.  Thanks to e1f for the
+	report.
+
 	* erc-dcc.el, erc-xdcc.el: Add simple module definitions.
 
 	* erc.el (erc-modules): Add dcc and xdcc.
diff --git a/erc-goodies.el b/erc-goodies.el
index c29f155..acf08cc 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -153,13 +153,13 @@ does not appear in the ERC buffer after the user presses ENTER.")
 (defun erc-move-to-prompt ()
   "Move the point to the ERC prompt."
   (interactive)
-  (when (and erc-input-marker (<= (point) erc-input-marker))
+  (when (and erc-input-marker (< (point) erc-input-marker))
     (goto-char (point-max)))
   (call-interactively 'self-insert-command))
 
 (defun erc-move-to-prompt-xemacs ()
   "Move the point to the ERC prompt if this is a self-inserting command."
-  (when (and erc-input-marker (<= (point) erc-input-marker)
+  (when (and erc-input-marker (< (point) erc-input-marker)
              (eq 'self-insert-command this-command))
     (goto-char (point-max))))
 



From MAILER-DAEMON Sun Jan 20 19:30:09 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JGkYD-0000N4-SC
	for mharc-erc-commit@gnu.org; Sun, 20 Jan 2008 19:30:09 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JGkYC-0000Mr-FG
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:30:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JGkYB-0000Ma-NY
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:30:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JGkYB-0000MX-G5
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:30:07 -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 1JGkYB-0000DK-9b
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:30:07 -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 1JGkYA-0001JG-II
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:30:06 -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 1JGkY9-0002ya-3Z
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:30:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 20 Jan 2008 19:30:05 -0500
Date: Sun, 20 Jan 2008 19:30:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JGkY9-0002ya-3Z@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix buggy interaction between
	move-to-prompt and delete-selection-mode.
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: Mon, 21 Jan 2008 00:30:08 -0000

commit 774e9a55e452c2686d6fd2b537a692afd51b4313
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 20 19:22:28 2008 -0500

    Fix buggy interaction between move-to-prompt and delete-selection-mode.

diff --git a/ChangeLog b/ChangeLog
index 8e6d89d..9b0132e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-21  Michael Olson  <mwolson@gnu.org>
+
+	* erc-goodies.el (move-to-prompt): Use the "XEmacs" method
+	instead, because the [remap ...] method interferes with
+	delete-selection-mode.
+	(erc-move-to-prompt): Rename from erc-move-to-prompt-xemacs.  Call
+	push-mark before moving point.  Thanks to bojohan for the
+	suggestion.
+	(erc-move-to-prompt-setup): Rename from
+	erc-move-to-prompt-init-xemacs.
+
 2008-01-20  Michael Olson  <mwolson@gnu.org>
 
 	* erc-goodies.el (erc-move-to-prompt, erc-move-to-prompt-xemacs):
diff --git a/erc-goodies.el b/erc-goodies.el
index acf08cc..2649dda 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -133,39 +133,25 @@ does not appear in the ERC buffer after the user presses ENTER.")
 ;;; Move to prompt when typing text
 (define-erc-module move-to-prompt nil
   "This mode causes the point to be moved to the prompt when typing text."
-  ((if (featurep 'xemacs)
-       (progn
-         (add-hook 'erc-mode-hook 'erc-move-to-prompt-init-xemacs)
-         (dolist (buffer (erc-buffer-list))
-           (with-current-buffer buffer
-             (erc-move-to-prompt-init-xemacs))))
-     (define-key erc-mode-map [remap self-insert-command]
-       'erc-move-to-prompt)))
-  ((if (featurep 'xemacs)
-       (progn
-         (remove-hook 'erc-mode-hook 'erc-move-to-prompt-init-xemacs)
-         (dolist (buffer (erc-buffer-list))
-           (with-current-buffer buffer
-             (remove-hook 'pre-command-hook 'erc-move-to-prompt-xemacs t))))
-     (define-key erc-mode-map [remap self-insert-command]
-       'self-insert-command))))
+  ((add-hook 'erc-mode-hook 'erc-move-to-prompt-setup)
+   (dolist (buffer (erc-buffer-list))
+     (with-current-buffer buffer
+       (erc-move-to-prompt-setup))))
+  ((remove-hook 'erc-mode-hook 'erc-move-to-prompt-setup)
+   (dolist (buffer (erc-buffer-list))
+     (with-current-buffer buffer
+       (remove-hook 'pre-command-hook 'erc-move-to-prompt t)))))
 
 (defun erc-move-to-prompt ()
-  "Move the point to the ERC prompt."
-  (interactive)
-  (when (and erc-input-marker (< (point) erc-input-marker))
-    (goto-char (point-max)))
-  (call-interactively 'self-insert-command))
-
-(defun erc-move-to-prompt-xemacs ()
   "Move the point to the ERC prompt if this is a self-inserting command."
   (when (and erc-input-marker (< (point) erc-input-marker)
              (eq 'self-insert-command this-command))
+    (push-mark)
     (goto-char (point-max))))
 
-(defun erc-move-to-prompt-init-xemacs ()
+(defun erc-move-to-prompt-setup ()
   "Initialize the move-to-prompt module for XEmacs."
-  (add-hook 'pre-command-hook 'erc-move-to-prompt-xemacs nil t))
+  (add-hook 'pre-command-hook 'erc-move-to-prompt nil t))
 
 (define-erc-module noncommands nil
   "This mode distinguishies non-commands.



From MAILER-DAEMON Sun Jan 20 19:40:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JGkhv-00084B-2l
	for mharc-erc-commit@gnu.org; Sun, 20 Jan 2008 19:40:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JGkht-00083X-6R
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:40:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JGkhr-00082a-Fe
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:40:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JGkhr-00082U-5K
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:40:07 -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 1JGkhq-00024v-PI
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:40:06 -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 1JGkhp-0001bG-T6
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:40:05 -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 1JGkho-00039Q-Gr
	for erc-commit@gnu.org; Sun, 20 Jan 2008 19:40:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 20 Jan 2008 19:40:04 -0500
Date: Sun, 20 Jan 2008 19:40:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JGkho-00039Q-Gr@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] move-to-prompt: Deactivate mark
	before moving point.
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: Mon, 21 Jan 2008 00:40:10 -0000

commit d4d7f5b262d6f52acb90e8086f92fda12ac8061b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 20 19:31:33 2008 -0500

    move-to-prompt: Deactivate mark before moving point.

diff --git a/ChangeLog b/ChangeLog
index 9b0132e..b502d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,9 @@
 	* erc-goodies.el (move-to-prompt): Use the "XEmacs" method
 	instead, because the [remap ...] method interferes with
 	delete-selection-mode.
-	(erc-move-to-prompt): Rename from erc-move-to-prompt-xemacs.  Call
-	push-mark before moving point.  Thanks to bojohan for the
-	suggestion.
+	(erc-move-to-prompt): Rename from erc-move-to-prompt-xemacs.
+	Deactivate mark and call push-mark before moving point.  Thanks to
+	bojohan for the suggestion.
 	(erc-move-to-prompt-setup): Rename from
 	erc-move-to-prompt-init-xemacs.
 
diff --git a/erc-goodies.el b/erc-goodies.el
index 2649dda..091a90e 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -146,6 +146,7 @@ does not appear in the ERC buffer after the user presses ENTER.")
   "Move the point to the ERC prompt if this is a self-inserting command."
   (when (and erc-input-marker (< (point) erc-input-marker)
              (eq 'self-insert-command this-command))
+    (deactivate-mark)
     (push-mark)
     (goto-char (point-max))))
 



From MAILER-DAEMON Sun Jan 20 21:30:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JGmQN-00008R-5p
	for mharc-erc-commit@gnu.org; Sun, 20 Jan 2008 21:30:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JGmQK-00008G-Mc
	for erc-commit@gnu.org; Sun, 20 Jan 2008 21:30:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JGmQJ-000084-8l
	for erc-commit@gnu.org; Sun, 20 Jan 2008 21:30:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JGmQJ-000081-34
	for erc-commit@gnu.org; Sun, 20 Jan 2008 21:30:07 -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 1JGmQI-0001Wv-QD
	for erc-commit@gnu.org; Sun, 20 Jan 2008 21:30:06 -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 1JGmQI-0007SA-4n
	for erc-commit@gnu.org; Sun, 20 Jan 2008 21:30:06 -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 1JGmQG-00079U-QP
	for erc-commit@gnu.org; Sun, 20 Jan 2008 21:30:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 20 Jan 2008 21:30:04 -0500
Date: Sun, 20 Jan 2008 21:30:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JGmQG-00079U-QP@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Only track buttons in
	default text, and make algo more robust.
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: Mon, 21 Jan 2008 02:30:09 -0000

commit 2ad70743d649aac1b34e46833e7a87d2ea67b0b8
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 20 21:27:01 2008 -0500

    erc-track: Only track buttons in default text, and make algo more robust.

diff --git a/ChangeLog b/ChangeLog
index b502d13..3776213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,16 @@
 	(erc-move-to-prompt-setup): Rename from
 	erc-move-to-prompt-init-xemacs.
 
+	* erc-track.el (erc-track-faces-priority-list): Replace erc-button
+	with '(erc-button erc-default-face) so that we only care about
+	buttons that are part of normal text.  Adjust customization type
+	to handle this case.
+	(erc-track-find-face): Simplify.  Adapt for list of faces case.
+	(erc-track-modified-channels): Use a list, not a cons, when
+	constructing the list of faces.
+	(erc-faces-in): Don't deflate lists of faces.  Add them as-is.
+	(erc-track-face-priority): Use equal instead of eq.
+
 2008-01-20  Michael Olson  <mwolson@gnu.org>
 
 	* erc-goodies.el (erc-move-to-prompt, erc-move-to-prompt-xemacs):
diff --git a/erc-track.el b/erc-track.el
index 267da1c..eade396 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -176,14 +176,16 @@ The faces used are the same as used for text in the buffers.
 
 (defcustom erc-track-faces-priority-list
   '(erc-error-face erc-current-nick-face erc-keyword-face erc-pal-face
-    erc-nick-msg-face erc-direct-msg-face erc-button erc-dangerous-host-face
-    erc-default-face erc-action-face erc-nick-default-face erc-fool-face
-    erc-notice-face erc-input-face erc-prompt-face)
+    erc-nick-msg-face erc-direct-msg-face (erc-button erc-default-face)
+    erc-dangerous-host-face erc-default-face erc-action-face
+    erc-nick-default-face erc-fool-face erc-notice-face erc-input-face
+    erc-prompt-face)
   "A list of faces used to highlight active buffer names in the modeline.
 If a message contains one of the faces in this list, the buffer name will
 be highlighted using that face.  The first matching face is used."
   :group 'erc-track
-  :type '(repeat face))
+  :type '(repeat (choice face
+			 (repeat :tag "Combination" face))))
 
 (defcustom erc-track-priority-faces-only nil
   "Only track text highlighted with a priority face.
@@ -830,21 +832,15 @@ first in that list will be used.
 If `erc-track-faces-priority-list' is not set, the first element
 in FACES will be used.
 
-One exception is made for the `erc-button' face.  It is only
-allowed to take priority over other faces if it is paired with
-`erc-default-face' in the cdr of FACES."
-  (let ((candidates erc-track-faces-priority-list)
-	candidate)
-    ;; Remove erc-button unless it is paired with erc-default-face
-    (when (and (memq 'erc-button (cdr faces))
-	       (not (memq 'erc-default-face (cdr faces))))
-      (setq faces (cons (car faces) (remq 'erc-button (cdr faces)))))
-    ;; Take the highest priority face remaining
-    (or (catch 'face
-	  (dolist (candidate erc-track-faces-priority-list)
-	    (when (memq candidate faces)
-	      (throw 'face candidate))))
-	(car faces))))
+If one of the faces is a list, then it will be ranked according
+to its highest-tanking face member.  A list of faces including
+that member will take priority over just the single member
+element."
+  (catch 'face
+    (dolist (candidate erc-track-faces-priority-list)
+      (when (member candidate faces)
+	(throw 'face candidate)))
+    (car faces)))
 
 (defun erc-track-modified-channels ()
   "Hook function for `erc-insert-post-hook' to check if the current
@@ -893,7 +889,7 @@ is in `erc-mode'."
 		       (old-face (cddr cell))
 		       (new-face (erc-track-find-face
 				  (if old-face
-				      (cons old-face faces)
+				      (list old-face faces)
 				    faces))))
 		  (setcdr cell (cons (1+ (cadr cell)) new-face)))))
 	    ;; And display it
@@ -913,11 +909,12 @@ is in `erc-mode'."
   "Return a list of all faces used in STR."
   (let ((i 0)
 	(m (length str))
-	(faces (erc-list (get-text-property 0 'face str))))
+	(faces (erc-list (get-text-property 0 'face str)))
+	cur)
     (while (and (setq i (next-single-property-change i 'face str m))
 		(not (= i m)))
-      (dolist (face (erc-list (get-text-property i 'face str)))
-	(add-to-list 'faces face)))
+      (when (setq cur (get-text-property i 'face str))
+	(add-to-list 'faces cur)))
     faces))
 
 (erc-assert
@@ -950,7 +947,7 @@ higher number than any other face in that list."
   (let ((count 0))
     (catch 'done
       (dolist (item erc-track-faces-priority-list)
-	(if (eq item face)
+	(if (equal item face)
 	    (throw 'done t)
 	  (setq count (1+ count)))))
     count))



From MAILER-DAEMON Sun Jan 20 22:50:10 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JGnfm-0003eK-EV
	for mharc-erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JGnfk-0003e0-KM
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JGnfj-0003dg-HE
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JGnfj-0003dd-CK
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:07 -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 1JGnfi-0006CI-V2
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:07 -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 1JGnfh-0003MW-U6
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:06 -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 1JGnfg-0002WA-O9
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 20 Jan 2008 22:50:04 -0500
Date: Sun, 20 Jan 2008 22:50:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JGnfg-0002WA-O9@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Remove erc-assert and use assert
	instead.
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: Mon, 21 Jan 2008 03:50:09 -0000

commit 478fb31a4249c4dccf30f7ce6f8b93e356e15dff
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 20 21:44:59 2008 -0500

    Remove erc-assert and use assert instead.

diff --git a/ChangeLog b/ChangeLog
index 3776213..a47117d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-21  Michael Olson  <mwolson@gnu.org>
 
+	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): Remove,
+	since we can use the default `assert' function without it causing
+	us any problems, even in Emacs 21.  Thanks to bojohan for the
+	suggestion.
+
 	* erc-goodies.el (move-to-prompt): Use the "XEmacs" method
 	instead, because the [remap ...] method interferes with
 	delete-selection-mode.
diff --git a/erc-compat.el b/erc-compat.el
index 0d31e86..0367a33 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -366,53 +366,6 @@ ERC release version number."
       (make-obsolete-variable old-name new-name when)
     (wrong-number-of-arguments (make-obsolete-variable old-name new-name))))
 
-;; Provde an equivalent of `assert', based on the code from cl-macs.el
-(defun erc-const-expr-p (x)
-  (cond ((consp x)
-	 (or (eq (car x) 'quote)
-	     (and (memq (car x) '(function function*))
-		  (or (symbolp (nth 1 x))
-		      (and (eq (and (consp (nth 1 x))
-				    (car (nth 1 x))) 'lambda) 'func)))))
-	((symbolp x) (and (memq x '(nil t)) t))
-	(t t)))
-
-(put 'erc-assertion-failed 'error-conditions '(error))
-(put 'erc-assertion-failed 'error-message "Assertion failed")
-
-(defun erc-list* (arg &rest rest)
-  "Return a new list with specified args as elements, cons'd to last arg.
-Thus, `(list* A B C D)' is equivalent to `(nconc (list A B C) D)', or to
-`(cons A (cons B (cons C D)))'."
-  (cond ((not rest) arg)
-	((not (cdr rest)) (cons arg (car rest)))
-	(t (let* ((n (length rest))
-		  (copy (copy-sequence rest))
-		  (last (nthcdr (- n 2) copy)))
-	     (setcdr last (car (cdr last)))
-	     (cons arg copy)))))
-
-(defmacro erc-assert (form &optional show-args string &rest args)
-  "Verify that FORM returns non-nil; signal an error if not.
-Second arg SHOW-ARGS means to include arguments of FORM in message.
-Other args STRING and ARGS... are arguments to be passed to `error'.
-They are not evaluated unless the assertion fails.  If STRING is
-omitted, a default message listing FORM itself is used."
-  (let ((sargs
-	 (and show-args
-	      (delq nil (mapcar
-			 (function
-			  (lambda (x)
-			    (and (not (erc-const-expr-p x)) x)))
-			 (cdr form))))))
-    (list 'progn
-	  (list 'or form
-		(if string
-		    (erc-list* 'error string (append sargs args))
-		  (list 'signal '(quote erc-assertion-failed)
-			(erc-list* 'list (list 'quote form) sargs))))
-	  nil)))
-
 ;; Provide a simpler replacement for `member-if'
 (defun erc-member-if (predicate list)
   "Find the first item satisfying PREDICATE in LIST.
diff --git a/erc-track.el b/erc-track.el
index eade396..b486709 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -445,7 +445,7 @@ START is the minimum length of the name used."
 
 ;;; Test:
 
-(erc-assert
+(assert
  (and
   ;; verify examples from the doc strings
   (equal (let ((erc-track-shorten-aggressively nil))
@@ -917,7 +917,7 @@ is in `erc-mode'."
 	(add-to-list 'faces cur)))
     faces))
 
-(erc-assert
+(assert
  (let ((str "is bold"))
    (put-text-property 3 (length str)
 		      'face '(bold erc-current-nick-face)



From MAILER-DAEMON Sun Jan 20 22:50:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JGnfo-0003ez-HW
	for mharc-erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JGnfn-0003eh-8a
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JGnfm-0003eF-Ct
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JGnfm-0003eB-71
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:10 -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 1JGnfl-0006Ci-QB
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:09 -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 1JGnfk-0003Mc-As
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:09 -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 1JGnfj-0002Wk-2g
	for erc-commit@gnu.org; Sun, 20 Jan 2008 22:50:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 20 Jan 2008 22:50:07 -0500
Date: Sun, 20 Jan 2008 22:50:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JGnfj-0002Wk-2g@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Fix bug where no new faces
	would take priority.
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: Mon, 21 Jan 2008 03:50:11 -0000

commit c84fcfbcb3c6c10b748b01a947606ac1fd270a46
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 20 22:46:48 2008 -0500

    erc-track: Fix bug where no new faces would take priority.

diff --git a/ChangeLog b/ChangeLog
index a47117d..d92fbee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,10 +17,8 @@
 	* erc-track.el (erc-track-faces-priority-list): Replace erc-button
 	with '(erc-button erc-default-face) so that we only care about
 	buttons that are part of normal text.  Adjust customization type
-	to handle this case.
+	to handle this case.  Make erc-nick-default-face a list.
 	(erc-track-find-face): Simplify.  Adapt for list of faces case.
-	(erc-track-modified-channels): Use a list, not a cons, when
-	constructing the list of faces.
 	(erc-faces-in): Don't deflate lists of faces.  Add them as-is.
 	(erc-track-face-priority): Use equal instead of eq.
 
diff --git a/erc-track.el b/erc-track.el
index b486709..3587771 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -178,8 +178,8 @@ The faces used are the same as used for text in the buffers.
   '(erc-error-face erc-current-nick-face erc-keyword-face erc-pal-face
     erc-nick-msg-face erc-direct-msg-face (erc-button erc-default-face)
     erc-dangerous-host-face erc-default-face erc-action-face
-    erc-nick-default-face erc-fool-face erc-notice-face erc-input-face
-    erc-prompt-face)
+    (erc-nick-default-face erc-default-face) erc-fool-face
+    erc-notice-face erc-input-face erc-prompt-face)
   "A list of faces used to highlight active buffer names in the modeline.
 If a message contains one of the faces in this list, the buffer name will
 be highlighted using that face.  The first matching face is used."
@@ -889,7 +889,7 @@ is in `erc-mode'."
 		       (old-face (cddr cell))
 		       (new-face (erc-track-find-face
 				  (if old-face
-				      (list old-face faces)
+				      (cons old-face faces)
 				    faces))))
 		  (setcdr cell (cons (1+ (cadr cell)) new-face)))))
 	    ;; And display it



From MAILER-DAEMON Mon Jan 21 18:40:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JH6FR-0003Wd-UW
	for mharc-erc-commit@gnu.org; Mon, 21 Jan 2008 18:40:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JH6FQ-0003VP-LA
	for erc-commit@gnu.org; Mon, 21 Jan 2008 18:40:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JH6FO-0003TG-Bm
	for erc-commit@gnu.org; Mon, 21 Jan 2008 18:40:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JH6FO-0003T7-6K
	for erc-commit@gnu.org; Mon, 21 Jan 2008 18:40:10 -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 1JH6FN-00009A-RE
	for erc-commit@gnu.org; Mon, 21 Jan 2008 18:40:09 -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 1JH6FN-0007nZ-3k
	for erc-commit@gnu.org; Mon, 21 Jan 2008 18:40:09 -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 1JH6FL-0001CF-Fr
	for erc-commit@gnu.org; Mon, 21 Jan 2008 18:40:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Mon, 21 Jan 2008 18:40:07 -0500
Date: Mon, 21 Jan 2008 18:40:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JH6FL-0001CF-Fr@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Show pals, fools,
	current nick, and dangerous hosts correctly.
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: Mon, 21 Jan 2008 23:40:13 -0000

commit d565d4d6b008279c89b3f88df779616d92b52e95
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Jan 21 18:30:36 2008 -0500

    erc-track: Show pals, fools, current nick, and dangerous hosts correctly.

diff --git a/ChangeLog b/ChangeLog
index d92fbee..fe9ca3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,8 @@
 	* erc-track.el (erc-track-faces-priority-list): Replace erc-button
 	with '(erc-button erc-default-face) so that we only care about
 	buttons that are part of normal text.  Adjust customization type
-	to handle this case.  Make erc-nick-default-face a list.
+	to handle this case.  Make erc-nick-default-face a list.  Handle
+	pals, fools, current nick, and dangerous hosts.
 	(erc-track-find-face): Simplify.  Adapt for list of faces case.
 	(erc-faces-in): Don't deflate lists of faces.  Add them as-is.
 	(erc-track-face-priority): Use equal instead of eq.
diff --git a/erc-track.el b/erc-track.el
index 3587771..2261fec 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -175,11 +175,21 @@ The faces used are the same as used for text in the buffers.
   :type 'boolean)
 
 (defcustom erc-track-faces-priority-list
-  '(erc-error-face erc-current-nick-face erc-keyword-face erc-pal-face
-    erc-nick-msg-face erc-direct-msg-face (erc-button erc-default-face)
-    erc-dangerous-host-face erc-default-face erc-action-face
-    (erc-nick-default-face erc-default-face) erc-fool-face
-    erc-notice-face erc-input-face erc-prompt-face)
+  '(erc-error-face
+    (erc-nick-default-face erc-current-nick-face)
+    erc-keyword-face
+    (erc-nick-default-face erc-pal-face)
+    erc-nick-msg-face
+    erc-direct-msg-face
+    (erc-button erc-default-face)
+    (erc-nick-default-face erc-dangerous-host-face)
+    erc-default-face
+    erc-action-face
+    (erc-nick-default-face erc-default-face)
+    (erc-nick-default-face erc-fool-face)
+    erc-notice-face
+    erc-input-face
+    erc-prompt-face)
   "A list of faces used to highlight active buffer names in the modeline.
 If a message contains one of the faces in this list, the buffer name will
 be highlighted using that face.  The first matching face is used."



From MAILER-DAEMON Mon Jan 21 22:50:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JHA9N-0007IO-1C
	for mharc-erc-commit@gnu.org; Mon, 21 Jan 2008 22:50:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JHA9L-0007Ht-PY
	for erc-commit@gnu.org; Mon, 21 Jan 2008 22:50:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JHA9K-0007HC-4c
	for erc-commit@gnu.org; Mon, 21 Jan 2008 22:50:11 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JHA9J-0007H5-Sv
	for erc-commit@gnu.org; Mon, 21 Jan 2008 22:50:09 -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 1JHA9J-00027E-P9
	for erc-commit@gnu.org; Mon, 21 Jan 2008 22:50:09 -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 1JHA9I-0006Ld-Qt
	for erc-commit@gnu.org; Mon, 21 Jan 2008 22:50:08 -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 1JHA9H-0004Fd-Gu
	for erc-commit@gnu.org; Mon, 21 Jan 2008 22:50:08 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Mon, 21 Jan 2008 22:50:07 -0500
Date: Mon, 21 Jan 2008 22:50:07 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JHA9H-0004Fd-Gu@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-button: Only highlight nicks in
	the current channel, not whole server.
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, 22 Jan 2008 03:50:11 -0000

commit d4c54e6e73f98f32e52fcba7332c60d8034375ca
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Jan 21 22:48:27 2008 -0500

    erc-button: Only highlight nicks in the current channel, not whole server.

diff --git a/ChangeLog b/ChangeLog
index fe9ca3b..0d189d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-22  Michael Olson  <mwolson@gnu.org>
+
+	* erc-button.el (erc-button-add-nickname-buttons): When in a
+	channel buffer, only look at nicks from the current channel.
+	Thanks to e1f for the report.
+
 2008-01-21  Michael Olson  <mwolson@gnu.org>
 
 	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): Remove,
diff --git a/erc-button.el b/erc-button.el
index 748d19b..7e45c6c 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -302,9 +302,10 @@ specified by `erc-button-alist'."
         (setq bounds (bounds-of-thing-at-point 'word))
         (setq word (buffer-substring-no-properties
                     (car bounds) (cdr bounds)))
-        (if (erc-get-server-user word)
-            (erc-button-add-button (car bounds) (cdr bounds)
-                                   fun t (list word)))))))
+        (when (or (and (erc-server-buffer-p) (erc-get-server-user word))
+                  (and erc-channel-users (erc-get-channel-user word)))
+          (erc-button-add-button (car bounds) (cdr bounds)
+                                 fun t (list word)))))))
 
 (defun erc-button-add-buttons-1 (regexp entry)
   "Search through the buffer for matches to ENTRY and add buttons."



From MAILER-DAEMON Wed Jan 23 00:40:19 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JHYLT-0005dm-36
	for mharc-erc-commit@gnu.org; Wed, 23 Jan 2008 00:40:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JHYLR-0005cn-9S
	for erc-commit@gnu.org; Wed, 23 Jan 2008 00:40:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JHYLQ-0005bz-CJ
	for erc-commit@gnu.org; Wed, 23 Jan 2008 00:40:16 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JHYLQ-0005bj-4S
	for erc-commit@gnu.org; Wed, 23 Jan 2008 00:40: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 1JHYLP-0002x6-MY
	for erc-commit@gnu.org; Wed, 23 Jan 2008 00:40:15 -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 1JHYLO-0003sI-Ow
	for erc-commit@gnu.org; Wed, 23 Jan 2008 00:40:14 -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 1JHYLN-0000QN-DV
	for erc-commit@gnu.org; Wed, 23 Jan 2008 00:40:14 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 23 Jan 2008 00:40:13 -0500
Date: Wed, 23 Jan 2008 00:40:13 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JHYLN-0000QN-DV@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Produce a blinking channel
	activity indication effect.
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, 23 Jan 2008 05:40:17 -0000

commit 7dfeb11bab8b57d7dfd4e93fdf97434c38e3cda7
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 23 00:37:42 2008 -0500

    erc-track: Produce a blinking channel activity indication effect.

diff --git a/ChangeLog b/ChangeLog
index 0d189d8..94f0e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-23  Michael Olson  <mwolson@gnu.org>
+
+	* erc-track.el (erc-track-faces-priority-list): Move
+	erc-nick-default-face higher, so that it can be used for the
+	activity indication effect.
+	(erc-track-faces-normal-list): New option that contains a list of
+	faces to consider "normal".
+	(erc-track-position-in-mode-line): Minor docfix.
+	(erc-track-find-face): Use erc-track-faces-normal-list to produce
+	a sort of blinking activity effect.
+
 2008-01-22  Michael Olson  <mwolson@gnu.org>
 
 	* erc-button.el (erc-button-add-nickname-buttons): When in a
diff --git a/erc-track.el b/erc-track.el
index 2261fec..e484000 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -183,9 +183,10 @@ The faces used are the same as used for text in the buffers.
     erc-direct-msg-face
     (erc-button erc-default-face)
     (erc-nick-default-face erc-dangerous-host-face)
+    erc-nick-default-face
+    (erc-nick-default-face erc-default-face)
     erc-default-face
     erc-action-face
-    (erc-nick-default-face erc-default-face)
     (erc-nick-default-face erc-fool-face)
     erc-notice-face
     erc-input-face
@@ -205,6 +206,7 @@ this variable.  You can set a list of channel name strings, so those
 will be ignored while all other channels will be tracked as normal.
 Other options are 'all, to apply this to all channels or nil, to disable
 this feature.
+
 Note: If you have a lot of faces listed in `erc-track-faces-priority-list',
 setting this variable might not be very useful."
   :group 'erc-track
@@ -212,17 +214,35 @@ setting this variable might not be very useful."
 		 (repeat string)
 		 (const all)))
 
+(defcustom erc-track-faces-normal-list
+  '((erc-button erc-default-face)
+    (erc-nick-default-face erc-dangerous-host-face)
+    erc-nick-default-face
+    (erc-nick-default-face erc-default-face)
+    erc-default-face
+    erc-action-face)
+  "A list of faces considered to be part of normal conversations.
+This list is used to highlight active buffer names in the modeline.
+
+If a message contains one of the faces in this list, and the
+previous modeline face for this buffer is also in this list, then
+the buffer name will be highlighted using the face from the
+message.  This gives a rough indication that active conversations
+are occurring in these channels."
+  :group 'erc-track
+  :type '(repeat (choice face
+			 (repeat :tag "Combination" face))))
+
 (defcustom erc-track-position-in-mode-line 'before-modes
   "Where to show modified channel information in the mode-line.
 
 Setting this variable only has effects in GNU Emacs versions above 21.3.
 
 Choices are:
-'before-modes - add to the beginning of `mode-line-modes'
-'after-modes  - add to the end of `mode-line-modes'
-t             - add to the end of `global-mode-string'.
-nil           - don't add to mode line
-"
+'before-modes - add to the beginning of `mode-line-modes',
+'after-modes  - add to the end of `mode-line-modes',
+t             - add to the end of `global-mode-string',
+nil           - don't add to mode line."
   :group 'erc-track
   :type '(choice (const :tag "Just before mode information" before-modes)
 		 (const :tag "Just after mode information" after-modes)
@@ -839,6 +859,11 @@ Use `erc-make-mode-line-buffer-name' to create buttons."
 If `erc-track-faces-priority-list' is set, the one from FACES who is
 first in that list will be used.
 
+If `erc-track-faces-normal-list' is non-nil, use it to produce a
+blinking effect that indicates channel activity when the first
+element in FACES and the highest-ranking face among the rest of
+FACES are both members of `erc-track-faces-normal-list'.
+
 If `erc-track-faces-priority-list' is not set, the first element
 in FACES will be used.
 
@@ -846,11 +871,22 @@ If one of the faces is a list, then it will be ranked according
 to its highest-tanking face member.  A list of faces including
 that member will take priority over just the single member
 element."
-  (catch 'face
-    (dolist (candidate erc-track-faces-priority-list)
-      (when (member candidate faces)
-	(throw 'face candidate)))
-    (car faces)))
+  (let ((choice (catch 'face
+		  (dolist (candidate erc-track-faces-priority-list)
+		    (when (member candidate faces)
+		      (throw 'face candidate)))))
+	(no-first (and erc-track-faces-normal-list
+		       (catch 'face
+			 (dolist (candidate erc-track-faces-priority-list)
+			   (when (member candidate (cdr faces))
+			     (throw 'face candidate)))))))
+    (cond ((null choice)
+	   (car faces))
+	  ((and (member choice erc-track-faces-normal-list)
+		(member no-first erc-track-faces-normal-list))
+	   no-first)
+	  (t
+	   choice))))
 
 (defun erc-track-modified-channels ()
   "Hook function for `erc-insert-post-hook' to check if the current



From MAILER-DAEMON Wed Jan 23 15:50:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JHmXz-0004kH-P5
	for mharc-erc-commit@gnu.org; Wed, 23 Jan 2008 15:50:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JHmXy-0004ga-9I
	for erc-commit@gnu.org; Wed, 23 Jan 2008 15:50:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JHmXw-0004bn-Ac
	for erc-commit@gnu.org; Wed, 23 Jan 2008 15:50:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JHmXv-0004bT-Vn
	for erc-commit@gnu.org; Wed, 23 Jan 2008 15:50:08 -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 1JHmXv-0004yj-JT
	for erc-commit@gnu.org; Wed, 23 Jan 2008 15:50:07 -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 1JHmXu-0005FD-RT
	for erc-commit@gnu.org; Wed, 23 Jan 2008 15:50:06 -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 1JHmXt-0002TT-Hm
	for erc-commit@gnu.org; Wed, 23 Jan 2008 15:50:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 23 Jan 2008 15:50:05 -0500
Date: Wed, 23 Jan 2008 15:50:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JHmXt-0002TT-Hm@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Fix some more issues with
	current-nick and pal faces in modeline.
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, 23 Jan 2008 20:50:10 -0000

commit 2792c5ad4b66f596bdf595e522fcbb1b1da0d8f0
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 23 15:41:09 2008 -0500

    erc-track: Fix some more issues with current-nick and pal faces in modeline.

diff --git a/ChangeLog b/ChangeLog
index 94f0e19..c81ce8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
 	* erc-track.el (erc-track-faces-priority-list): Move
 	erc-nick-default-face higher, so that it can be used for the
-	activity indication effect.
+	activity indication effect.  Add erc-current-nick-face and
+	erc-pal-face by themselves.
 	(erc-track-faces-normal-list): New option that contains a list of
 	faces to consider "normal".
 	(erc-track-position-in-mode-line): Minor docfix.
diff --git a/erc-track.el b/erc-track.el
index e484000..546dbb0 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -177,8 +177,10 @@ The faces used are the same as used for text in the buffers.
 (defcustom erc-track-faces-priority-list
   '(erc-error-face
     (erc-nick-default-face erc-current-nick-face)
+    erc-current-nick-face
     erc-keyword-face
     (erc-nick-default-face erc-pal-face)
+    erc-pal-face
     erc-nick-msg-face
     erc-direct-msg-face
     (erc-button erc-default-face)



From MAILER-DAEMON Wed Jan 23 18:50:10 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JHpM9-0005Sw-To
	for mharc-erc-commit@gnu.org; Wed, 23 Jan 2008 18:50:09 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JHpM8-0005SX-Fv
	for erc-commit@gnu.org; Wed, 23 Jan 2008 18:50:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JHpM6-0005SF-UZ
	for erc-commit@gnu.org; Wed, 23 Jan 2008 18:50:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JHpM6-0005S9-OZ
	for erc-commit@gnu.org; Wed, 23 Jan 2008 18:50:06 -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 1JHpM6-0001Hu-FK
	for erc-commit@gnu.org; Wed, 23 Jan 2008 18:50:06 -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 1JHpM5-00069K-Oh
	for erc-commit@gnu.org; Wed, 23 Jan 2008 18:50:05 -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 1JHpM4-0001t1-FC
	for erc-commit@gnu.org; Wed, 23 Jan 2008 18:50:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 23 Jan 2008 18:50:04 -0500
Date: Wed, 23 Jan 2008 18:50:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JHpM4-0001t1-FC@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Make tracking of
	dangerous-host and fool work w/o buttons.
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, 23 Jan 2008 23:50:08 -0000

commit 7d00f062930ce437e5f869fc1ca5a794aa1ed02d
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 23 18:42:38 2008 -0500

    erc-track: Make tracking of dangerous-host and fool work w/o buttons.

diff --git a/ChangeLog b/ChangeLog
index c81ce8c..b79167c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,9 @@
 
 	* erc-track.el (erc-track-faces-priority-list): Move
 	erc-nick-default-face higher, so that it can be used for the
-	activity indication effect.  Add erc-current-nick-face and
-	erc-pal-face by themselves.
+	activity indication effect.  Add erc-current-nick-face,
+	erc-pal-face, erc-dangerous-host-face, and erc-fool-face by
+	themselves.
 	(erc-track-faces-normal-list): New option that contains a list of
 	faces to consider "normal".
 	(erc-track-position-in-mode-line): Minor docfix.
diff --git a/erc-track.el b/erc-track.el
index 546dbb0..39633b6 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -185,11 +185,13 @@ The faces used are the same as used for text in the buffers.
     erc-direct-msg-face
     (erc-button erc-default-face)
     (erc-nick-default-face erc-dangerous-host-face)
+    erc-dangerous-host-face
     erc-nick-default-face
     (erc-nick-default-face erc-default-face)
     erc-default-face
     erc-action-face
     (erc-nick-default-face erc-fool-face)
+    erc-fool-face
     erc-notice-face
     erc-input-face
     erc-prompt-face)



From MAILER-DAEMON Wed Jan 23 19:10:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JHpfX-0002tg-9b
	for mharc-erc-commit@gnu.org; Wed, 23 Jan 2008 19:10:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JHpfV-0002sj-EN
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:10:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JHpfT-0002qn-6J
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:10:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JHpfS-0002qA-OJ
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:10:06 -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 1JHpfS-0005d5-8U
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:10:06 -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 1JHpfR-0007AK-HL
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:10:05 -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 1JHpfQ-0002pw-7e
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:10:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 23 Jan 2008 19:10:04 -0500
Date: Wed, 23 Jan 2008 19:10:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JHpfQ-0002pw-7e@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Re-sync
	erc-track-faces-normal-list.
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: Thu, 24 Jan 2008 00:10:09 -0000

commit 60071a53889191375fce0cf18b2d7baf2cee351c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 23 19:04:41 2008 -0500

    erc-track: Re-sync erc-track-faces-normal-list.

diff --git a/ChangeLog b/ChangeLog
index b79167c..59aff2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-24  Michael Olson  <mwolson@gnu.org>
+
+	* erc-track.el (erc-track-faces-normal-list): Add
+	erc-dangerous-host-face.
+
 2008-01-23  Michael Olson  <mwolson@gnu.org>
 
 	* erc-track.el (erc-track-faces-priority-list): Move
diff --git a/erc-track.el b/erc-track.el
index 39633b6..6dc8bdd 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -221,6 +221,7 @@ setting this variable might not be very useful."
 (defcustom erc-track-faces-normal-list
   '((erc-button erc-default-face)
     (erc-nick-default-face erc-dangerous-host-face)
+    erc-dangerous-host-face
     erc-nick-default-face
     (erc-nick-default-face erc-default-face)
     erc-default-face



From MAILER-DAEMON Wed Jan 23 19:30:10 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JHpyr-0006bl-SD
	for mharc-erc-commit@gnu.org; Wed, 23 Jan 2008 19:30:09 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JHpyq-0006bD-Fs
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:30:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JHpyo-0006b1-Vo
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:30:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JHpyo-0006ay-TM
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:30:06 -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 1JHpyo-0000v5-OV
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:30:06 -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 1JHpyn-0008On-U1
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:30:05 -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 1JHpym-0003kF-LP
	for erc-commit@gnu.org; Wed, 23 Jan 2008 19:30:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 23 Jan 2008 19:30:04 -0500
Date: Wed, 23 Jan 2008 19:30:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JHpym-0003kF-LP@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Ignore who set channel
	topic and listing of channel 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: Thu, 24 Jan 2008 00:30:08 -0000

commit e2c1315e2a3f9b1df9b2e26b564be969ac10dcd8
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 23 19:20:48 2008 -0500

    erc-track: Ignore who set channel topic and listing of channel users.

diff --git a/ChangeLog b/ChangeLog
index 59aff2e..acbf992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* erc-track.el (erc-track-faces-normal-list): Add
 	erc-dangerous-host-face.
+	(erc-track-exclude-types): Add 333 and 353 to the default list of
+	things to ignore, and explain what they are in the docstring.
 
 2008-01-23  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc-track.el b/erc-track.el
index 6dc8bdd..9e5307d 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -101,9 +101,13 @@ disconnected from `erc-modified-channels-alist'."
   :group 'erc-track
   :type 'boolean)
 
-(defcustom erc-track-exclude-types '("NICK")
+(defcustom erc-track-exclude-types '("NICK" "333" "353")
   "*List of message types to be ignored.
-This list could look like '(\"JOIN\" \"PART\")."
+This list could look like '(\"JOIN\" \"PART\").
+
+By default, exclude changes of nicknames (NICK), display of who
+set the channel topic (333), and listing of users on the current
+channel (353)."
   :group 'erc-track
   :type 'erc-message-type)
 



From MAILER-DAEMON Thu Jan 24 18:40:20 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIBgC-0005Jc-Q3
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 18:40:20 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JIBgA-0005IW-Qy
	for erc-commit@gnu.org; Thu, 24 Jan 2008 18:40:18 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIBg8-0005H6-5c
	for erc-commit@gnu.org; Thu, 24 Jan 2008 18:40:17 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIBg8-0005Gy-24
	for erc-commit@gnu.org; Thu, 24 Jan 2008 18:40: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 1JIBg7-0006Zc-TP
	for erc-commit@gnu.org; Thu, 24 Jan 2008 18:40:15 -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 1JIBg6-0001np-ND
	for erc-commit@gnu.org; Thu, 24 Jan 2008 18:40:14 -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 1JIBg5-0007PH-6Q
	for erc-commit@gnu.org; Thu, 24 Jan 2008 18:40:14 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 18:40:13 -0500
Date: Thu, 24 Jan 2008 18:40:13 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JIBg5-0007PH-6Q@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Load erc-networks.el from erc.el.
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: Thu, 24 Jan 2008 23:40:19 -0000

commit e1396291c240a2f08e418a9683e816550809ffd5
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 18:28:36 2008 -0500

    Load erc-networks.el from erc.el.

diff --git a/ChangeLog b/ChangeLog
index acbf992..8a483fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-24  Michael Olson  <mwolson@gnu.org>
 
+	* erc.el: Load erc-networks.el so that functions get access to the
+	`erc-network-name' function.
+
 	* erc-track.el (erc-track-faces-normal-list): Add
 	erc-dangerous-host-face.
 	(erc-track-exclude-types): Add 333 and 353 to the default list of
diff --git a/erc.el b/erc.el
index 8994eb0..c314809 100644
--- a/erc.el
+++ b/erc.el
@@ -6507,6 +6507,9 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
 ;;; avoid a recursive require error when byte-compiling the entire package.
 (require 'erc-goodies)
 
+;;; Provide support for identification of networks.
+(require 'erc-networks)
+
 ;;; erc.el ends here
 ;;
 ;; Local Variables:



From MAILER-DAEMON Thu Jan 24 19:30:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JICSR-0004d1-QT
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JICSQ-0004bw-Lv
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JICSO-0004bH-3P
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JICSN-0004bD-V9
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:07 -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 1JICSN-0005hd-Je
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:07 -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 1JICSN-00042r-1Q
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:07 -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 1JICSL-000138-Ns
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 19:30:05 -0500
Date: Thu, 24 Jan 2008 19:30:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JICSL-000138-Ns@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track-faces-normal-list: Document
	that this can be set to nil.
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: Fri, 25 Jan 2008 00:30:10 -0000

commit a6b42f93a85615b7e2b8f6469c78d2da6f97d63a
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 19:23:39 2008 -0500

    erc-track-faces-normal-list: Document that this can be set to nil.

diff --git a/ChangeLog b/ChangeLog
index 8a483fb..715da24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-25  Michael Olson  <mwolson@gnu.org>
+
+	* erc-track.el (erc-track-faces-normal-list): Indicate in the
+	docstring that this variable can be set to nil.
+
 2008-01-24  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el: Load erc-networks.el so that functions get access to the
diff --git a/erc-track.el b/erc-track.el
index 9e5307d..360d92c 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -237,7 +237,9 @@ If a message contains one of the faces in this list, and the
 previous modeline face for this buffer is also in this list, then
 the buffer name will be highlighted using the face from the
 message.  This gives a rough indication that active conversations
-are occurring in these channels."
+are occurring in these channels.
+
+The effect may be disabled by setting this variable to nil."
   :group 'erc-track
   :type '(repeat (choice face
 			 (repeat :tag "Combination" face))))



From MAILER-DAEMON Thu Jan 24 19:30:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JICST-0004eO-0h
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JICSR-0004cZ-90
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JICSQ-0004bq-HO
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JICSQ-0004bn-6r
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:10 -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 1JICSP-0005i3-Pw
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:10 -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 1JICSP-00042x-Bl
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:09 -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 1JICSO-00013n-1q
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:30:09 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 19:30:08 -0500
Date: Thu, 24 Jan 2008 19:30:08 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JICSO-00013n-1q@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Update NEWS.
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: Fri, 25 Jan 2008 00:30:11 -0000

commit 5ca078a23353efee8d960fa188bfaee84f5a3758
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 19:27:31 2008 -0500

    Update NEWS.

diff --git a/NEWS b/NEWS
index 7d9cecf..73c36b0 100644
--- a/NEWS
+++ b/NEWS
@@ -15,14 +15,218 @@ of ERC that comes with Emacs.
 `erc-join-channel' now accepts a prefix-argument to prompt for the key
 when channels are protected by keywords.
 
+** ERC will now automatically determine which nick prefixes are valid
+when joining a server.
+
+** Figure out which directory contains startup files when looking for
+.erc.el.  For Emacs this is usually ~/.emacs.d, and for XEmacs this is
+usually ~/.xemacs.
+
+** Fix bug with view-mode when running erc-toggle-debug-irc-protocol.
+
+** Permit several commands to be run even when the server connection is dead.
+This includes /CLEAR, /COUNTRY, /HELP, /LASTLOG, /QUIT, /GQUIT,
+/RECONNECT, /SERVER, and /SET.
+
+** Make /RECONNECT work better when the server connection is dead.
+Also, handle case where the server buffer has been killed.
+
+** Better handle interaction with /RECONNECT and indefinite reconnect
+attempts.  Display message which tells the user that they can stop the
+reconnect attempts by killing the server buffer.
+
+** New option `erc-reuse-frames' determines whether new frames are always
+created.  It defaults to not creating a new frame for an ERC buffer if
+there is already a window displaying it.  This only has an effect when
+the `erc-join-buffer' option is set to 'frame.
+
+** New command /ME'S handles the case where someone types "/me's" in an
+ERC buffer.  It concatenates the text " 's" to the beginning of the
+input and then sends the result like a normal /ME command.
+
+** Fix bug where some messages were being sent to the server too soon.
+In the past, this may have resulted in strange problems like seeing
+the connection attempt stall, which may have especially affected
+spotty or traffic-shaped connections.
+
+** Handle 307 (nick has identified) responses from the server.
+
+** Display a less-confusing message if the connection attempt fails.
+
+** On a tty, make sure that notices are displayed in blue rather than pink.
+
+** By default, open query buffers that are initiated by others in a new
+unselected window.  This may be changed by customizing the
+`erc-auto-query' option.  This should make ERC more friendly to new
+users.
+
+** New option `erc-query-display' indicates how to display a query buffer
+that is made using the /QUERY command.  The default is to display the
+query in a new selected window.
+
+** By default, display network name rather than server name in the modeline.
+This should ERC use less space in the modeline.  To get the old
+behavior back, set `erc-mode-line-format' to "%s %a".
+
+** New formatting variables allowed in `erc-format-network':
+
+*** `%N': the name of the network.
+
+*** `%S': much like %s, but let the network name trump the server name.
+
+** Compatibility with old releases
+
+*** In `erc-server-coding-system' and `erc-coding-system-for-target', pass
+the `target' argument as the first and only argument to the function
+named by these options.
+
+*** In `erc-track-faces-priority-list', permit list entries to be lists of
+faces.  This can be used to differentiate between, for example,
+buttons in default text and buttons in notices.
+
+*** The `erc-assert' function has been removed in favor of using `assert'
+from cl-macs.el.
+
 ** Changes and additions to modules
 
+*** BBDB (erc-bbdb.el)
+
+**** Work around bug in XEmacs 21.4 that causes an error to be thrown when
+the first argument to `run-at-time' is nil.
+
+*** Button (erc-button.el)
+
+**** Recognize parentheses that are part of URLs.
+
+**** When in a channel, only buttonize nicks from that channel.
+
+*** DCC support (erc-dcc.el)
+
+**** Turn this into the "dcc" module for ERC, so that it can be more
+easily enabled.
+
+**** New option `erc-dcc-listen-host' determines which IP address to listen
+on for outside connection attempts.
+
+**** New option `erc-dcc-public-host' determines which IP address to advertise
+when sending a file.  This is useful for people who are on a local
+subnet.  Together, these two options replace the `erc-dcc-host'
+option.
+
+**** New option `erc-dcc-receive-cache' indicates how much of a received
+file to store in an Emacs buffer before flushing it to disk.  The
+default is 0.5 MB.
+
+**** Save only parts of received files in buffers, writing repeatedly to
+disk after we get at least `erc-dcc-receive-cache' bytes.  This allows
+users to receive very large files without running out of memory.
+
+**** Fix edge case in erc-dcc-send-sentinel.
+
+**** If client confirms too much, then display byte count and kill the
+file buffer.
+
+*** Goodies (erc-goodies.el)
+
+**** New module move-to-prompt causes the point to be moved to the prompt
+if a user tries to type elsewhere in the buffer, and then inserts
+their keystrokes after the prompt.  It is enabled by default.
+
+**** Enable scroll-to-bottom in all ERC buffers when the module is enabled,
+rather than having the user do it manually.
+
+**** Fix bug with buffer ordering and scroll-to-bottom module.
+
+**** In the unmorse module, handle the morse code style that has "/ " at
+the end of every letter.
+
+*** Identd (erc-identd.el)
+
+**** Fix bad behavior when closing the identd process.
+
+*** Channel lists (erc-list.el)
+
+**** Replace the old module with a rewritten one, so that we can include
+it with Emacs.  The old version of erc-list.el has been renamed to
+erc-list-old.el, and is available as the list-old module.
+
+The new version does not yet have support for XEmacs.
+
+**** Don't display lots of output in the server buffer when running /LIST.
+
+*** Logging (erc-log.el)
+
+**** Permit the `erc-log-channels-directory' option to be set to a function
+name.  This makes it easier to write custom functions that determine
+where log files should be placed.
+
+**** New option `erc-log-filter-function' specifies the function to call
+for filtering text before writing it to a log file.  By default, no
+filtering is performed.
+
+*** Networks (erc-networks.el)
+
+**** Load this file so that we get access to `erc-network-name'.
+
+**** Add support for Rizon.
+
+*** Internet services / Nickserv (erc-services.el)
+
+**** New hook option `erc-nickserv-identified-hook' is run after NickServ
+acknowledges a successful identification.
+
+**** Add support for the GRnet and Rizon networks.
+
+*** Timestamps (erc-stamp.el)
+
+**** By default, place timestamps on both the left and the right.
+The left timestamps appear once a day, and the right timestamps appear
+once a minute when new messages arrive.  To change this, customize the
+`erc-insert-timestamp-function' and
+`erc-insert-away-timestamp-function' options.
+
 *** Channel tracking (erc-track.el)
 
-If erc-track-position-in-mode-line is set to nil, the tracking
-information won't be shown in the mode line, which is a change
-from the previous behavior of showing it "After all other
-information".
+**** If `erc-track-position-in-mode-line' is set to nil, the tracking
+information won't be shown in the mode line, which is a change from
+the previous behavior of showing it "After all other information".
+
+If this variable is set to t, then the information will be added to
+the very end of the mode line.
+
+**** New option `erc-track-remove-disconnected-buffers' controls whether
+buffers associated with a server that is disconnected should be
+removed from the modified buffers list.  The default is to keep them
+in the list.
+
+**** New hook option `erc-track-list-changed-hook' is run whenever the
+contents of the modified channels list changes.  It is useful for
+people who use a separate mechanism to provide notification of channel
+activity.
+
+**** The `erc-track-switch-direction' option now can be set to the value
+'importance.  If set to this value, ERC will switch to channels in
+order of importance, which is determined by the position of the
+channel's face in `erc-track-faces-priority-list'.
+
+**** Activate erc-track-minor-mode earlier in the connection process.
+
+**** Don't track buttons in notices.
+
+**** Get a rough idea for which channels are currently active by
+switching between several normal conversation faces in the modeline.
+This behavior can be modified by changing the new
+`erc-track-faces-normal-list' option.
+
+**** Ignore display of who set the default channel topic and listing of
+users on the current channel.  Customize the `erc-track-exclude-types'
+option to indicate the types of messages to exclude.  These two
+message types are "333" and "353", respectively.
+
+*** Support for acting as an XDCC file-server (erc-xdcc.el)
+
+**** Turn this into the "xdcc" module for ERC, so that it can be more
+easily enabled.
 
 * Changes in ERC 5.2
 



From MAILER-DAEMON Thu Jan 24 19:50:11 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIClm-0006Ps-SE
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 19:50:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JICll-0006O7-2z
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:50:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIClk-0006Nb-Hj
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:50:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIClk-0006NY-F7
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:50:08 -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 1JIClk-0000I0-0c
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:50:08 -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 1JIClj-0004m8-5K
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:50:07 -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 1JIClh-0001mG-RI
	for erc-commit@gnu.org; Thu, 24 Jan 2008 19:50:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 19:50:05 -0500
Date: Thu, 24 Jan 2008 19:50:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JIClh-0001mG-RI@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Turn erc-networks.el into the
	"networks" module, and enable by default.
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: Fri, 25 Jan 2008 00:50:09 -0000

commit 67b3f4a71e67a5d3af6218f5583685335e4da667
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 19:46:34 2008 -0500

    Turn erc-networks.el into the "networks" module, and enable by default.

diff --git a/ChangeLog b/ChangeLog
index 715da24..57402f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,18 @@
 2008-01-25  Michael Olson  <mwolson@gnu.org>
 
+	* NEWS: Update.
+
+	* erc-networks.el: Add a module definition.
+
+	* erc-services.el (erc-nickserv-identify-mode): Force-enable the
+	networks module, because we need it to set erc-network for us.
+
 	* erc-track.el (erc-track-faces-normal-list): Indicate in the
 	docstring that this variable can be set to nil.
 
+	* erc.el: On second thought, don't load erc-networks.  Just enable
+	the networks module by default.
+
 2008-01-24  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el: Load erc-networks.el so that functions get access to the
diff --git a/NEWS b/NEWS
index 73c36b0..9f0cf1c 100644
--- a/NEWS
+++ b/NEWS
@@ -68,10 +68,14 @@ query in a new selected window.
 This should ERC use less space in the modeline.  To get the old
 behavior back, set `erc-mode-line-format' to "%s %a".
 
+** Modules newly enabled by default
+
+*** move-to-prompt: Move to the prompt when typing text.
+*** networks: Provide data about IRC networks.
+
 ** New formatting variables allowed in `erc-format-network':
 
 *** `%N': the name of the network.
-
 *** `%S': much like %s, but let the network name trump the server name.
 
 ** Compatibility with old releases
@@ -166,7 +170,8 @@ filtering is performed.
 
 *** Networks (erc-networks.el)
 
-**** Load this file so that we get access to `erc-network-name'.
+**** Turn this into the "networks" module for ERC, so that it can be more
+easily enabled.  Enable it by default.
 
 **** Add support for Rizon.
 
diff --git a/erc-networks.el b/erc-networks.el
index 4e7090e..b74fdb2 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -28,9 +28,7 @@
 ;;
 ;; Usage:
 ;;
-;; Put into your .emacs:
-;;
-;; (require 'erc-networks)
+;; This is the "networks" module.
 ;;
 ;; M-x erc-server-select provides an alternative way to connect to servers by
 ;; choosing networks.
@@ -766,9 +764,14 @@ network as a symbol."
   (setq erc-network nil)
   nil)
 
-(add-hook 'erc-server-375-functions 'erc-set-network-name)
-(add-hook 'erc-server-422-functions 'erc-set-network-name)
-(add-hook 'erc-disconnected-hook 'erc-unset-network-name)
+(define-erc-module networks nil
+  "Provide data about IRC networks."
+  ((add-hook 'erc-server-375-functions 'erc-set-network-name)
+   (add-hook 'erc-server-422-functions 'erc-set-network-name)
+   (add-hook 'erc-disconnected-hook 'erc-unset-network-name))
+  ((remove-hook 'erc-server-375-functions 'erc-set-network-name)
+   (remove-hook 'erc-server-422-functions 'erc-set-network-name)
+   (remove-hook 'erc-disconnected-hook 'erc-unset-network-name)))
 
 (defun erc-ports-list (ports)
   "Return a list of PORTS.
diff --git a/erc-services.el b/erc-services.el
index 045b629..b25a10d 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -123,6 +123,10 @@ You can also use M-x erc-nickserv-identify-mode to change modes."
 		  '(("autodetect") ("nick-change") ("both")) nil t))))
   (add-hook 'erc-server-NOTICE-functions
 	    'erc-nickserv-identification-autodetect)
+  (unless erc-networks-mode
+    ;; Force-enable networks module, because we need it to set
+    ;; erc-network for us.
+    (erc-networks-enable))
   (cond ((eq mode 'autodetect)
 	 (setq erc-nickserv-identify-mode 'autodetect)
 	 (add-hook 'erc-server-NOTICE-functions
diff --git a/erc.el b/erc.el
index c314809..4c54fe7 100644
--- a/erc.el
+++ b/erc.el
@@ -1811,8 +1811,8 @@ buffer rather than a server buffer.")
 	     mods))))
 
 (defcustom erc-modules '(netsplit fill button match track completion readonly
-				  ring autojoin noncommands irccontrols
-				  move-to-prompt stamp menu list)
+			 networks ring autojoin noncommands irccontrols
+			 move-to-prompt stamp menu list)
   "A list of modules which ERC should enable.
 If you set the value of this without using `customize' remember to call
 \(erc-update-modules) after you change it.  When using `customize', modules
@@ -1858,6 +1858,7 @@ removed from the list will be disabled."
     (const :tag "move-to-prompt: Move to the prompt when typing text"
 	   move-to-prompt)
     (const :tag "netsplit: Detect netsplits" netsplit)
+    (const :tag "networks: Provide data about IRC networks" networks)
     (const :tag "noncommands: Don't display non-IRC commands after evaluation"
 	   noncommands)
     (const :tag
@@ -6507,9 +6508,6 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
 ;;; avoid a recursive require error when byte-compiling the entire package.
 (require 'erc-goodies)
 
-;;; Provide support for identification of networks.
-(require 'erc-networks)
-
 ;;; erc.el ends here
 ;;
 ;; Local Variables:



From MAILER-DAEMON Thu Jan 24 20:50:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIDhr-0001Zs-V8
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 20:50:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JIDhq-0001Z5-Fa
	for erc-commit@gnu.org; Thu, 24 Jan 2008 20:50:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIDho-0001Yt-1v
	for erc-commit@gnu.org; Thu, 24 Jan 2008 20:50:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIDhn-0001Yq-SL
	for erc-commit@gnu.org; Thu, 24 Jan 2008 20:50:07 -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 1JIDhn-0003A0-HV
	for erc-commit@gnu.org; Thu, 24 Jan 2008 20:50:07 -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 1JIDhm-0007Rv-O1
	for erc-commit@gnu.org; Thu, 24 Jan 2008 20:50:06 -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 1JIDhl-00041U-9m
	for erc-commit@gnu.org; Thu, 24 Jan 2008 20:50:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 20:50:05 -0500
Date: Thu, 24 Jan 2008 20:50:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JIDhl-00041U-9m@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] NEWS: Add note about
	erc-remove-parsed-property.
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: Fri, 25 Jan 2008 01:50:10 -0000

commit ded83d834ea4371bf175df33607191e4a49e4cc9
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 20:38:38 2008 -0500

    NEWS: Add note about erc-remove-parsed-property.

diff --git a/NEWS b/NEWS
index 9f0cf1c..fba8b52 100644
--- a/NEWS
+++ b/NEWS
@@ -68,6 +68,10 @@ query in a new selected window.
 This should ERC use less space in the modeline.  To get the old
 behavior back, set `erc-mode-line-format' to "%s %a".
 
+** New option `erc-remove-parsed-property' determines whether to remove
+the 'erc-parsed property.  This should save some memory in channels
+with large amounts of text on screen.  It is enabled by default.
+
 ** Modules newly enabled by default
 
 *** move-to-prompt: Move to the prompt when typing text.
@@ -91,6 +95,10 @@ buttons in default text and buttons in notices.
 *** The `erc-assert' function has been removed in favor of using `assert'
 from cl-macs.el.
 
+*** If your application uses the 'erc-parsed text property outside of
+the insert hooks, you will need to set `erc-remove-parsed-property'
+to nil.
+
 ** Changes and additions to modules
 
 *** BBDB (erc-bbdb.el)



From MAILER-DAEMON Thu Jan 24 21:10:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIE1F-0003ix-PC
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JIE1D-0003gg-7B
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIE1A-0003dP-Ua
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIE1A-0003d5-9S
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:08 -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 1JIE19-0007bS-TW
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:08 -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 1JIE19-0008JT-6A
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:07 -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 1JIE17-0004ns-NY
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:06 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 21:10:05 -0500
Date: Thu, 24 Jan 2008 21:10:05 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JIE17-0004ns-NY@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-goodies: Add new keep-place
	module.
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: Fri, 25 Jan 2008 02:10:11 -0000

commit 6a8fc4a4e50d8eee904a1d1681885abd6f4fa9bc
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 21:03:33 2008 -0500

    erc-goodies: Add new keep-place module.

diff --git a/ChangeLog b/ChangeLog
index 57402f0..0270b2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 	* NEWS: Update.
 
+	* erc-goodies.el (keep-place): New module which keeps your place
+	in unvisited ERC buffers when new messages arrive.  This is mostly
+	taken from Johan Bockgård's init file.
+	(erc-noncommands-list): Move to correct place.
+
 	* erc-networks.el: Add a module definition.
 
 	* erc-services.el (erc-nickserv-identify-mode): Force-enable the
@@ -12,6 +17,8 @@
 
 	* erc.el: On second thought, don't load erc-networks.  Just enable
 	the networks module by default.
+	(erc-modules): Add option for keep-place and networks.  Enable
+	networks by default.
 
 2008-01-24  Michael Olson  <mwolson@gnu.org>
 
@@ -100,7 +107,7 @@
 	the user.
 	(move-to-prompt): New module that moves to the ERC prompt if a
 	user tries to type elsewhere in the buffer, and then inserts their
-	keystrokes there.  This is mostly taken from Johan Bockgard's init
+	keystrokes there.  This is mostly taken from Johan Bockgård's init
 	file.
 	(erc-move-to-prompt): New function that implements this.
 	(erc-move-to-prompt-xemacs): New function that implements this for
diff --git a/NEWS b/NEWS
index fba8b52..b53b76c 100644
--- a/NEWS
+++ b/NEWS
@@ -144,6 +144,9 @@ file buffer.
 if a user tries to type elsewhere in the buffer, and then inserts
 their keystrokes after the prompt.  It is enabled by default.
 
+**** New module keep-place keeps your place in unvisited ERC buffers
+when new messages arrive.
+
 **** Enable scroll-to-bottom in all ERC buffers when the module is enabled,
 rather than having the user do it manually.
 
diff --git a/erc-goodies.el b/erc-goodies.el
index 091a90e..ff06546 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -118,18 +118,6 @@ Put this function on `erc-insert-post-hook' and/or `erc-send-post-hook'."
   (put-text-property (point-min) (point-max) 'front-sticky t)
   (put-text-property (point-min) (point-max) 'rear-nonsticky t))
 
-;; Distinguish non-commands
-(defvar erc-noncommands-list '(erc-cmd-ME
-                               erc-cmd-COUNTRY
-                               erc-cmd-SV
-                               erc-cmd-SM
-                               erc-cmd-SMV
-                               erc-cmd-LASTLOG)
-  "List of commands that are aliases for CTCP ACTION or for erc messages.
-
-If a command's function symbol is in this list, the typed command
-does not appear in the ERC buffer after the user presses ENTER.")
-
 ;;; Move to prompt when typing text
 (define-erc-module move-to-prompt nil
   "This mode causes the point to be moved to the prompt when typing text."
@@ -154,6 +142,33 @@ does not appear in the ERC buffer after the user presses ENTER.")
   "Initialize the move-to-prompt module for XEmacs."
   (add-hook 'pre-command-hook 'erc-move-to-prompt nil t))
 
+;;; Keep place in unvisited channels
+(define-erc-module keep-place nil
+  "Leave point above un-viewed text in other channels."
+  ((add-hook 'erc-insert-pre-hook  'erc-keep-place))
+  ((remove-hook 'erc-insert-pre-hook  'erc-keep-place)))
+
+(defun erc-keep-place (ignored)
+  "Move point away from the last line in a non-selected ERC buffer."
+  (when (and (not (eq (window-buffer (selected-window))
+                      (current-buffer)))
+             (>= (point) erc-insert-marker))
+    (deactivate-mark)
+    (goto-char (erc-beg-of-input-line))
+    (forward-line -1)))
+
+;;; Distinguish non-commands
+(defvar erc-noncommands-list '(erc-cmd-ME
+                               erc-cmd-COUNTRY
+                               erc-cmd-SV
+                               erc-cmd-SM
+                               erc-cmd-SMV
+                               erc-cmd-LASTLOG)
+  "List of commands that are aliases for CTCP ACTION or for erc messages.
+
+If a command's function symbol is in this list, the typed command
+does not appear in the ERC buffer after the user presses ENTER.")
+
 (define-erc-module noncommands nil
   "This mode distinguishies non-commands.
 Commands listed in `erc-insert-this' know how to display
diff --git a/erc.el b/erc.el
index 4c54fe7..079faf2 100644
--- a/erc.el
+++ b/erc.el
@@ -1844,12 +1844,13 @@ removed from the list will be disabled."
 	   capab-identify)
     (const :tag "completion: Complete nicknames and commands (programmable)"
 	   completion)
-    (const :tag "dcc: Provide Direct Client-to-Client support" dcc)
     (const :tag "hecomplete: Complete nicknames and commands (old)" hecomplete)
+    (const :tag "dcc: Provide Direct Client-to-Client support" dcc)
     (const :tag "fill: Wrap long lines" fill)
     (const :tag "identd: Launch an identd server on port 8113" identd)
     (const :tag "irccontrols: Highlight or remove IRC control characters"
 	   irccontrols)
+    (const :tag "keep-place: Leave point above un-viewed text" keep-place)
     (const :tag "list: List channels in a separate buffer" list)
     (const :tag "list-old: List channels in a separate buffer (old)" list-old)
     (const :tag "log: Save buffers in logs" log)



From MAILER-DAEMON Thu Jan 24 21:10:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIE1G-0003j7-0t
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JIE1E-0003i1-IP
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIE1D-0003gG-24
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:12 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIE1C-0003fv-KY
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:10 -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 1JIE1C-0007cU-B1
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:10 -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 1JIE1B-0008Jb-Pc
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:09 -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 1JIE1A-0004oT-9Y
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:10:09 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 21:10:08 -0500
Date: Thu, 24 Jan 2008 21:10:08 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JIE1A-0004oT-9Y@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Call this ERC 5.3 release candidate 1.
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: Fri, 25 Jan 2008 02:10:13 -0000

commit 9e75b06786ba488eaccc35530ecc4c3dea858983
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 21:07:48 2008 -0500

    Call this ERC 5.3 release candidate 1.

diff --git a/ChangeLog b/ChangeLog
index 0270b2a..cddd0f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
 	the networks module by default.
 	(erc-modules): Add option for keep-place and networks.  Enable
 	networks by default.
+	(erc-version-string): Make release candidate 1 available.
 
 2008-01-24  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc.el b/erc.el
index 079faf2..cab895c 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.3 (devel)"
+(defconst erc-version-string "Version 5.3 (RC 1)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Thu Jan 24 21:30:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIEKa-0008Oq-5O
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JIEKY-0008O6-4K
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIEKV-0008MO-5o
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIEKU-0008MB-SY
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:06 -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 1JIEKU-0003Da-K0
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:06 -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 1JIEKT-0000xc-PX
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:05 -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 1JIEKS-0005WD-8m
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 21:30:04 -0500
Date: Thu, 24 Jan 2008 21:30:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JIEKS-0005WD-8m@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc.texi: Update copyright dates.
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: Fri, 25 Jan 2008 02:30:10 -0000

commit e8544a67eb72b8ae122d1dbe895f87745428477a
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 21:12:29 2008 -0500

    erc.texi: Update copyright dates.

diff --git a/erc.texi b/erc.texi
index f56afc2..8dfc0db 100644
--- a/erc.texi
+++ b/erc.texi
@@ -14,7 +14,7 @@
 @copying
 This manual is for ERC version 5.2.
 
-Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright @copyright{} 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document



From MAILER-DAEMON Thu Jan 24 21:30:12 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIEKa-0008Om-0d
	for mharc-erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JIEKY-0008OE-E8
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIEKX-0008Np-0H
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:10 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIEKW-0008Nl-Pk
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:08 -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 1JIEKW-0003EE-Ln
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:08 -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 1JIEKW-0000xn-2w
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:08 -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 1JIEKU-0005Wm-KL
	for erc-commit@gnu.org; Thu, 24 Jan 2008 21:30:07 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 24 Jan 2008 21:30:06 -0500
Date: Thu, 24 Jan 2008 21:30:06 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JIEKU-0005Wm-KL@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] News entry or erc-dcc-verbose.
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: Fri, 25 Jan 2008 02:30:10 -0000

commit 099e3c3514629913cff968c2de9bfc7f0610f93b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Jan 24 21:24:18 2008 -0500

    News entry or erc-dcc-verbose.

diff --git a/NEWS b/NEWS
index b53b76c..e4cbd17 100644
--- a/NEWS
+++ b/NEWS
@@ -133,6 +133,9 @@ default is 0.5 MB.
 disk after we get at least `erc-dcc-receive-cache' bytes.  This allows
 users to receive very large files without running out of memory.
 
+**** Rename `erc-verbose-dcc' option to `erc-dcc-verbose' and also
+default it to nil.
+
 **** Fix edge case in erc-dcc-send-sentinel.
 
 **** If client confirms too much, then display byte count and kill the



From MAILER-DAEMON Sat Jan 26 17:20:24 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JItNw-0005z6-B6
	for mharc-erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:24 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JItNu-0005yi-CH
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JItNs-0005yV-1k
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:21 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JItNr-0005yS-R8
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:19 -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 1JItNr-00029R-JP
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:19 -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 1JItNq-00076R-Rq
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:18 -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 1JItNp-0000QY-35
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:18 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 26 Jan 2008 17:20:17 -0500
Date: Sat, 26 Jan 2008 17:20:17 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JItNp-0000QY-35@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Sync from Emacs
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: Sat, 26 Jan 2008 22:20:22 -0000

commit 67c4c2fccc09ee114e706aaca99d763f3c0150fb
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 26 16:24:43 2008 -0500

    Sync from Emacs

diff --git a/ChangeLog b/ChangeLog
index cddd0f8..3fb174c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -288,3 +288,5 @@ See ChangeLog.07 for earlier changes.
 ;; coding: utf-8
 ;; add-log-time-zone-rule: t
 ;; End:
+
+;; arch-tag: 15787dfd-e091-4c8c-8b88-747b474e1ac7
diff --git a/erc-list.el b/erc-list.el
index fc8ec9b..586c720 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -225,3 +225,5 @@ to RFC and send the LIST header (#321) at start of list transmission."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
+
+;; arch-tag: 99c5f9cb-6bac-4224-86bf-e394768cd1d0



From MAILER-DAEMON Sat Jan 26 17:20:25 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JItNx-0005zt-J8
	for mharc-erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JItNw-0005zT-N5
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:24 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JItNv-0005yq-8M
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:24 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JItNv-0005yn-58
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:23 -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 1JItNu-0002AL-Oy
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:22 -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 1JItNu-00076a-B1
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:22 -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 1JItNs-0000ST-Ib
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:21 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 26 Jan 2008 17:20:20 -0500
Date: Sat, 26 Jan 2008 17:20:20 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JItNs-0000ST-Ib@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Release ERC 5.3.
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: Sat, 26 Jan 2008 22:20:25 -0000

commit abd8ce6237825e640bdea8d85c37dd831e1174da
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 26 16:39:59 2008 -0500

    Release ERC 5.3.

diff --git a/ChangeLog b/ChangeLog
index 3fb174c..23057fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-01-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-version-string): Release ERC 5.3.
+
+	* Makefile (VERSION): Update.
+	(EXTRAS): Remove erc-list.el after all, because this is mainly for
+	users of the version that comes with Emacs, and they will have
+	erc-list.el by Emacs 23.
+	(MISC): Add ChangeLog.07.
+
+	* README.extras: Mention Emacs 23.
+
+	* erc.texi (Obtaining ERC): Update extras URLs for 5.3.
+	(Development): Write instructions for git, and remove those for
+	Arch.
+	(History): Mention the switch to git.
+
 2008-01-25  Michael Olson  <mwolson@gnu.org>
 
 	* NEWS: Update.
diff --git a/Makefile b/Makefile
index d35c60d..72c39ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.2
+VERSION=5.3
 SNAPDIR=erc-$(VERSION)
 LASTUPLOAD = 5.1.4-4
 BUILDOPTS  =
@@ -7,17 +7,17 @@ SPECIAL = erc-auto.el
 UNCOMPILED = erc-bbdb.el erc-chess.el erc-ibuffer.el erc-speak.el \
 		erc-speedbar.el erc-compat.el
 
-# Files to include in the extras pack for Emacs 22
-EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-list-old.el \
-		erc-nicklist.el erc-speak.el README.extras COPYING
+# Files to include in the extras pack for Emacs 23
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list-old.el erc-nicklist.el \
+		erc-speak.el README.extras COPYING
 
 ALLSOURCE = $(wildcard *.el)
 SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED) erc-pkg.el, $(ALLSOURCE))
 TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
 MISC	= AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
-		ChangeLog.06 ChangeLog.05 ChangeLog.04 ChangeLog.03 \
-		ChangeLog.02 ChangeLog.01 \
+		ChangeLog.07 ChangeLog.06 ChangeLog.05 ChangeLog.04 \
+		ChangeLog.03 ChangeLog.02 ChangeLog.01 \
 		servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
diff --git a/README.extras b/README.extras
index a610e46..6b6fe1c 100644
--- a/README.extras
+++ b/README.extras
@@ -7,7 +7,7 @@ About
 -----
 
 The files included here are those which could not be distributed with
-the version of ERC that comes with Emacs 22.  The reasons might include:
+the version of ERC that comes with Emacs 23.  The reasons might include:
 
  - No copyright disclaimer was completed for an author of the file.
  - Depends on files which are not distibuted with Emacs.
diff --git a/erc.el b/erc.el
index cab895c..8b289a8 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.3 (RC 1)"
+(defconst erc-version-string "Version 5.3"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
diff --git a/erc.texi b/erc.texi
index 8dfc0db..7013a61 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.2.
+This manual is for ERC version 5.3.
 
 Copyright @copyright{} 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
@@ -65,7 +65,7 @@ and modified without restriction.
                                   permission to redistribute ERC on
                                   certain terms; it also explains that
                                   there is no warranty.
-* GNU Free Documentation License:: The license for this documentation.
+* GNU Free Documentation License::  The license for this documentation.
 * Concept Index::               Search for terms.
 
 @detailmenu
@@ -128,8 +128,8 @@ dependency issues.  If desired, they may be found at the following
 locations, or from your local GNU mirror.
 
 @itemize @bullet
-@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz}
-@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip}
+@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.tar.gz}
+@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.zip}
 @end itemize
 
 The rest of this chapter may be skipped if you are using the version of
@@ -162,67 +162,100 @@ Alternatively, you can download the latest release from
 Choose the development version if you want to live on the bleeding edge
 of ERC development or try out new features before release.
 
-@subheading GNU Arch
+@cindex git version control system, using
+The git version control system allows you to keep up-to-date with the
+latest changes to the development version of ERC.  It also allows you
+to contribute changes (via commits, if you are have developer access to
+the repository, or via patches, otherwise).  If you would like to
+contribute to ERC development, it is highly recommended that you use
+git.
 
-ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
-up-to-date involves the following steps.
+If you are new to git, you might find this tutorial helpful:
+@uref{http://www.kernel.org/pub/software/scm/git/docs/tutorial.html}.
+
+Downloading ERC with git and staying up-to-date involves the following
+steps.
 
 @enumerate
-@cindex GNU Arch, installing
-@item Install arch
+@item Install git.
 
 @itemize @bullet
-@item Debian: @kbd{apt-get install tla}.
-@item Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
+@item Debian and Ubuntu: @kbd{apt-get install git-core}.
+@item Windows: @uref{http://git.or.cz/gitwiki/WindowsInstall}.
+@item Other operating systems: download, compile, and install the source
+from @uref{http://www.kernel.org/pub/software/scm/git/}, or find a git
+package for your operating system.
 @end itemize
 
-@cindex GNU Arch, downloading ERC
-@item Register the archive.
+@item Download the ERC development branch.
+
+If you have developer access to ERC, do:
+
+@example
+git clone ssh://loginname@@git.sv.gnu.org/srv/git/erc.git
+@end example
+
+otherwise, do:
+
 @example
-tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
+git clone git://git.sv.gnu.org/erc.git
 @end example
 
-@item Download the ERC source code.
+If you are behind a restrictive firewall, and do not have developer
+access, then do the following instead:
+
 @example
-# Download ERC into the @file{erc} directory.
-tla get erc@@sv.gnu.org/erc--main--0 erc
+git clone http://git.sv.gnu.org/r/erc.git
 @end example
 
 @item List upstream changes that are missing from your local copy.
 Do this whenever you want to see whether new changes have been committed
-to ERC.
+to ERC.  If you wish, you may skip this step and proceed directly to
+the ``update'' step.
 
 @example
 # Change to the source directory you are interested in.
-cd erc/
+cd erc
+
+# Fetch new changes from the repository, but don't apply them yet
+git fetch origin
 
-# Display the summary of changes
-tla missing --summary
+# Display log messages for the new changes
+git log HEAD..origin
 @end example
 
-@cindex GNU Arch, updating ERC
-@item Update to the latest version by replaying missing changes.
+``origin'' is git's name for the location where you originally got ERC
+from.  You can change this location at any time by editing the
+@file{.git/config} file in the directory where the ERC source was
+placed.
+
+@cindex updating ERC with git
+@item Update to the latest version by pulling in any missing changes.
+
 @example
 cd erc
-tla update
+git pull origin
 @end example
 
+git will show how many files changed, and will provide a visual display
+for how many lines were changed in each file.
+
 @end enumerate
 
-If you are new to Arch and want to learn more about developing ERC with
-it, visit @uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment} for
-full instructions.
+There are other ways to interact with the ERC repository.
 
-@subheading Development snapshots
+@itemize
+@item Browse git repo: @uref{http://git.sv.gnu.org/gitweb/?p=erc.git}
+@item Latest development snapshot: @uref{http://mwolson.org/static/dist/erc-latest.tar.gz}
+@item Latest development snapshot (zip file): @uref{http://mwolson.org/static/dist/erc-latest.zip}
+@end itemize
 
-@cindex development snapshot
-Alternatively, the latest development snapshot may be downloaded in both
-``.tar.gz'' and ``.zip'' forms.
+The latest development snapshot can lag behind the git repo by as much
+as 20 minutes, but never more than that.
 
-@itemize @bullet
-@item @uref{http://www.mwolson.org/static/dist/erc-latest.tar.gz}
-@item @uref{http://www.mwolson.org/static/dist/erc-latest.zip}
-@end itemize
+For further information on committing changes to ERC and performing
+development, please consult
+@uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment}.
 
 
 @node Installation, Getting Started, Obtaining ERC, Top
@@ -1006,6 +1039,10 @@ ERC became an official GNU project, and development moved to
 @uref{http://sv.gnu.org/projects/erc}.  We switched to using GNU Arch as
 our revision control system.  Our mailing list address changed as well.
 
+@item 2007
+
+We switched to using git for our version control system.
+
 @end itemize
 
 @node Copying, GNU Free Documentation License, History, Top



From MAILER-DAEMON Sat Jan 26 17:20:28 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JItO0-00061G-Pw
	for mharc-erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JItNz-00061B-MC
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:27 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JItNy-00060c-DA
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:27 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JItNx-000609-Vr
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:26 -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 1JItNx-0002As-Cv
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:25 -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 1JItNw-00076g-Uo
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:24 -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 1JItNv-0000U7-Ck
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:20:24 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 26 Jan 2008 17:20:23 -0500
Date: Sat, 26 Jan 2008 17:20:23 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JItNv-0000U7-Ck@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix build issue for ELPA package.
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: Sat, 26 Jan 2008 22:20:28 -0000

commit 765ca0e01a599d0ff6feaaeb21ae02b2d57e78b1
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 26 16:57:52 2008 -0500

    Fix build issue for ELPA package.

diff --git a/ChangeLog b/ChangeLog
index 23057fa..1a872a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	users of the version that comes with Emacs, and they will have
 	erc-list.el by Emacs 23.
 	(MISC): Add ChangeLog.07.
+	(elpa): Fix build issue.
 
 	* README.extras: Mention Emacs 23.
 
diff --git a/Makefile b/Makefile
index 72c39ff..54e4df2 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ elpa: $(MANUAL).info
 	cp -r images $(ELPA)/$(SNAPDIR)
 	cp erc-pkg.el $(ELPA)/$(SNAPDIR)
 	cp $(MANUAL).info $(ELPA)/$(SNAPDIR)
-	cp dir-template $(ELPADIR)/$(SNAPDIR)/dir
+	cp dir-template $(ELPA)/$(SNAPDIR)/dir
 	install-info --section "Emacs" "Emacs" \
 	  --info-dir=$(ELPA)/$(SNAPDIR) \
 	  $(ELPA)/$(SNAPDIR)/$(MANUAL).info



From MAILER-DAEMON Sat Jan 26 17:40:09 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JIth3-0005tw-MN
	for mharc-erc-commit@gnu.org; Sat, 26 Jan 2008 17:40:09 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JIth2-0005ta-V8
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:40:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JIth1-0005sZ-BU
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:40:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JIth1-0005sV-6l
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:40:07 -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 1JIth0-0005yt-Tv
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:40:07 -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 1JIth0-0007us-AH
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:40:06 -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 1JItgy-00012Y-5i
	for erc-commit@gnu.org; Sat, 26 Jan 2008 17:40:05 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sat, 26 Jan 2008 17:40:04 -0500
Date: Sat, 26 Jan 2008 17:40:04 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JItgy-00012Y-5i@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] ELPA: Generate proper version in
	erc-pkg.el.
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: Sat, 26 Jan 2008 22:40:09 -0000

commit 4399c328c90e770e3fb1f1b8dd83f9f651fb7038
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Jan 26 17:39:11 2008 -0500

    ELPA: Generate proper version in erc-pkg.el.

diff --git a/ChangeLog b/ChangeLog
index 1a872a9..f69ed5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,10 +7,12 @@
 	users of the version that comes with Emacs, and they will have
 	erc-list.el by Emacs 23.
 	(MISC): Add ChangeLog.07.
-	(elpa): Fix build issue.
+	(elpa): Fix build issue.  Add proper version to erc-pkg.el.
 
 	* README.extras: Mention Emacs 23.
 
+	* erc-pkg.el: Make the version string a template.
+
 	* erc.texi (Obtaining ERC): Update extras URLs for 5.3.
 	(Development): Write instructions for git, and remove those for
 	Arch.
diff --git a/Makefile b/Makefile
index 54e4df2..a3ab1f0 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,8 @@ elpa: $(MANUAL).info
 	mkdir -p $(ELPA)/$(SNAPDIR) && chmod 0755 $(ELPA)/$(SNAPDIR)
 	cp $(UNCOMPILED) $(SOURCE) $(ELPA)/$(SNAPDIR)
 	cp -r images $(ELPA)/$(SNAPDIR)
-	cp erc-pkg.el $(ELPA)/$(SNAPDIR)
+	sed -r -e "s/%VERSION%/$(VERSION)/g" < erc-pkg.el \
+	  > $(ELPA)/$(SNAPDIR)/erc-pkg.el
 	cp $(MANUAL).info $(ELPA)/$(SNAPDIR)
 	cp dir-template $(ELPA)/$(SNAPDIR)/dir
 	install-info --section "Emacs" "Emacs" \
diff --git a/erc-pkg.el b/erc-pkg.el
index 23a73a0..a72a03f 100644
--- a/erc-pkg.el
+++ b/erc-pkg.el
@@ -1,3 +1,3 @@
 ;; ELPA package definition for ERC
 
-(define-package "erc" "5.2" "An Emacs Internet Relay Chat client")
+(define-package "erc" "%VERSION%" "An Emacs Internet Relay Chat client")



From MAILER-DAEMON Sun Jan 27 23:30:33 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JJLdg-00032y-Pc
	for mharc-erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:32 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JJLde-00032Q-QS
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JJLde-00032E-1K
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:30 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JJLdd-000329-Pk
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:29 -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 1JJLdd-0000pQ-Uo
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:30 -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 1JJLdc-0003bX-Hu
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:28 -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 1JJLdb-0003km-Ae
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:28 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 27 Jan 2008 23:30:27 -0500
Date: Sun, 27 Jan 2008 23:30:27 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JJLdb-0003km-Ae@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Use the mode-line faces if
	no priority face is found.
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: Mon, 28 Jan 2008 04:30:31 -0000

commit d00667cf56bbef67dbecf22bd8d9323b11433f05
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Mon Jan 28 03:27:09 2008 +0100

    erc-track: Use the mode-line faces if no priority face is found.
    
    * erc-track.el (erc-track-find-face): If no choice was found
    return nil to use the default mode-line faces.

diff --git a/ChangeLog b/ChangeLog
index f69ed5f..dfd12a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-28  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-track.el (erc-track-find-face): If no choice was found
+	return nil to use the default mode-line faces.
+
 2008-01-26  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-version-string): Release ERC 5.3.
diff --git a/erc-track.el b/erc-track.el
index 360d92c..8f6f7aa 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -867,17 +867,16 @@ Use `erc-make-mode-line-buffer-name' to create buttons."
 
 (defun erc-track-find-face (faces)
   "Return the face to use in the modeline from the faces in FACES.
-If `erc-track-faces-priority-list' is set, the one from FACES who is
-first in that list will be used.
+If `erc-track-faces-priority-list' is set, the one from FACES who
+is first in that list will be used.  If nothing matches of if
+`erc-track-faces-priority-list' is not set, the default mode-line
+faces will be used.
 
 If `erc-track-faces-normal-list' is non-nil, use it to produce a
 blinking effect that indicates channel activity when the first
 element in FACES and the highest-ranking face among the rest of
 FACES are both members of `erc-track-faces-normal-list'.
 
-If `erc-track-faces-priority-list' is not set, the first element
-in FACES will be used.
-
 If one of the faces is a list, then it will be ranked according
 to its highest-tanking face member.  A list of faces including
 that member will take priority over just the single member
@@ -892,7 +891,7 @@ element."
 			   (when (member candidate (cdr faces))
 			     (throw 'face candidate)))))))
     (cond ((null choice)
-	   (car faces))
+	   nil)
 	  ((and (member choice erc-track-faces-normal-list)
 		(member no-first erc-track-faces-normal-list))
 	   no-first)



From MAILER-DAEMON Sun Jan 27 23:30:35 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JJLdi-00033q-V7
	for mharc-erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:35 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JJLdh-00033V-Mn
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JJLdg-00032k-2O
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:33 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JJLdf-00032h-TP
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:31 -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 1JJLdf-0000pk-Ro
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:32 -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 1JJLde-0003be-Sr
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:30 -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 1JJLdd-0003lO-LQ
	for erc-commit@gnu.org; Sun, 27 Jan 2008 23:30:30 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Sun, 27 Jan 2008 23:30:29 -0500
Date: Sun, 27 Jan 2008 23:30:29 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JJLdd-0003lO-LQ@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fixed list-old's erc module
	definition.
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: Mon, 28 Jan 2008 04:30:33 -0000

commit c5ad360babcd69d84879e4a022d34b017d495626
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Mon Jan 28 03:55:24 2008 +0100

    Fixed list-old's erc module definition.
    
    * erc-list-old.el (list-old): Define module as list-old, not list.
    This fixes a bug where an unknown module error would occur when
    starting ERC and using the list-old module.

diff --git a/ChangeLog b/ChangeLog
index dfd12a4..b5b4a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-28  Diane Murray  <disumu@x3y2z1.net>
 
+	* erc-list-old.el (list-old): Define module as list-old, not list.
+	This fixes a bug where an unknown module error would occur when
+	starting ERC and using the list-old module.
+
 	* erc-track.el (erc-track-find-face): If no choice was found
 	return nil to use the default mode-line faces.
 
diff --git a/erc-list-old.el b/erc-list-old.el
index d6cfa3a..3725738 100644
--- a/erc-list-old.el
+++ b/erc-list-old.el
@@ -143,7 +143,7 @@ display the channel list."
 
 ;; Define module:
 ;;;###autoload (autoload 'erc-list-old-mode "erc-list-old")
-(define-erc-module list nil
+(define-erc-module list-old nil
   "List channels nicely in a separate buffer."
   ((defalias 'erc-cmd-LIST 'erc-list-channels))
   ((defalias 'erc-cmd-LIST 'erc-list-channels-simple)))



From MAILER-DAEMON Mon Jan 28 00:00:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JJM6Q-0005HH-F1
	for mharc-erc-commit@gnu.org; Mon, 28 Jan 2008 00:00:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JJM6P-0005GD-4j
	for erc-commit@gnu.org; Mon, 28 Jan 2008 00:00:13 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JJM6O-0005F6-7G
	for erc-commit@gnu.org; Mon, 28 Jan 2008 00:00:12 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JJM6N-0005Ey-Gt
	for erc-commit@gnu.org; Mon, 28 Jan 2008 00:00:11 -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 1JJM6N-0005FB-I1
	for erc-commit@gnu.org; Mon, 28 Jan 2008 00:00:11 -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 1JJM6L-0004kl-DJ
	for erc-commit@gnu.org; Mon, 28 Jan 2008 00:00:10 -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 1JJM6K-0004oo-4J
	for erc-commit@gnu.org; Mon, 28 Jan 2008 00:00:09 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Mon, 28 Jan 2008 00:00:08 -0500
Date: Mon, 28 Jan 2008 00:00:08 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JJM6K-0004oo-4J@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Minor cosmetic changes.
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: Mon, 28 Jan 2008 05:00:13 -0000

commit a1fae567a8c6b85fea49140c7120f09e536eb08a
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Jan 27 23:53:50 2008 -0500

    erc-track: Minor cosmetic changes.
    
    * erc-track.el (erc-modified-channels-display): Indentation.
      (erc-track-find-face): Typo.

diff --git a/erc-track.el b/erc-track.el
index 8f6f7aa..3a7511c 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -854,7 +854,7 @@ Use `erc-make-mode-line-buffer-name' to create buttons."
       (when (featurep 'xemacs)
 	(erc-modified-channels-object nil))
       (setq erc-modified-channels-object
-	      (erc-modified-channels-object strings))))))
+	    (erc-modified-channels-object strings))))))
 
 (defun erc-modified-channels-remove-buffer (buffer)
   "Remove BUFFER from `erc-modified-channels-alist'."
@@ -868,7 +868,7 @@ Use `erc-make-mode-line-buffer-name' to create buttons."
 (defun erc-track-find-face (faces)
   "Return the face to use in the modeline from the faces in FACES.
 If `erc-track-faces-priority-list' is set, the one from FACES who
-is first in that list will be used.  If nothing matches of if
+is first in that list will be used.  If nothing matches or if
 `erc-track-faces-priority-list' is not set, the default mode-line
 faces will be used.
 



From MAILER-DAEMON Wed Jan 30 20:10:14 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JKNwU-0000N1-Ol
	for mharc-erc-commit@gnu.org; Wed, 30 Jan 2008 20:10:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JKNwT-0000Mw-B5
	for erc-commit@gnu.org; Wed, 30 Jan 2008 20:10:13 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JKNwR-0000Mj-Ow
	for erc-commit@gnu.org; Wed, 30 Jan 2008 20:10:13 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JKNwR-0000Mg-M9
	for erc-commit@gnu.org; Wed, 30 Jan 2008 20:10:11 -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 1JKNwR-0008QU-Ct
	for erc-commit@gnu.org; Wed, 30 Jan 2008 20:10:11 -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 1JKNwQ-0006H1-Mz
	for erc-commit@gnu.org; Wed, 30 Jan 2008 20:10:10 -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 1JKNwP-0007r0-DN
	for erc-commit@gnu.org; Wed, 30 Jan 2008 20:10:10 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Wed, 30 Jan 2008 20:10:09 -0500
Date: Wed, 30 Jan 2008 20:10:09 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JKNwP-0007r0-DN@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-dcc: Make file names with spaces
	in them work, in a very lazy way.
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: Thu, 31 Jan 2008 01:10:13 -0000

commit e0b2b8deef3daab539a55a9f3abd1e3bc43e8c5e
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Jan 30 20:05:01 2008 -0500

    erc-dcc: Make file names with spaces in them work, in a very lazy way.

diff --git a/ChangeLog b/ChangeLog
index b5b4a34..74210b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-31  Michael Olson  <mwolson@gnu.org>
+
+	* erc-dcc.el (erc-dcc-do-GET-command, erc-dcc-do-SEND-command):
+	Improve docstring.  If FILE argument is split into multiple
+	arguments, re-join them into a single string, separated by a
+	space.  This fixes an issue where the user wants to send or
+	receive a file with spaces in its name.  It is assumed that no one
+	will try sending or receiving a file with multiple consecutive
+	spaces in its name, otherwise this fix will fail.
+
 2008-01-28  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-list-old.el (list-old): Define module as list-old, not list.
diff --git a/erc-dcc.el b/erc-dcc.el
index 2aca064..a31f87b 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -474,7 +474,12 @@ type and nick are optional."
            ?n (erc-extract-nick (plist-get ret :nick))))))
       t))
 
-(defun erc-dcc-do-GET-command (proc nick &optional file)
+(defun erc-dcc-do-GET-command (proc nick &rest file)
+  "Do a DCC GET command.  NICK is the person who is sending the file.
+FILE is the filename.  If FILE is split into multiple arguments,
+re-join the arguments, separated by a space.
+PROC is the server process."
+  (setq file (and file (mapconcat #'identity file " ")))
   (let* ((elt (erc-dcc-member :nick nick :type 'GET))
          (filename (or file (plist-get elt :file) "unknown")))
     (if elt
@@ -547,8 +552,11 @@ It lists the current state of `erc-dcc-list' in an easy to read manner."
      'dcc-list-end)
     t))
 
-(defun erc-dcc-do-SEND-command (proc nick file)
-  "Offer FILE to NICK by sending a ctcp dcc send message."
+(defun erc-dcc-do-SEND-command (proc nick &rest file)
+  "Offer FILE to NICK by sending a ctcp dcc send message.
+If FILE is split into multiple arguments, re-join the arguments,
+separated by a space."
+  (setq file (and file (mapconcat #'identity file " ")))
   (if (file-exists-p file)
       (progn
         (erc-display-message



From MAILER-DAEMON Thu Jan 31 14:30:16 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JKf71-0006QH-Ms
	for mharc-erc-commit@gnu.org; Thu, 31 Jan 2008 14:30:15 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JKf70-0006P5-HD
	for erc-commit@gnu.org; Thu, 31 Jan 2008 14:30:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JKf6y-0006N2-Na
	for erc-commit@gnu.org; Thu, 31 Jan 2008 14:30:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JKf6y-0006Mk-Gq
	for erc-commit@gnu.org; Thu, 31 Jan 2008 14:30:12 -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 1JKf6y-0007Zh-EX
	for erc-commit@gnu.org; Thu, 31 Jan 2008 14:30:12 -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 1JKf6x-0006r6-Fb
	for erc-commit@gnu.org; Thu, 31 Jan 2008 14:30:11 -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 1JKf6w-00083x-9r
	for erc-commit@gnu.org; Thu, 31 Jan 2008 14:30:11 -0500
Received: by mire.hcoop.net (sSMTP sendmail emulation);
	Thu, 31 Jan 2008 14:30:10 -0500
Date: Thu, 31 Jan 2008 14:30:10 -0500
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1JKf6w-00083x-9r@mire.hcoop.net>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc.el (erc-mode-map): Add binding
	for C-c C-x to erc-quit-server.
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: Thu, 31 Jan 2008 19:30:14 -0000

commit 8d2731974700e71715fcf8df2ff50e39c8c44734
Author: Michael W. Olson <mwolson@gnu.org>
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  <disumu@x3y2z1.net>
 
 	* 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)
 



