From MAILER-DAEMON Fri Oct 05 17:18:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IduZ4-0001Kv-0b
	for mharc-erc-commit@gnu.org; Fri, 05 Oct 2007 17:18:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IduZ1-0001Kb-O7
	for erc-commit@gnu.org; Fri, 05 Oct 2007 17:18:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IduZ0-0001JK-3E
	for erc-commit@gnu.org; Fri, 05 Oct 2007 17:18:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IduZ0-0001J7-09
	for erc-commit@gnu.org; Fri, 05 Oct 2007 17:18:26 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1IduYz-0001K4-Ox
	for erc-commit@gnu.org; Fri, 05 Oct 2007 17:18:25 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1Iduac-0005X2-HV
	for erc-commit@gnu.org; Fri, 05 Oct 2007 17:20:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1Iduac-0005X2-HV@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Fri, 05 Oct 2007 17:20:06 -0400
X-Detected-Kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] .
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, 05 Oct 2007 21:18:28 -0000

commit 52e4c9dc4ee4b0bf94e07bd7eace5ee7e3547c38
Author: Exal de Jesus Garcia Carrillo <exal@alice.nipl.net>
Date:   Fri Oct 5 16:15:19 2007 -0500

    .

diff --git a/CREDITS b/CREDITS
index d14a9a6..8964364 100644
--- a/CREDITS
+++ b/CREDITS
@@ -164,7 +164,7 @@ Vivek Dasmohapatra <vivek AT etla DOT org>:
 Ivan Kanis <apple AT kanis DOT eu>:
   * Fixed window ordering bug in erc-goodies.el (1 line changed).
 
-Exal de Jesus Garcia Carrillo  <exal AT gmx DOT de>:
+Exal de Jesus Garcia Carrillo  <exal AT gnu DOT org>:
   * Fixed some typos in the documentation.
 
 Aidan Kehoe  <kehoea AT parhasard DOT net>:
diff --git a/ChangeLog b/ChangeLog
index a63508b..b686f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
 	* 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@gmx.de>  (tiny change)
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
 
 	* erc.texi (Special-Features): Fix small typo.
 



From MAILER-DAEMON Sat Oct 06 21:48:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IeLFs-0002YA-KK
	for mharc-erc-commit@gnu.org; Sat, 06 Oct 2007 21:48:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IeLFr-0002Wj-Oy
	for erc-commit@gnu.org; Sat, 06 Oct 2007 21:48:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IeLFq-0002Uq-TU
	for erc-commit@gnu.org; Sat, 06 Oct 2007 21:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IeLFq-0002Uc-Nx
	for erc-commit@gnu.org; Sat, 06 Oct 2007 21:48:26 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1IeLFq-0001Dl-Ia
	for erc-commit@gnu.org; Sat, 06 Oct 2007 21:48:26 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IeLHU-0005KA-Bl
	for erc-commit@gnu.org; Sat, 06 Oct 2007 21:50:08 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IeLHU-0005KA-Bl@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sat, 06 Oct 2007 21:50:08 -0400
X-Detected-Kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] Add "/me's" command
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, 07 Oct 2007 01:48:28 -0000

commit b6aee7017492988a0b0c64d90a2675623bf3a85c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Oct 6 21:43:01 2007 -0400

    Add "/me's" command
    
    * 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.

diff --git a/ChangeLog b/ChangeLog
index b686f12..285c045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/erc.el b/erc.el
index d8459dc..6957e3d 100644
--- a/erc.el
+++ b/erc.el
@@ -3016,6 +3016,11 @@ LINE has the format \"USER ACTION\"."
    (t nil)))
 (put 'erc-cmd-ME 'do-not-parse-args t)
 
+(defun erc-cmd-ME\'S (line)
+  "Do a /ME command, but add the string \" 's\" to the beginning."
+  (erc-cmd-ME (concat " 's" line)))
+(put 'erc-cmd-ME\'S 'do-not-parse-args t)
+
 (defun erc-cmd-LASTLOG (line)
   "Show all lines in the current buffer matching the regexp LINE.
 
@@ -5035,7 +5040,7 @@ Specifically, return the position of `erc-insert-marker'."
    erc-input-marker
    (erc-end-of-input-line)))
 
-(defvar erc-command-regexp "^/\\([A-Za-z]+\\)\\(\\s-+.*\\|\\s-*\\)$"
+(defvar erc-command-regexp "^/\\([A-Za-z']+\\)\\(\\s-+.*\\|\\s-*\\)$"
   "Regular expression used for matching commands in ERC.")
 
 (defun erc-send-input (input)



From MAILER-DAEMON Fri Oct 12 11:38:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgMap-0005cN-N6
	for mharc-erc-commit@gnu.org; Fri, 12 Oct 2007 11:38:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgMan-0005cH-TM
	for erc-commit@gnu.org; Fri, 12 Oct 2007 11:38:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgMam-0005b5-Bn
	for erc-commit@gnu.org; Fri, 12 Oct 2007 11:38:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgMam-0005b2-81
	for erc-commit@gnu.org; Fri, 12 Oct 2007 11:38:24 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1IgMam-00032R-6h
	for erc-commit@gnu.org; Fri, 12 Oct 2007 11:38:24 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgMcU-00023v-VV
	for erc-commit@gnu.org; Fri, 12 Oct 2007 11:40:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgMcU-00023v-VV@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Fri, 12 Oct 2007 11:40:10 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] C-u C-c C-j prompts for channel key.
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, 12 Oct 2007 15:38:26 -0000

commit ea0904af187c052913068e4ace41f6c75911f6bc
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Fri Oct 12 17:32:58 2007 +0200

    C-u C-c C-j prompts for channel key.
    
    * erc.el (erc-join-channel): Prompt for channel key if C-u or
    another prefix-arg was typed.
    
    * NEWS: Noted this change.

diff --git a/ChangeLog b/ChangeLog
index 285c045..c8a7c99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/NEWS b/NEWS
index 483c8b3..991bfe1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ It requires the tls.el library.
 ** The function `erc-ssl' will now always use ssl.el, even in the version
 of ERC that comes with Emacs.
 
+** Type `C-u' before `C-c C-j' to prompt for a channel key
+`erc-join-channel' now accepts a prefix-argument to prompt for the key
+when channels are protected by keywords.
+
 ** Changes and additions to modules
 
 *** Channel tracking (erc-track.el)
diff --git a/erc.el b/erc.el
index 6957e3d..18efee6 100644
--- a/erc.el
+++ b/erc.el
@@ -3676,7 +3676,7 @@ If `point' is at the beginning of a channel name, use that as default."
 		   (set-buffer (process-buffer erc-server-process))
 		   erc-channel-list)))
       (completing-read "Join channel: " table nil nil nil nil chnl))
-    (when erc-prompt-for-channel-key
+    (when (or current-prefix-arg erc-prompt-for-channel-key)
       (read-from-minibuffer "Channel key (RET for none): " nil))))
   (erc-cmd-JOIN channel (when (>= (length key) 1) key)))
 



From MAILER-DAEMON Sun Oct 14 00:48:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvOc-0004lV-Oo
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOV-0004hn-Ou
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOU-0004gi-VD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOU-0004gR-P0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
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@hcoop.net>) id 1IgvOU-0003oX-C5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOT-0004wx-ID
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOT-000557-KM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOT-000557-KM@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:48:06 -0000

commit 5e97358dc2eb4325c7182f7e62aceab8e53a9587
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Feb 11 23:51:09 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-114

diff --git a/erc-stamp.el b/erc-stamp.el
index cf5a37e..0b27fb2 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -38,7 +38,7 @@
 (require 'erc)
 (require 'erc-compat)
 
-(defconst erc-stamp-version "$Revision: 1.54 $"
+(defconst erc-stamp-version "$Revision: 1.55 $"
   "ERC stamp mode revision.")
 
 (defgroup erc-stamp nil



From MAILER-DAEMON Sun Oct 14 00:49:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPV-0005Bx-1V
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPU-0005Bs-58
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPN-00059a-U1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPM-00059A-Qb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
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@hcoop.net>) id 1IgvPM-00044r-CD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPL-0005GU-G5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPL-0006Ww-JD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPL-0006Ww-JD@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:55 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Makefile: Fix name of ChangeLog files
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, 14 Oct 2007 04:49:04 -0000

commit f6d782a7d18d44412aae506d5494568b8223f149
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 01:40:46 2007 +0000

    Makefile: Fix name of ChangeLog files
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-133

diff --git a/ChangeLog b/ChangeLog
index d0d3536..95f6c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,8 @@
 	(EXTRAS): New variable containing the contents of our "Emacs 22
 	extras" tarball.
 	(SOURCE): Remove $(TESTING).
-	(MISC): Add COPYING and ChangeLog.2006.
+	(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.
diff --git a/Makefile b/Makefile
index dbd9ab6..93b9914 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED), $(ALLSOURCE))
 TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
 MISC	= AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
-		ChangeLog.2006 ChangeLog.2005 ChangeLog.2004 \
-		ChangeLog.2003 ChangeLog.2002 ChangeLog.2001 \
+		ChangeLog.06 ChangeLog.05 ChangeLog.04 ChangeLog.03 \
+		ChangeLog.02 ChangeLog.01 \
 		servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
diff --git a/NEWS b/NEWS
index bce99d5..9c97183 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,7 @@ MS-DOS operating system.
  o erc-autojoin.el -> erc-join.el
  o erc-complete.el -> erc-hecomplete.el
  o erc-nickserv.el -> erc-services.el
+ o ChangeLog.NNNN -> ChangeLog.NN
 
 ** Header line changes
 



From MAILER-DAEMON Sun Oct 14 00:49:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPl-0005Ky-AH
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPk-0005Jl-1Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPj-0005JZ-Ik
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPj-0005JW-Gr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
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@hcoop.net>) id 1IgvPj-0004B2-59
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPi-0005Pp-BA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPi-000793-Ej
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPi-000793-Ej@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:18 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fixed small typo.
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, 14 Oct 2007 04:49:20 -0000

commit da759ad4bf859d6f1a1a30becb2abb31161a5752
Author: Exal de Jesus Garcia Carrillo <exal@gnu.org>
Date:   Tue Sep 18 13:35:10 2007 -0500

    Fixed small typo.

diff --git a/erc.texi b/erc.texi
index 405082e..f56afc2 100644
--- a/erc.texi
+++ b/erc.texi
@@ -386,7 +386,7 @@ buffers in Emacs.  We call these ``query buffers''.
 
 @item highlighting
 
-Some occurences of words can be highlighted, which makes it easier to
+Some occurrences of words can be highlighted, which makes it easier to
 track different kinds of conversations.
 
 @item notification



From MAILER-DAEMON Sun Oct 14 00:49:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPo-0005NI-5j
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPl-0005KR-Ap
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPj-0005JJ-5I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPj-0005JG-2S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
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@hcoop.net>) id 1IgvPi-0004Am-HW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPh-0005Pd-Q6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPh-000783-Ru
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPh-000783-Ru@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fixed typo in erc-sound.el setting
	up instructions.
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, 14 Oct 2007 04:49:22 -0000

commit 5f780c762e2b095d256a904371eb0280ec28f6ba
Author: Exal de Jesus Garcia Carrillo <exal@gnu.org>
Date:   Tue Sep 11 16:48:02 2007 -0500

    Fixed typo in erc-sound.el setting up instructions.

diff --git a/ChangeLog b/ChangeLog
index c0a9eab..80ab5c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-11  Exal de Jesus  Garcia Carrillo  <exal@gnu.org>
+
+	* 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
diff --git a/erc-sound.el b/erc-sound.el
index d02887a..7a1a281 100644
--- a/erc-sound.el
+++ b/erc-sound.el
@@ -30,7 +30,7 @@
 
 ;; Add the following to your .emacs if you want to play sounds.
 ;;
-;; (require 'erc-soud)
+;; (require 'erc-sound)
 ;; (erc-sound-enable)
 ;;
 ;; To send requests to other users from within query buffers, type the



From MAILER-DAEMON Sun Oct 14 00:49:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPv-0005UH-5X
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPm-0005MB-82
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPj-0005JR-BP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPj-0005JO-9H
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
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@hcoop.net>) id 1IgvPi-0004As-Sk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPi-0005Pj-3A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPi-00078X-5R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPi-00078X-5R@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:18 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-track: Docfix
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, 14 Oct 2007 04:49:23 -0000

commit deedec3b6caba241795c36b860311ef00ef6dc0b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 16 16:22:36 2007 -0400

    erc-track: Docfix
    
    * erc-track.el (erc-track-switch-direction): Mention
      erc-track-faces-priority-list.  Thanks to Leo for the suggestion.

diff --git a/ChangeLog b/ChangeLog
index 80ab5c1..d96d872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
 	* erc-sound.el: Fix typo in setting up instructions.
diff --git a/erc-track.el b/erc-track.el
index 5865257..1408adc 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -285,7 +285,11 @@ when there are no more active channels."
   oldest      -  find oldest active buffer
   newest      -  find newest active buffer
   leastactive -  find buffer with least unseen messages
-  mostactive  -  find buffer with most unseen messages."
+  mostactive  -  find buffer with most unseen messages.
+
+If set to 'importance, the importance is determined by position
+in `erc-track-faces-priority-list', where first is most
+important."
   :group 'erc-track
   :type '(choice (const importance)
 		 (const oldest)



From MAILER-DAEMON Sun Oct 14 00:49:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPv-0005VJ-LW
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPm-0005MD-V3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPk-0005Jv-Bh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPk-0005Jq-8e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
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@hcoop.net>) id 1IgvPj-0004BG-Qt
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPi-0005Q1-Th
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPi-0007A2-W7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPi-0007A2-W7@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:18 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Minor ChangeLog consistency tweak
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, 14 Oct 2007 04:49:24 -0000

commit 9dd9f1ceb2e7803bfc70b24435105c2846e60320
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Sep 18 23:17:13 2007 -0400

    Minor ChangeLog consistency tweak

diff --git a/ChangeLog b/ChangeLog
index 9b310b8..f2ea5f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@
 	* 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>
+2007-09-11  Exal de Jesus Garcia Carrillo  <exal@gnu.org>
 
 	* erc-sound.el: Fix typo in setting up instructions.
 



From MAILER-DAEMON Sun Oct 14 00:49:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPw-0005WI-In
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPn-0005NY-Vi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPl-0005Ko-1B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPk-0005KS-S1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
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@hcoop.net>) id 1IgvPk-0004BO-Cl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPj-0005QD-FV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPj-0007B3-Ii
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPj-0007B3-Ii@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:19 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Sync from emacs22
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, 14 Oct 2007 04:49:25 -0000

commit e8ee9bcb13b85277a1deba302b4538022c05627a
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Sep 19 07:12:44 2007 -0400

    Sync from emacs22

diff --git a/ChangeLog b/ChangeLog
index 2c6c3e9..f262a63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>  (tiny change)
 
 	* erc.texi (Special-Features): Fix small typo.
 
@@ -7,7 +7,7 @@
 	* 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>
+2007-09-11  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
 
 	* erc-sound.el: Fix typo in setting up instructions.
 



From MAILER-DAEMON Sun Oct 14 00:49:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPt-0005Sl-3s
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPm-0005Lv-5M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPk-0005KC-SQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPk-0005K7-HP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
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@hcoop.net>) id 1IgvPj-0004BL-VO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPj-0005Q7-6V
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPj-0007AY-9u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPj-0007AY-9u@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:19 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merge from master
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, 14 Oct 2007 04:49:22 -0000

commit 264c7e8f13a59db67b63c5f92da1c00ccc95dee1
Merge: 798deed... 9dd9f1c...
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Sep 18 23:26:02 2007 -0400

    Merge from master




From MAILER-DAEMON Sun Oct 14 00:49:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPw-0005Wo-PI
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPn-0005NK-Gk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPl-0005Kd-1B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPk-0005KQ-RU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
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@hcoop.net>) id 1IgvPk-0004BW-Hm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPj-0005QJ-Pt
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPj-0007Ba-S1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPj-0007Ba-S1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:19 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-ident: Fix buggy interaction with
	Freenode
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, 14 Oct 2007 04:49:26 -0000

commit 80e200e8a7ca8d27a712251627277f7c481382a1
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Aug 11 21:27:27 2007 -0400

    erc-ident: Fix buggy interaction with Freenode
    
    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.

diff --git a/ChangeLog b/ChangeLog
index 79e5f54..ef5a24d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/erc-identd.el b/erc-identd.el
index 8fab26d..dcbe463 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -74,7 +74,8 @@ This can be either a string or a number."
 		     (format "%s, %s : USERID : %s : %s\n"
 			     port-on-server port-on-client
 			     system-type (user-login-name)))
-	(process-send-eof erc-identd-process)))))
+	(stop-process erc-identd-process)
+	(delete-process proc)))))
 
 ;;;###autoload
 (defun erc-identd-start (&optional port)



From MAILER-DAEMON Sun Oct 14 00:49:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPw-0005Vl-0e
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPm-0005ME-At
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPk-0005Jx-Bx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPk-0005Jr-8y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
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@hcoop.net>) id 1IgvPj-0004BC-Gh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:19 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPi-0005Pv-LY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPi-00079Y-Mc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPi-00079Y-Mc@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:18 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix small typo in erc.texi
	(Special-Features).
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, 14 Oct 2007 04:49:24 -0000

commit 3539cb6db19bfd2bf81f42927867a1c8a74c44a5
Author: Exal de Jesus Garcia Carrillo <exal@gnu.org>
Date:   Tue Sep 18 14:33:56 2007 -0500

    Fix small typo in erc.texi (Special-Features).

diff --git a/ChangeLog b/ChangeLog
index d96d872..9b310b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>
+
+	* erc.texi (Special-Features): Fix small typo.
+
 2007-09-16  Michael Olson  <mwolson@gnu.org>
 
 	* erc-track.el (erc-track-switch-direction): Mention



From MAILER-DAEMON Sun Oct 14 00:49:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ4-0005Zi-CA
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPs-0005Rl-6T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPp-0005OI-FZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPo-0005OE-MM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
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@hcoop.net>) id 1IgvPo-0004D4-Dk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPn-0005RZ-Mm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPn-0007IC-Ok
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPn-0007IC-Ok@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:23 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-reuse-frames: new variable
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, 14 Oct 2007 04:49:30 -0000

commit 0e90a8e09d6c9fa48c3eb6acd6471218a6eab009
Author: Jeremy Maitin-Shepard <jbms@cmu.edu>
Date:   Tue Aug 14 16:23:57 2007 -0400

    erc-reuse-frames: new variable
    
    Adds an erc-reuse-frames variable that acts just as the documentation
    for it specifies.  Without this change, if erc-join-buffer is set to
    `frame', duplicate frames will be created on every reconnect, which is
    equivalent to setting `erc-reuse-frames' to nil.

diff --git a/erc.el b/erc.el
index cee601f..1628fbd 100644
--- a/erc.el
+++ b/erc.el
@@ -1492,6 +1492,14 @@ This only has effect when `erc-join-buffer' is set to `frame'."
   :group 'erc-buffers
   :type 'boolean)
 
+(defcustom erc-reuse-frames t
+  "*Determines whether new frames are always created.
+Non-nil means that a new frame is not created to display an ERC
+buffer if there is already a window displaying it.  This only has
+effect when `erc-join-buffer' is set to `frame'."
+  :group 'erc-buffers
+  :type 'boolean)
+
 (defun erc-channel-p (channel)
   "Return non-nil if CHANNEL seems to be an IRC channel name."
   (cond ((stringp channel)
@@ -1891,14 +1899,16 @@ removed from the list will be disabled."
 	((eq erc-join-buffer 'bury)
 	 nil)
 	((eq erc-join-buffer 'frame)
-	 (funcall '(lambda (frame)
+	 (when (or (not erc-reuse-frames)
+		   (not (get-buffer-window buffer t)))
+	   ((lambda (frame)
 		     (raise-frame frame)
 		     (select-frame frame))
 		  (make-frame (or erc-frame-alist
 				  default-frame-alist)))
 	 (switch-to-buffer buffer)
 	 (when erc-frame-dedicated-flag
-	   (set-window-dedicated-p (selected-window) t)))
+	     (set-window-dedicated-p (selected-window) t))))
 	(t
 	 (if (active-minibuffer-window)
 	     (display-buffer buffer)



From MAILER-DAEMON Sun Oct 14 00:49:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ4-0005a3-PB
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPu-0005TK-1U
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPq-0005Ph-4g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPp-0005PS-Od
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
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@hcoop.net>) id 1IgvPp-0004DQ-IW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPo-0005Rx-T9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPo-0007KC-Uu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPo-0007KC-Uu@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Make erc-default-port an integer
	rather than a string
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, 14 Oct 2007 04:49:31 -0000

commit ed82eb9ce65da6f605efc36d97f561983ea40204
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 2 21:33:12 2007 -0400

    Make erc-default-port an integer rather than a string
    
    * erc.el (erc-default-port): Make this an integer value rather than a
      string.  Thanks to Luca Capello for the report.

diff --git a/ChangeLog b/ChangeLog
index f9594d8..f62931f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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,
diff --git a/erc.el b/erc.el
index 2c931d8..325e2d9 100644
--- a/erc.el
+++ b/erc.el
@@ -1461,7 +1461,7 @@ Turning on `erc-mode' runs the hook `erc-mode-hook'."
 (defconst erc-default-server "irc.freenode.net"
   "IRC server to use if it cannot be detected otherwise.")
 
-(defconst erc-default-port "6667"
+(defconst erc-default-port 6667
   "IRC port to use if it cannot be detected otherwise.")
 
 (defcustom erc-join-buffer 'buffer



From MAILER-DAEMON Sun Oct 14 00:49:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ4-0005aM-UE
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPs-0005S7-Ge
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPm-0005MU-KT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPm-0005MF-C7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
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@hcoop.net>) id 1IgvPl-0004CB-Vq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPl-0005Qn-9x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPl-0007E6-Ba
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPl-0007E6-Ba@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:21 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Split erc-process-sentinel-2 from
	erc-process-sentinel-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: Sun, 14 Oct 2007 04:49:31 -0000

commit a3dcacd0b817d6ca18d3b96ae04515535ca71e0c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 00:34:31 2007 -0400

    Split erc-process-sentinel-2 from erc-process-sentinel-1
    
    * erc-backend.el (erc-process-sentinel-2): New function split from
      erc-process-sentinel-1.

diff --git a/ChangeLog b/ChangeLog
index 38cfe66..1ad7eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
 	reconnect was not happening when erc-server-reconnect-attempts was
 	t.  Call erc-server-reconnect-p only once per loop iteration.
 	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
+	(erc-process-sentinel-2): New function split from
+	erc-process-sentinel-1.
 
 	* 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
diff --git a/erc-backend.el b/erc-backend.el
index 9e5279e..1f2fc0c 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -610,6 +610,36 @@ EVENT is the message received from the closed connection process."
            ;; open-network-stream-nowait error for connection refused
            (not (string-match "^failed with code 111" event)))))
 
+(defun erc-process-sentinel-2 (event buffer)
+  "Called when `erc-process-sentinel-1' has detected an unexpected disconnect."
+  (with-current-buffer buffer
+    (let ((again t)
+          reconnect-p)
+      (while again
+        (setq again nil)
+        (setq reconnect-p (erc-server-reconnect-p event))
+        (erc-display-message nil 'error (current-buffer)
+                             (if reconnect-p 'disconnected
+                               'disconnected-noreconnect))
+        (if reconnect-p
+            (condition-case err
+                (progn
+                  (setq erc-server-reconnecting nil)
+                  (erc-server-reconnect)
+                  (setq erc-server-reconnect-count 0))
+              (error (when (buffer-live-p buffer)
+                       (set-buffer buffer)
+                       (when (integerp erc-server-reconnect-attempts)
+                         (setq erc-server-reconnect-count
+                               (1+ erc-server-reconnect-count)))
+                       ;; TODO: Make this use a one-time timer
+                       ;; instead of sit-for
+                       (sit-for erc-server-reconnect-timeout)
+                       (setq again t))))
+          ;; terminate, do not reconnect
+          (erc-display-message nil 'error (current-buffer)
+                               'terminated ?e event))))))
+
 (defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.
 Determine whether user has quit or whether erc has been terminated.
@@ -623,32 +653,7 @@ Conditionally try to reconnect and take appropriate action."
             (set-buffer-modified-p nil)
             (kill-buffer (current-buffer))))
       ;; unexpected disconnect
-      (let ((again t)
-            reconnect-p)
-        (while again
-          (setq again nil)
-          (setq reconnect-p (erc-server-reconnect-p event))
-          (erc-display-message nil 'error (current-buffer)
-                               (if reconnect-p 'disconnected
-                                 'disconnected-noreconnect))
-          (if reconnect-p
-              (condition-case err
-                  (progn
-                    (setq erc-server-reconnecting nil)
-                    (erc-server-reconnect)
-                    (setq erc-server-reconnect-count 0))
-                (error (when (buffer-live-p buffer)
-                         (set-buffer buffer)
-                         (when (integerp erc-server-reconnect-attempts)
-                           (setq erc-server-reconnect-count
-                                 (1+ erc-server-reconnect-count)))
-                         ;; TODO: Make this use a one-time timer
-                         ;; instead of sit-for
-                         (sit-for erc-server-reconnect-timeout)
-                         (setq again t))))
-            ;; terminate, do not reconnect
-            (erc-display-message nil 'error (current-buffer)
-                                 'terminated ?e event)))))))
+      (erc-process-sentinel-2 event buffer))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."



From MAILER-DAEMON Sun Oct 14 00:49:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ5-0005ab-9p
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPu-0005S6-4y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPm-0005MN-NS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPm-0005Lz-66
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
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@hcoop.net>) id 1IgvPl-0004C7-Qu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPk-0005Qh-Vh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPl-0007Dc-3C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPl-0007Dc-3C@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:21 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix bug where reconnect was not
	happening when erc-server-reconnect-attempts was t
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, 14 Oct 2007 04:49:31 -0000

commit 7e78c9918ff40b5a17c517976fc807db4d1534e7
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 23:59:26 2007 -0400

    Fix bug where reconnect was not happening when erc-server-reconnect-attempts was t
    
    * erc-backend.el (erc-process-sentinel-1): Fix bug where reconnect was
      not happening when erc-server-reconnect-attempts was t.  Call
      erc-server-reconnect-p only once per loop iteration.

diff --git a/ChangeLog b/ChangeLog
index b0dce79..38cfe66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,9 @@
 	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.  If it is deleted during
-	a reconnect attempt, stop trying to reconnect.
+	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 per loop iteration.
 	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
 
 	* erc.el (erc-command-no-process-p): Fix bug: the return value of
diff --git a/erc-backend.el b/erc-backend.el
index 463bffa..9e5279e 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -623,14 +623,15 @@ Conditionally try to reconnect and take appropriate action."
             (set-buffer-modified-p nil)
             (kill-buffer (current-buffer))))
       ;; unexpected disconnect
-      (let ((again t))
+      (let ((again t)
+            reconnect-p)
         (while again
           (setq again nil)
+          (setq reconnect-p (erc-server-reconnect-p event))
           (erc-display-message nil 'error (current-buffer)
-                               (if (erc-server-reconnect-p event)
-                                   'disconnected
+                               (if reconnect-p 'disconnected
                                  'disconnected-noreconnect))
-          (if (erc-server-reconnect-p event)
+          (if reconnect-p
               (condition-case err
                   (progn
                     (setq erc-server-reconnecting nil)
@@ -640,9 +641,11 @@ Conditionally try to reconnect and take appropriate action."
                          (set-buffer buffer)
                          (when (integerp erc-server-reconnect-attempts)
                            (setq erc-server-reconnect-count
-                                 (1+ erc-server-reconnect-count))
-                           (sit-for erc-server-reconnect-timeout)
-                           (setq again t)))))
+                                 (1+ erc-server-reconnect-count)))
+                         ;; TODO: Make this use a one-time timer
+                         ;; instead of sit-for
+                         (sit-for erc-server-reconnect-timeout)
+                         (setq again t))))
             ;; terminate, do not reconnect
             (erc-display-message nil 'error (current-buffer)
                                  'terminated ?e event)))))))



From MAILER-DAEMON Sun Oct 14 00:49:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ5-0005b6-Oz
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPt-0005TS-U5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPp-0005OV-1W
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPn-0005NL-MM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
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@hcoop.net>) id 1IgvPn-0004Cc-7g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPm-0005RB-HX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPm-0007G5-Jg
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPm-0007G5-Jg@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:22 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Many fixes to erc-track.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, 14 Oct 2007 04:49:33 -0000

commit 21f04e6eeb3daebf970e74346696fd1e95ee408f
Author: Jeremy Maitin-Shepard <jbms@cmu.edu>
Date:   Tue Aug 14 16:40:11 2007 -0400

    Many fixes to erc-track.el
    
    - Added variable `erc-track-remove-disconnected-buffers', 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.
    
    - Added hook `erc-track-list-changed-hook'.  This 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.
    
    - Added function `erc-track-get-buffer-window' 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.
    
    - Fixed a bug in the logic in `erc-track-modified-channels' for removing
      buffers from the list in certain cases.

diff --git a/erc-track.el b/erc-track.el
index f72a5be..3cb1206 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -95,6 +95,12 @@ Activity means that there was no user input in the last 10 seconds."
   :group 'erc-track
   :type '(repeat string))
 
+(defcustom erc-track-remove-disconnected-buffers nil
+  "*If true, remove buffers associated with a server that is
+disconnected from `erc-modified-channels-alist'."
+  :group 'erc-track
+  :type 'boolean)
+
 (defcustom erc-track-exclude-types '("NICK")
   "*List of message types to be ignored.
 This list could look like '(\"JOIN\" \"PART\")."
@@ -151,6 +157,8 @@ If nil instead of a function, shortening is disabled."
   :type '(choice (const :tag "Disabled")
 		 function))
 
+(defvar erc-track-list-changed-hook nil)
+
 (defcustom erc-track-use-faces t
   "*Use faces in the mode-line.
 The faces used are the same as used for text in the buffers.
@@ -192,12 +200,14 @@ 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'
-
-Any other value means add to the end of `global-mode-string'."
+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)
-		 (const :tag "After all other information" nil))
+		 (const :tag "After all other information" t)
+		 (const :tag "Don't display in mode line" nil))
   :set (lambda (sym val)
 	 (set sym val)
 	 (when (and (boundp 'erc-track-mode)
@@ -296,7 +306,7 @@ See `erc-track-position-in-mode-line' for possible values."
 	      (boundp 'mode-line-modes))
 	 (add-to-list 'mode-line-modes
 		      '(t erc-modified-channels-object) t))
-	(t
+	((eq position t)
 	 (when (not global-mode-string)
 	   (setq global-mode-string '(""))) ; Padding for mode-line wart
 	 (add-to-list 'global-mode-string
@@ -644,14 +654,21 @@ only consider active buffers visible.")
   (setq erc-buffer-activity (erc-current-time))
   (erc-track-modified-channels))
 
+(defun erc-track-get-buffer-window (buffer frame-param)
+  (if (eq frame-param 'selected-visible)
+      (if (eq (frame-visible-p (selected-frame)) t)
+	  (get-buffer-window buffer nil)
+	nil)
+    (get-buffer-window buffer frame-param)))
+
 (defun erc-buffer-visible (buffer)
   "Return non-nil when the buffer is visible."
   (if erc-track-when-inactive
       (when erc-buffer-activity; could be nil
-	(and (get-buffer-window buffer erc-track-visibility)
+	(and (erc-track-get-buffer-window buffer erc-track-visibility)
 	     (<= (erc-time-diff erc-buffer-activity (erc-current-time))
 		 erc-buffer-activity-timeout)))
-    (get-buffer-window buffer erc-track-visibility)))
+    (erc-track-get-buffer-window buffer erc-track-visibility)))
 
 ;;; Tracking the channel modifications
 
@@ -668,18 +685,22 @@ called via `window-configuration-change-hook'.
 ARGS are ignored."
   (interactive)
   (unless erc-modified-channels-update-inside
-    (let ((erc-modified-channels-update-inside t))
+    (let ((erc-modified-channels-update-inside t)
+	  (removed-channel nil))
       (mapcar (lambda (elt)
 		(let ((buffer (car elt)))
 		  (when (or (not (bufferp buffer))
 			    (not (buffer-live-p buffer))
 			    (erc-buffer-visible buffer)
+			    (and erc-track-remove-disconnected-buffers
 			    (not (with-current-buffer buffer
-				   erc-server-connected)))
+					erc-server-connected))))
+		    (setq removed-channel t)
 		    (erc-modified-channels-remove-buffer buffer))))
 	      erc-modified-channels-alist)
+      (when removed-channel
       (erc-modified-channels-display)
-      (force-mode-line-update t))))
+	(force-mode-line-update t)))))
 
 (defvar erc-track-mouse-face (if (featurep 'xemacs)
 				 'modeline-mousable
@@ -733,6 +754,8 @@ Use `erc-make-mode-line-buffer-name' to create buttons."
 	(eq 'mostactive erc-track-switch-direction)
 	(eq 'leastactive erc-track-switch-direction))
       (erc-track-sort-by-activest))
+  (run-hooks 'erc-track-list-changed-hook)
+  (unless (eq erc-track-position-in-mode-line nil)
   (if (null erc-modified-channels-alist)
       (setq erc-modified-channels-object (erc-modified-channels-object nil))
     ;; erc-modified-channels-alist contains all the data we need.  To
@@ -768,7 +791,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'."
@@ -802,8 +825,7 @@ is in `erc-mode'."
     (if (and (not (erc-buffer-visible (current-buffer)))
 	     (not (member this-channel erc-track-exclude))
 	     (not (and erc-track-exclude-server-buffer
-		       (string= this-channel
-				(buffer-name (erc-server-buffer)))))
+		       (erc-server-buffer-p)))
 	     (not (erc-message-type-member
 		   (or (erc-find-parsed-property)
 		       (point-min))
@@ -847,10 +869,10 @@ is in `erc-mode'."
 	    (erc-modified-channels-display)))
       ;; Else if the active buffer is the current buffer, remove it
       ;; from our list.
-      (when (or (erc-buffer-visible (current-buffer))
+      (when (and (or (erc-buffer-visible (current-buffer))
 		(and this-channel
-		     (assq (current-buffer) erc-modified-channels-alist)
 		     (member this-channel erc-track-exclude)))
+		 (assq (current-buffer) erc-modified-channels-alist))
 	;; Remove it from mode-line if buffer is visible or
 	;; channel was added to erc-track-exclude recently.
 	(erc-modified-channels-remove-buffer (current-buffer))



From MAILER-DAEMON Sun Oct 14 00:49:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ6-0005bZ-4V
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPt-0005Sk-3O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPn-0005Mr-43
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPm-0005MY-KT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
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@hcoop.net>) id 1IgvPm-0004CH-BF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPl-0005Qt-KR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPl-0007Ea-Mn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPl-0007Ea-Mn@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:21 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Use better algorithm for enforcing a
	timeout between reconnect attempts
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, 14 Oct 2007 04:49:33 -0000

commit 4bb22757c7656407b0c076d481a88c59cf2cd443
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 00:54:32 2007 -0400

    Use better algorithm for enforcing a timeout between reconnect attempts
    
    * erc-backend.el (erc-process-sentinel-2): 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 integer.

diff --git a/ChangeLog b/ChangeLog
index 1ad7eb7..b957b34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,13 +6,19 @@
 	/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.  If it 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 per loop iteration.
+	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.
+	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 integer.
 
 	* 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
diff --git a/erc-backend.el b/erc-backend.el
index 1f2fc0c..f4c87e2 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -612,33 +612,36 @@ EVENT is the message received from the closed connection process."
 
 (defun erc-process-sentinel-2 (event buffer)
   "Called when `erc-process-sentinel-1' has detected an unexpected disconnect."
-  (with-current-buffer buffer
-    (let ((again t)
-          reconnect-p)
-      (while again
-        (setq again nil)
-        (setq reconnect-p (erc-server-reconnect-p event))
+  (when (buffer-live-p buffer)
+    (with-current-buffer buffer
+      (let ((reconnect-p (erc-server-reconnect-p event)))
         (erc-display-message nil 'error (current-buffer)
                              (if reconnect-p 'disconnected
                                'disconnected-noreconnect))
-        (if reconnect-p
-            (condition-case err
-                (progn
-                  (setq erc-server-reconnecting nil)
-                  (erc-server-reconnect)
-                  (setq erc-server-reconnect-count 0))
-              (error (when (buffer-live-p buffer)
-                       (set-buffer buffer)
-                       (when (integerp erc-server-reconnect-attempts)
+        (if (not reconnect-p)
+            ;; terminate, do not reconnect
+            (erc-display-message nil 'error (current-buffer)
+                                 'terminated ?e event)
+          ;; reconnect
+          (condition-case err
+              (progn
+                (setq erc-server-reconnecting nil)
+                (erc-server-reconnect)
+                (setq erc-server-reconnect-count 0))
+            (error (when (buffer-live-p buffer)
+                     (set-buffer buffer)
+                     (if (integerp erc-server-reconnect-attempts)
                          (setq erc-server-reconnect-count
-                               (1+ erc-server-reconnect-count)))
-                       ;; TODO: Make this use a one-time timer
-                       ;; instead of sit-for
-                       (sit-for erc-server-reconnect-timeout)
-                       (setq again t))))
-          ;; terminate, do not reconnect
-          (erc-display-message nil 'error (current-buffer)
-                               'terminated ?e event))))))
+                               (1+ erc-server-reconnect-count))
+                       (message "%s ... %s"
+                                "Reconnecting until we succeed"
+                                "kill the server buffer to stop"))
+                     (if (integerp erc-server-reconnect-timeout)
+                         (run-at-time erc-server-reconnect-timeout nil
+                                      #'erc-process-sentinel-2
+                                      event buffer)
+                       (error (concat "`erc-server-reconnect-timeout`"
+                                      " must be an integer")))))))))))
 
 (defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.



From MAILER-DAEMON Sun Oct 14 00:49:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ6-0005c0-IY
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPt-0005TF-Lz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPq-0005PD-HO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPp-0005P7-Fe
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
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@hcoop.net>) id 1IgvPp-0004DM-8u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPo-0005Rr-Hz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPo-0007Jh-KV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPo-0007Jh-KV@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] /GQ: Kill query buffers after 4
	seconds if user wants it
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, 14 Oct 2007 04:49:34 -0000

commit ffab470eeadb67e3aa7cb470a24ca2c009077dee
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Aug 26 20:11:32 2007 -0400

    /GQ: Kill query buffers after 4 seconds if user wants it
    
    * erc.el (erc-cmd-GQUIT): If erc-kill-queries-on-quit is non-nil, kill
      all query buffers after 4 seconds.

diff --git a/ChangeLog b/ChangeLog
index 461a34d..f9594d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/erc.el b/erc.el
index 1628fbd..2c931d8 100644
--- a/erc.el
+++ b/erc.el
@@ -3258,7 +3258,17 @@ the message given by REASON."
 (defun erc-cmd-GQUIT (reason)
   "Disconnect from all servers at once with the same quit REASON."
   (erc-with-all-buffers-of-server nil #'erc-open-server-buffer-p
-				  (erc-cmd-QUIT reason)))
+				  (erc-cmd-QUIT reason))
+  (when erc-kill-queries-on-quit
+    ;; if the query buffers have not been killed within 4 seconds,
+    ;; kill them
+    (run-at-time
+     4 nil
+     (lambda ()
+       (dolist (buffer (erc-buffer-list (lambda (buf)
+					  (not (erc-server-buffer-p buf)))))
+	 (kill-buffer buffer)))))
+  t)
 
 (defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
 (put 'erc-cmd-GQUIT 'do-not-parse-args t)



From MAILER-DAEMON Sun Oct 14 00:49:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ5-0005bM-U0
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPt-0005Rt-3s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPn-0005Mo-42
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPm-0005Mb-OT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
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@hcoop.net>) id 1IgvPm-0004CL-IA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPl-0005Qz-Sz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPm-0007F7-06
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPm-0007F7-06@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:22 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Reconnect timeout must be a number,
	not necessarily an integer
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, 14 Oct 2007 04:49:33 -0000

commit 1b9d78bea251cac82935a12d437bcc1ad23b3ddd
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 01:12:52 2007 -0400

    Reconnect timeout must be a number, not necessarily an integer
    
    * erc-backend.el (erc-process-sentinel-2): Improve message for case where
      erc-server-reconnect timeout is t.  Check to see if
      erc-server-reconnect-timeout is a number, rather than an integer.

diff --git a/ChangeLog b/ChangeLog
index b957b34..05aa739 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,7 @@
 	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 integer.
+	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
diff --git a/erc-backend.el b/erc-backend.el
index f4c87e2..73f534a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -635,13 +635,13 @@ EVENT is the message received from the closed connection process."
                                (1+ erc-server-reconnect-count))
                        (message "%s ... %s"
                                 "Reconnecting until we succeed"
-                                "kill the server buffer to stop"))
-                     (if (integerp erc-server-reconnect-timeout)
+                                "kill the ERC server buffer to stop"))
+                     (if (numberp erc-server-reconnect-timeout)
                          (run-at-time erc-server-reconnect-timeout nil
                                       #'erc-process-sentinel-2
                                       event buffer)
                        (error (concat "`erc-server-reconnect-timeout`"
-                                      " must be an integer")))))))))))
+                                      " must be a number")))))))))))
 
 (defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.



From MAILER-DAEMON Sun Oct 14 00:49:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ6-0005bm-9q
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPt-0005TQ-Qe
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPp-0005Os-79
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPp-0005OO-0k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
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@hcoop.net>) id 1IgvPo-0004D9-Lv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPn-0005Rf-Vz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPo-0007Ih-1e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPo-0007Ih-1e@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] ChangeLog: Add entry for jbms'
	erc-reuse-frames patch
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, 14 Oct 2007 04:49:34 -0000

commit 3cda769c8372eefd524eaf1810af627ae11043d0
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Aug 17 23:54:24 2007 -0400

    ChangeLog: Add entry for jbms' erc-reuse-frames patch
    
    * ChangeLog: Add entry for jbms' erc-reuse-frames patch.

diff --git a/ChangeLog b/ChangeLog
index e06fd56..461a34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,11 @@
 	(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



From MAILER-DAEMON Sun Oct 14 00:49:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ6-0005cB-OA
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPu-0005Td-I6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPp-0005Nn-KL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPn-0005N3-3z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
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@hcoop.net>) id 1IgvPm-0004CP-Tf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPm-0005R5-8K
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPm-0007Fc-9S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPm-0007Fc-9S@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:22 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Handle some edge cases when
	erc-server-process is 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: Sun, 14 Oct 2007 04:49:34 -0000

commit d0691caef77d6a2f2e04fe5a69879b5c4a4967db
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 01:31:44 2007 -0400

    Handle some edge cases when erc-server-process is nil
    
    * erc-backend.el (erc-server-reconnect): Fix logic inversion.
    
    * erc.el (erc-send-current-line, erc-display-command, erc-display-msg):
      Handle case where erc-server-process is nil, so that /reconnect works.

diff --git a/ChangeLog b/ChangeLog
index 05aa739..40ee342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
 	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>
 
diff --git a/erc-backend.el b/erc-backend.el
index 73f534a..0df2776 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -553,8 +553,8 @@ Make sure you are in an ERC buffer when running this."
   (let ((buffer (erc-server-buffer)))
     (unless (buffer-live-p buffer)
       (if (eq major-mode 'erc-mode)
-          (error "Reconnect must be run from an ERC buffer")
-        (setq buffer (current-buffer))))
+          (setq buffer (current-buffer))
+        (error "Reconnect must be run from an ERC buffer")))
     (with-current-buffer buffer
       (erc-update-mode-line)
       (erc-set-active-buffer (current-buffer))
diff --git a/erc.el b/erc.el
index 5d29ace..cee601f 100644
--- a/erc.el
+++ b/erc.el
@@ -4999,7 +4999,8 @@ Specifically, return the position of `erc-insert-marker'."
 		(save-restriction
 		  (widen)
 		  (goto-char (point-max))
-		  (set-marker (process-mark erc-server-process) (point))
+		  (when (processp erc-server-process)
+		    (set-marker (process-mark erc-server-process) (point)))
 		  (set-marker erc-insert-marker (point))
 		  (let ((buffer-modified (buffer-modified-p)))
 		    (erc-display-prompt)
@@ -5067,7 +5068,8 @@ This returns non-nil only iff we actually send anything."
 	(erc-put-text-property beg (point)
 			       'face 'erc-command-indicator-face)
 	(insert "\n"))
-      (set-marker (process-mark erc-server-process) (point))
+      (when (processp erc-server-process)
+	(set-marker (process-mark erc-server-process) (point)))
       (set-marker erc-insert-marker (point))
       (save-excursion
 	(save-restriction
@@ -5086,7 +5088,8 @@ current position."
 	(erc-put-text-property beg (point)
 			       'face 'erc-input-face))
       (insert "\n")
-      (set-marker (process-mark erc-server-process) (point))
+      (when (processp erc-server-process)
+	(set-marker (process-mark erc-server-process) (point)))
       (set-marker erc-insert-marker (point))
       (save-excursion
 	(save-restriction



From MAILER-DAEMON Sun Oct 14 00:49:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ7-0005cf-3L
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPw-0005We-Jb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPr-0005R7-O8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPq-0005Pq-5Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
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@hcoop.net>) id 1IgvPp-0004DZ-Ro
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPp-0005S3-5T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPp-0007Kh-8w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPp-0007Kh-8w@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:25 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Merge from emacs22 (manually)
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, 14 Oct 2007 04:49:34 -0000

commit 9e2c66bef12240661f225a22deca116ff5cab536
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 2 22:25:21 2007 -0400

    Merge from emacs22 (manually)

diff --git a/ChangeLog b/ChangeLog
index f62931f..0a1e009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,7 +26,7 @@
 	(erc-track-get-active-buffer): Make 'oldest a rough opposite of
 	'importance.
 
-2007-08-14  Jeremy Maitin-Shepard <jbms@cmu.edu>
+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
@@ -176,6 +176,10 @@
 	* 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
@@ -190,6 +194,11 @@
 	* 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,
diff --git a/erc-goodies.el b/erc-goodies.el
index c92c33d..9131ce6 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -77,7 +77,7 @@ You can control which line is recentered to by customizing the
 variable `erc-input-line-position'.
 
 DISPLAY-START is ignored."
-  (if (and window (window-live-p window))
+  (if (window-live-p window)
       ;; Temporarily bind resize-mini-windows to nil so that users who have it
       ;; set to a non-nil value will not suffer from premature minibuffer
       ;; shrinkage due to the below recenter call.  I have no idea why this
diff --git a/erc.el b/erc.el
index 325e2d9..f14ea52 100644
--- a/erc.el
+++ b/erc.el
@@ -843,7 +843,7 @@ See `erc-server-flood-margin' for other flood-related parameters.")
 The first existent and readable one will get executed.
 
 If the filename ends with `.el' it is presumed to be an Emacs Lisp
-script and it gets (load)ed.  Otherwise is is treated as a bunch of
+script and it gets (load)ed.  Otherwise it is treated as a bunch of
 regular IRC commands."
   :group 'erc-scripts
   :type '(repeat file))
@@ -5861,7 +5861,7 @@ Otherwise, use the `erc-header-line' face."
 		 (function :tag "Call a function")))
 
 (defcustom erc-show-channel-key-p t
-  "Show the the channel key in the header line."
+  "Show the channel key in the header line."
   :group 'erc-paranoia
   :type 'boolean)
 



From MAILER-DAEMON Sun Oct 14 00:49:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ7-0005cn-8c
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPv-0005Uo-8Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPo-0005Nr-A9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPo-0005Nj-4C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
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@hcoop.net>) id 1IgvPn-0004Ck-RW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPn-0005RN-40
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPn-0007HB-5a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPn-0007HB-5a@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:23 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Allow switching to buffer
	with most important message type first
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, 14 Oct 2007 04:49:34 -0000

commit 2c7ea5ca18101c33f512dc15ba334fe214a5cd74
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Aug 15 23:26:45 2007 -0400

    erc-track: Allow switching to buffer with most important message type first
    
    * erc-track.el (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.

diff --git a/ChangeLog b/ChangeLog
index 87426c9..11c77a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 
 	* 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>
 
diff --git a/erc-track.el b/erc-track.el
index 8c1d3e6..5865257 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -281,12 +281,14 @@ when there are no more active channels."
 (defcustom erc-track-switch-direction 'oldest
   "Direction `erc-track-switch-buffer' should switch.
 
+  importance  -  find buffer with the most important message
   oldest      -  find oldest active buffer
   newest      -  find newest active buffer
   leastactive -  find buffer with least unseen messages
   mostactive  -  find buffer with most unseen messages."
   :group 'erc-track
-  :type '(choice (const oldest)
+  :type '(choice (const importance)
+		 (const oldest)
 		 (const newest)
 		 (const leastactive)
 		 (const mostactive)))
@@ -758,10 +760,11 @@ If FACES are provided, color STRING with them."
   "Set `erc-modified-channels-object'
 according to `erc-modified-channels-alist'.
 Use `erc-make-mode-line-buffer-name' to create buttons."
-  (if (or
-	(eq 'mostactive erc-track-switch-direction)
-	(eq 'leastactive erc-track-switch-direction))
-      (erc-track-sort-by-activest))
+  (cond ((or (eq 'mostactive erc-track-switch-direction)
+	     (eq 'leastactive erc-track-switch-direction))
+	 (erc-track-sort-by-activest))
+	((eq 'importance erc-track-switch-direction)
+	 (erc-track-sort-by-importance)))
   (run-hooks 'erc-track-list-changed-hook)
   (unless (eq erc-track-position-in-mode-line nil)
   (if (null erc-modified-channels-alist)
@@ -917,6 +920,29 @@ That means the number of unseen messages in a channel."
 	(sort erc-modified-channels-alist
 	      (lambda (a b) (> (nth 1 a) (nth 1 b))))))
 
+(defun erc-track-face-priority (face)
+  "Return a number indicating the priority of FACE in
+`erc-track-faces-priority-list'.  Lower number means higher
+priority.
+
+If face is not in `erc-track-faces-priority-list', it will have a
+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)
+	    (throw 'done t)
+	  (setq count (1+ count)))))
+    count))
+
+(defun erc-track-sort-by-importance ()
+  "Sort erc-modified-channels-alist by importance.
+That means the position of the face in `erc-track-faces-priority-list'."
+  (setq erc-modified-channels-alist
+	(sort erc-modified-channels-alist
+	      (lambda (a b) (< (erc-track-face-priority (cddr a))
+			       (erc-track-face-priority (cddr b)))))))
+
 (defun erc-track-get-active-buffer (arg)
   "Return the buffer name of ARG in `erc-modified-channels-alist'.
 Negative arguments index in the opposite direction.  This direction is
@@ -928,7 +954,8 @@ relative to `erc-track-switch-direction'"
 		  (oldest      'newest)
 		  (newest      'oldest)
 		  (mostactive  'leastactive)
-		  (leastactive 'mostactive)))
+		  (leastactive 'mostactive)
+		  (importance  'oldest)))
       (setq arg (- arg)))
     (setq offset (case dir
 		   ((oldest leastactive)



From MAILER-DAEMON Sun Oct 14 00:49:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ4-0005Zw-K4
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPr-0005Rc-TV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPo-0005Ne-30
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPn-0005NU-SG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
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@hcoop.net>) id 1IgvPn-0004Ch-Gk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPm-0005RH-R3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPm-0007Gc-Sk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPm-0007Gc-Sk@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:22 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add ChangeLog entry for last 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: Sun, 14 Oct 2007 04:49:30 -0000

commit e258147fd82106b365ebd6ff81acabedfcd379b5
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Aug 15 21:50:37 2007 -0400

    Add ChangeLog entry for last change
    
    * ChangeLog: Add entry for last change.
    
    * erc-track.el (erc-track-list-changed-hook): Turn this into a
      customizable option.

diff --git a/ChangeLog b/ChangeLog
index 40ee342..87426c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2007-08-16  Michael Olson  <mwolson@gnu.org>
+
+	* erc-track.el (erc-track-list-changed-hook): Turn this into a
+	customizable option.
+
+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'.
+
 2007-08-14  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-server-reconnect): If the server buffer has
diff --git a/erc-track.el b/erc-track.el
index 3cb1206..8c1d3e6 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -157,7 +157,15 @@ If nil instead of a function, shortening is disabled."
   :type '(choice (const :tag "Disabled")
 		 function))
 
-(defvar erc-track-list-changed-hook nil)
+(defcustom erc-track-list-changed-hook nil
+  "Hook that is run whenever the contents of
+`erc-modified-channels-alist' changes.
+
+This is useful for people that don't use the default mode-line
+notification but instead use a separate mechanism to provide
+notification of channel activity."
+  :group 'erc-track
+  :type 'hook)
 
 (defcustom erc-track-use-faces t
   "*Use faces in the mode-line.



From MAILER-DAEMON Sun Oct 14 00:49:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ5-0005aq-F8
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPu-0005Ty-Hk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPp-0005Nz-E6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPo-0005Nv-9F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
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@hcoop.net>) id 1IgvPo-0004Cx-3S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPn-0005RT-D0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPn-0007Hf-FU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:23 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPn-0007Hf-FU@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:23 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] NEWS: Begin adding ERC 5.3 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: Sun, 14 Oct 2007 04:49:32 -0000

commit a153652009cbdbe3ca93037531d8f46b04f3b8fe
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Aug 16 09:23:22 2007 -0400

    NEWS: Begin adding ERC 5.3 changes
    
    * NEWS: Add ERC 5.3 changes section, and mention jbms' erc-track
      compatibility note.

diff --git a/ChangeLog b/ChangeLog
index 11c77a2..e06fd56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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.
diff --git a/NEWS b/NEWS
index b7aa0b1..9fc24d2 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,17 @@ ERC NEWS                                                       -*- outline -*-
 Copyright (C) 2006, 2007  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in ERC 5.3
+
+** Changes and additions to modules
+
+*** 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".
+
 * Changes in ERC 5.2
 
 ** M-x erc RET now starts ERC.



From MAILER-DAEMON Sun Oct 14 00:49:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ5-0005b0-K9
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPu-0005Tx-HE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPp-0005P1-9K
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPp-0005Om-7C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
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@hcoop.net>) id 1IgvPo-0004DG-V2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPo-0005Rl-8b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPo-0007JB-Aw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPo-0007JB-Aw@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-process-sentinel: Update mode
	line in more places
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, 14 Oct 2007 04:49:32 -0000

commit 18b157ee2779760f01507f67f7419f738dd5f20b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Aug 19 23:02:37 2007 -0400

    erc-process-sentinel: Update mode line in more places
    
    * erc-backend.el (erc-process-sentinel-2, erc-process-sentinel-1)
      (erc-process-sentinel): Update mode line in more places.  Unmark buffer
      as modified in more places.

diff --git a/erc-backend.el b/erc-backend.el
index 0df2776..4e25049 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -612,7 +612,8 @@ EVENT is the message received from the closed connection process."
 
 (defun erc-process-sentinel-2 (event buffer)
   "Called when `erc-process-sentinel-1' has detected an unexpected disconnect."
-  (when (buffer-live-p buffer)
+  (if (not (buffer-live-p buffer))
+      (erc-update-mode-line)
     (with-current-buffer buffer
       (let ((reconnect-p (erc-server-reconnect-p event)))
         (erc-display-message nil 'error (current-buffer)
@@ -620,8 +621,12 @@ EVENT is the message received from the closed connection process."
                                'disconnected-noreconnect))
         (if (not reconnect-p)
             ;; terminate, do not reconnect
-            (erc-display-message nil 'error (current-buffer)
-                                 'terminated ?e event)
+            (progn
+              (erc-display-message nil 'error (current-buffer)
+                                   'terminated ?e event)
+              ;; Update mode line indicators
+              (erc-update-mode-line)
+              (set-buffer-modified-p nil))
           ;; reconnect
           (condition-case err
               (progn
@@ -652,8 +657,11 @@ Conditionally try to reconnect and take appropriate action."
         ;; normal quit
         (progn
           (erc-display-message nil 'error (current-buffer) 'finished)
+          ;; Update mode line indicators
+          (erc-update-mode-line)
+          ;; Kill server buffer if user wants it
+          (set-buffer-modified-p nil)
           (when erc-kill-server-buffer-on-quit
-            (set-buffer-modified-p nil)
             (kill-buffer (current-buffer))))
       ;; unexpected disconnect
       (erc-process-sentinel-2 event buffer))))
@@ -683,12 +691,7 @@ Conditionally try to reconnect and take appropriate action."
         (delete-region (point) (point-max))
         ;; Decide what to do with the buffer
         ;; Restart if disconnected
-        (erc-process-sentinel-1 event buf)
-        ;; Make sure we don't write to the buffer if it has been
-        ;; killed
-        (when (buffer-live-p buf)
-          (erc-update-mode-line)
-          (set-buffer-modified-p nil))))))
+        (erc-process-sentinel-1 event buf)))))
 
 ;;;; Sending messages
 



From MAILER-DAEMON Sun Oct 14 00:49:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQ6-0005cW-UC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPt-0005TU-Vq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPr-0005Qv-59
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPr-0005Qo-03
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
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@hcoop.net>) id 1IgvPq-0004Dm-Nv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPq-0005SL-1d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPq-0007MC-4l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPq-0007MC-4l@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:26 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] NEWS: Mention erc-tls function
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, 14 Oct 2007 04:49:34 -0000

commit e243b7eb5a4f30c241f69c64e09e6b1e1d051f49
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:56:24 2007 -0400

    NEWS: Mention erc-tls function

diff --git a/NEWS b/NEWS
index 9fc24d2..7a32f9b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,11 @@ See the end of the file for license conditions.
 
 * Changes in ERC 5.3
 
+** New function `erc-tls' is to be used for connecting to a server via TLS.
+The function `erc-ssl' should never be used for that purpose any
+longer, which was the case with the version of ERC that is included
+with Emacs.
+
 ** Changes and additions to modules
 
 *** Channel tracking (erc-track.el)



From MAILER-DAEMON Sun Oct 14 00:50:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQT-0005i0-GL
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQS-0005gx-Fy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOn-0004yQ-LQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOn-0004yH-Ec
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
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@hcoop.net>) id 1IgvOm-0003uu-OC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOl-00053i-Vk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOm-0005bg-1B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOm-0005bg-1B@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:20 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from 
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, 14 Oct 2007 04:50:04 -0000

commit d172b23b49e57d3259c6bfbd664b687c4a58a91a
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Jul 12 21:05:57 2006 +0000

    Merged from
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-27
       Move Debian files into their own branch.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-28
       Makefile: Simplify debian targets.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-21

diff --git a/ChangeLog b/ChangeLog
index 703452f..749906c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-12  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (debrelease-mwolson): Remove and consolidate with the
+	`debrelease' target.
+	(debrevision): Rename from `debrevision-mwolson'.
+
 2006-07-09  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-version-string): Release ERC 5.1.3.
diff --git a/Makefile b/Makefile
index 8214633..62da9c8 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,8 @@ debbuild:
 	  debsign)
 
 debrelease: debprepare
+	-rm -f ../../dist/erc_*
+	-rm -f ../erc_$(VERSION)*
 	(cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
 	cp -R debian ../$(SNAPDIR)
 	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
@@ -110,8 +112,9 @@ debrelease: debprepare
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
 	$(MAKE) debbuild
+	cp ../erc_$(VERSION)* ../../dist
 
-debrevision-mwolson:
+debrevision:
 	-rm -f ../../dist/erc_*
 	-rm -f ../erc_$(VERSION)-*
 	-rm -fr ../erc-$(VERSION)
@@ -128,12 +131,6 @@ debrevision-mwolson:
 	$(MAKE) debbuild
 	cp ../erc_$(VERSION)* ../../dist
 
-debrelease-mwolson:
-	-rm -f ../../dist/erc_*
-	-rm -f ../erc_$(VERSION)*
-	$(MAKE) debrelease
-	cp ../erc_$(VERSION)* ../../dist
-
 release: autoloads distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
 	cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../erc-$(VERSION)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index a25d940..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,21 +0,0 @@
-General notes:
---------------
-
-As of ERC 5.0.3, this package should install properly with versions of
-Emacs or XEmacs that do not have the `format-spec.el' library.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>, Wed Jun  1 20:20:42 2005
-
-ERC includes support for many third-party packages which are not part
-of Emacs, nor are packaged for Debian (yet). However, stripping them
-out from the Debian package would be a great loss for those who happen
-to have those Emacs packages.
-
-So all add-on modules which depend on libraries not (yet) packaged for
-debian are kept in /usr/share/emacs/site-lisp/erc in source form.
-
-You can still (require 'erc-<package>), and it will still work; it
-only uses the source to load the module, and not the byte-compiled
-.elc files.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>, Sun Mar 20 00:57:16 2005
diff --git a/debian/README.erc-speak b/debian/README.erc-speak
deleted file mode 100644
index 022b8b3..0000000
--- a/debian/README.erc-speak
+++ /dev/null
@@ -1,8 +0,0 @@
-Notes for the erc-speak package
-===============================
-
-If you don't have the necessary hardware synthesiser to make Emacspeak
-work, you can install the `espeakf' (from sourceforge), or get IBM's
-ViaVoice (which sounds better, but is binary-only). Instructions for
-the latter are at
-    http://www.emacswiki.org/cgi-bin/wiki.pl?EmacSpeak
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index ad71b84..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,377 +0,0 @@
-erc (5.1.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Sun, 19 Feb 2006 23:34:25 -0500
-
-erc (5.1.1-3) unstable; urgency=low
-
-  * erc.el: Go back to using ssl.el, since connecting with
-    `open-tls-stream' only seems to work with the version of tls.el in
-    Emacs22.
-  * erc-autojoin.el, erc-dcc.el: Fix compiler warnings.
-  * erc-stamp.el:
-    - Fix a consistency issue with right timestamps.
-    - Rename option `erc-timestamp-right-align-by-pixel' to
-      `erc-timestamp-use-align-to'.
-    - Use a more fail-proof method of aligning right timestamps, if the
-      current version of Emacs supports it.  Previously, a bug was
-      triggered when erc-stamp.el was byte-compiled.  This has been
-      fixed, making this method safe to use.
-  * debian/rules (configure, configure-stamp, build, build-stamp):
-    Generate HTML and Info documentation.
-    (binary-erc): Install HTML and Info documentation.
-  * debian/maint/postinst: Install the Info documentation.
-  * debian/maint/prerm: Handle removing of Info documentation.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Tue, 14 Feb 2006 00:55:54 -0500
-
-erc (5.1.1-2) unstable; urgency=low
-
-  * debian/control: Add Build-Depends-Indep on texinfo and texi2html,
-    thanks to Andreas Jochens (closes: #351772).
-
- -- Romain Francoise <rfrancoise@debian.org>  Wed,  8 Feb 2006 08:31:46 +0100
-
-erc (5.1.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * erc-spelling.el:
-    - Don't spell-check nicks or words that are prefixed with '/'.
-    - Remove flyspell properties from words we shouldn't spell-check.
-    - Fix an issue that caused the ispell process to reload every time we
-      switch to an ERC buffer.
-  * Bug fix: "erc: Recommends: emacs-chess", thanks to era eriksson
-    (Closes: #350994).
-  * Bug fix: "erc-fill-column should always be equal to the current window
-    width", thanks to Cyril Bouthors (Closes: #221223).  The desired
-    behavior can be obtained by setting both `erc-fill-column' and
-    `fill-column' to nil.
-  * debian/rules (build, binary-erc): Build and install HTML
-    documentation.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Sun,  5 Feb 2006 01:26:56 -0500
-
-erc (5.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/control (Description): Update.
-  * debian/rules (binary-erc): Concatenate ChangeLog for 2005.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Fri, 27 Jan 2006 23:42:23 -0500
-
-erc (5.0.4-3) unstable; urgency=low
-
-  * Attempt to ensure that the full set of changes is generated.
-    Thanks to Romain Francoise for the advice.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Tue,  9 Aug 2005 18:23:09 -0500
-
-erc (5.0.4-2) unstable; urgency=low
-
-  * Makefile: Use debuild.
-  * debian/control:
-    - Update Standards-Version to 3.6.2.
-    - Add emacsen to Depends.
-    - Add Romain Francoise to Uploaders.
-  * debian/scripts/startup.erc: Minor whitespace fixup.
-  * erc.el: Fix make-variable-buffer-local compiler warning.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Mon,  8 Aug 2005 14:35:02 -0500
-
-erc (5.0.4-1) unstable; urgency=low
-
-  * New upstream release: Fix regression from 5.0.2 with the undo feature.
-  * debian/control: Make myself the maintainer.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Tue, 12 Jul 2005 18:12:11 -0500
-
-erc (5.0.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bug fix: "erc: fails to load when using erc-autoaway [PATCH]", thanks
-    to Daniel Brockman (Closes: #306179).
-  * Bug fix: "erc 5.0 is out", thanks to Cai Qian (Closes: #301952).
-  * Bug fix: "erc: cannot connect to Undernet", thanks to Frederic Roussel
-    (Closes: #282003).
-  * Bug fix: "erc: erc-nickserv fails everything when server name contains
-    digits", thanks to Pietro Giorgianni (Closes: #266347).
-  * Bug fix: "erc: README file missing", thanks to Milan Zamazal 
-    (Closes: #312195).
-  * The functionality of format-spec.el is provided in erc-compat.el, so
-    we no longer need to bundle it.
-
- -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Fri, 24 Jun 2005 15:17:18 -0500
-
-erc (5.0.2-1) unstable; urgency=low
-
-  * Michael W. Olson <mwolson@gnu.org>:
-    * New upstream release.
-    * Bug fix: "erc will not install at same time as emacs21", thanks to
-      Ryan Senior (Closes: #267511).
-    * debian/README.Debian: Moved news entries to newly-created NEWS.gz
-      file.
-    * debian/copyright: Adjust for copyright assignment that occurred after
-      5.0.2 release.
-    * format-spec.el: Added to make erc compile properly on emacs21.  Some
-      upstream fix will be made in the future.
-
- -- Mario Lang <mlang@debian.org>  Mon, 18 Apr 2005 19:13:02 +0200
-
-erc (4.0.cvs.20041118-1) unstable; urgency=low
-
-  * New CVS snapshot:
-    - Fixed "`emacs-mule' coding system doesn't exist on xemacs"
-      (Closes: Bug#223415).
-    - Fixed "missing provide in erc-sound.el" (Closes: #228511).
-    - Fix the `debrelease' target to correctly set dir modes (Closes: #262495).
-
- -- Mario Lang <mlang@debian.org>  Thu, 18 Nov 2004 17:44:25 +0100
-
-erc (4.0.cvs.20031027-1) unstable; urgency=low
-
-  * New CVS snapshot:
-    - Only disable erc-specific advices for `switch-to-buffer'.
-      (Closes: Bug#217022)
-
- -- Mario Lang <mlang@debian.org>  Mon, 27 Oct 2003 10:11:03 +0100
-
-erc (4.0.cvs.20031008-1) unstable; urgency=low
-
-  * New CVS snapshot.
-
- -- Mario Lang <mlang@debian.org>  Wed,  8 Oct 2003 20:55:09 +0200
-
-erc (4.0.cvs.20030913-2) unstable; urgency=low
-
-  * Fixed the building process in respect to generated diff.gz
-
- -- Mario Lang <mlang@debian.org>  Sat, 13 Sep 2003 23:30:14 +0200
-
-erc (4.0.cvs.20030913-1) unstable; urgency=low
-
-  * New CVS snapshot.
-  * We are now constantly pinging the server.  Combined with the fact
-    that the autojoin module is now loaded by default, this should
-    (Closes: Bug#177371)
-  * Use load instead of require (Closes: Bug#210685)
-  * Last upload also fixed the customize bug, just forgot to close it
-    (Closes: Bug#185794)
-
- -- Mario Lang <mlang@debian.org>  Sat, 13 Sep 2003 23:06:18 +0200
-
-erc (4.0.cvs.20030910-1) unstable; urgency=low
-
-  * New CVS snapshot.
-
- -- Mario Lang <mlang@debian.org>  Wed, 10 Sep 2003 19:53:46 +0200
-
-erc (3.0.cvs.20030119-1) unstable; urgency=low
-
-  * New CVS snapshot release.
-  * Do warn and prevent install for emacs20 (Closes: Bug#173464)
-  * No longer call (erc-completion-mode 1) in startup file
-    (Closes: Bug#173934)
-  * Cleanup workarea (Closes: Bug#177441)
-
- -- Mario Lang <mlang@debian.org>  Sun, 19 Jan 2002 13:10:10 +0100  
-
-erc (3.0.cvs.20021208-1) unstable; urgency=low
-
-  * New CVS snapshot release.
-  * Added (erc-completion-mode 1) to startup file.
-  * Dropped emacs20 compatibility.
-
- -- Mario Lang <mlang@debian.org>  Sun,  8 Dec 2002 16:10:11 +0100
- 
-erc (2.93.cvs.20021116-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-11-16.
-  * Allow for coninous logging.
-    Put (erc-save-buffer-in-logs) on `erc-insert-post-hook' to get this
-    behaviour.
-    (Closes: Bug#133267)
-  * Lot of changes (Closes: Bug#155063), see README.Debian for details.
-  * Redo the package generationg strategy to avoid producing a
-    debian native package (make debrelease).
-
- -- Mario Lang <mlang@debian.org>  Sat, 16 Nov 2002 20:10:00 +0100
-
-erc (2.93.cvs.20020819-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-08-19.
-  * Fix load-path (silly!)
-
- -- Mario Lang <mlang@debian.org>  Tue, 19 Aug 2002 10:33:00 +0100
-
-erc (2.93.cvs.20020814-1) unstable; urgency=low
-
-  * New maintainer (Closes: Bug#154636)
-  * New CVS snapshot release on 2002-08-14.
-  * Do not byte-compile errc-bbdb|chess|ibuffer|speedbar.el
-
- -- Mario Lang <mlang@debian.org>  Tue, 13 Aug 2002 15:33:21 +0100
-
-erc (2.93.cvs.20020708-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-07-08.
-  * Do not byte-compile erc-track.el for xemacs (Closes: #149351)
-  * Do not byte-compile erc-speak.el at all (Closes: #152043)
-  * Rewrote debian/scripts/install in make
-
- -- Gergely Nagy <algernon@debian.org>  Mon,  8 Jul 2002 14:03:22 +0200
-
-erc (2.91.cvs.20020404-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-04-04.
-    + Fixes for some XEmacs showstoppers
-    + Fixed a bug in /query handling
-    + Support for joining key protected channels
-  * Documented the warnings at install-time (Closes: #139534)
-
- -- Gergely Nagy <algernon@debian.org>  Thu,  4 Apr 2002 23:21:05 +0200
-
-erc (2.91.cvs.20020306-1) unstable; urgency=low
-
-  * New CVS snaphost release on 2002-03-06.
-
- -- Gergely Nagy <algernon@debian.org>  Wed,  6 Mar 2002 22:50:49 +0100
-
-erc (2.91.cvs.20020216-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-02-16:
-    + Multiline input works now (C-q C-j to insert a newline)
-    + Completely new insert-hook system (see erc-insert-pre-hook and
-    erc-send-pre-hook and the-like.
-    + Many small bugfixes.
-
-  * Due to the new insert-hook system, erc-insert-hook doesn't work
-    anymore. Don't forget to update your ~/.emacs.
-
- -- Gergely Nagy <algernon@debian.org>  Sat, 16 Feb 2002 23:45:23 +0100
-
-erc (2.1.cvs.20011215-1) unstable; urgency=high
-
-  * New CVS snapshot release on 2001-12-15:
-    + Support for saving (and optionally killing) a buffer on part
-    + New file: erc-replace.el, for washing and massaging messages
-
-  * Added format-spec.el (from the tramp package), as a workaround for
-    #123236. This closes: #123236.
-
-  * Urgency high, because without the above fix, erc is uninstallable on
-    emacs20 without either gnus or tramp.
-
- -- Gergely Nagy <algernon@debian.org>  Sat, 15 Dec 2001 14:10:42 +0100
-
-erc (2.1.cvs.20011208-1) unstable; urgency=medium
-
-  * New CVS snapshot release on 2001-12-08:
-    + erc-track-modified-channels-minor-mode disabled on emacs20, to work
-    around Bug#122748 (Closes: #122748)
-    + A set of filling related bugfixes
-
-  * Urgency medium, becuase of #122748
-
- -- Gergely Nagy <algernon@debian.org>  Sat,  8 Dec 2001 00:48:30 +0100
-
-erc (2.1.cvs.20011206-1) unstable; urgency=medium
-
-  * New CVS snapshot release on 2001-12-06:
-    + New filling strategy
-    + Channel-tracking rewritten as a minor-mode
-    + Fixed a longstanding bug, which surfaced under XEmacs
-
-  * Urgency medium, because of the XEmacs related fix
-
- -- Gergely Nagy <algernon@debian.org>  Thu,  6 Dec 2001 17:20:40 +0100
-
-erc (2.1.cvs.20011129-1) unstable; urgency=medium
-
-  * New CVS snapshot release on 2001-11-29:
-
-  * New buffer naming scheme, buffers now have names like #emacs and
-    #emacs<2> instead of #emacs!nick@irc-server. You can freely rename
-    them now, without breaking anything.
-  * New customizable mode-line and header-line support.
-    Look at erc-mode-line-format, erc-header-line-format and
-    erc-prepare-mode-line-format
-    + Now you get the announced server name in the modeline.
-  * Completely new server message parsing, mimicking zenirc's
-    ...server-*-hooks
-    + See defgroup erc-server-hooks 
-  * Split up in several files.
-    + erc-complete, for TAB completion
-    + erc-ring, for command history
-    + erc-fill, for filling IRC messages
-    + erc-bbdb, integrating BBDB into ERC
-    + erc-speedbar, for using the speedbar with ERC
-  * Dropped the erc-speak package, everything is in erc proper now
-  * And many, many more...
-
-  * Please note that due to the new server message parsing, erc-join-hook,
-    erc-part-hook, and possible some other hooks got removed, check your
-    ~/.emacs.
-
-  * Urgency medium, because it would be really unfortunate to have the
-    older erc in woody..
-  
- -- Gergely Nagy <algernon@debian.org>  Thu, 29 Nov 2001 13:43:22 +0100
-
-erc (2.1.cvs.20011025-4) unstable; urgency=low
-
-  * erc.el: (require 'cl), to reflect reality
-
- -- Gergely Nagy <algernon@debian.org>  Tue,  6 Nov 2001 18:34:19 +0100
-
-erc (2.1.cvs.20011025-3) unstable; urgency=low
-
-  * debian/scripts/install.in: move #PKGFLAG# before the -f
-    batch-byte-compile option, so erc-speak can be configured
-    successfully.
-
- -- Gergely Nagy <algernon@debian.org>  Wed, 31 Oct 2001 19:14:59 +0100
-
-erc (2.1.cvs.20011025-2) unstable; urgency=low
-
-  * Okay. Where's that rock?
-  * Rebuilt with a working fakeroot setup this time.
-
- -- Gergely Nagy <algernon@debian.org>  Sat, 27 Oct 2001 01:04:57 +0200
-
-erc (2.1.cvs.20011025-1) unstable; urgency=low
-
-  * CVS snapshot release on 2001-10-25
-  * debian/control: New package: erc-speak
-  * debian/maint/{postinst,prerm,conffiles}: replaced with .in files
-  * debian/scripts/{install,remove}: likewise
-  * debian/scripts/startup: superceded by package-specific startup files
-  * debian/README.erc-speak: new file
-  * debian/rules: reworked to build erc-speak too
-
- -- Gergely Nagy <algernon@debian.org>  Thu, 25 Oct 2001 13:00:07 +0200
-
-erc (2.1.cvs.1.73-1) unstable; urgency=low
-
-  * CVS snapshot release, erc.el revision 1.73
-  	+ supports auto-query
-  	+ smiley support
-  	+ lots of other features and fixes
-  * debian/scripts/startup: added two functions to autoload
-  * various cleanups in maintainer scripts and debian/rules
-
- -- Gergely Nagy <algernon@debian.org>  Sun, 21 Oct 2001 17:42:26 +0200
-
-erc (2.1.cvs.1.56-1) unstable; urgency=low
-
-  * CVS snapshot release, erc.el revision 1.56
-    + fixes to nick completion, among other things
-  * Default to `ircd' port instead of `irc' (Closes: #114349)
-
- -- Gergely Nagy <algernon@debian.org>  Thu,  4 Oct 2001 19:16:19 +0200
-
-erc (2.1-1) unstable; urgency=low
-
-  * Initial release (Closes: #113192)
-
- -- Gergely Nagy <algernon@debian.org>  Sun, 23 Sep 2001 14:58:31 +0200
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 426291b..0000000
--- a/debian/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: erc
-Section: net
-Priority: optional
-Maintainer: Michael W. Olson (GNU address) <mwolson@gnu.org>
-Uploaders: Mario Lang <mlang@debian.org>, Romain Francoise <rfrancoise@debian.org>
-Build-Depends-Indep: texinfo, texi2html
-Standards-Version: 3.6.2
-
-Package: erc
-Architecture: all
-Depends: make, emacs21 | xemacs21 | emacsen
-Suggests: speedbar, bbdb, emacspeak, emacs-chess
-Replaces: erc-speak
-Conflicts: erc-speak
-Description: an IRC client for Emacs
- ERC is a powerful, modular, and extensible IRC client for Emacs.
- It supports multiple channel-buffers, nick completion, keyword
- highlighting, and more.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index d7de7d1..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,50 +0,0 @@
-This package was debianized by Gergely Nagy <algernon@debian.org>
-
-It was downloaded from
-   http://sourceforge.net/projects/erc/
-
-Upstream Authors: Alexander L. Belikoff (abel@bfr.co.il),
-		  Sergey Berezin (sergey.berezin@cs.cmu.edu),
-		  Mario Lang (mlang@delysid.org),
-		  Alex Schroeder (alex@gnu.org),
-		  Gergely Nagy (algernon@debian.org),
-		  Andreas Fuchs (asf@void.at),
-		  Tijs van Bakel (smoke@wanadoo.nl),
-		  Brian P Templeton (bpt@tunes.org),
-		  John Wiegley (johnw@gnu.org),
-		  Diane Murray (dsm@muenster.de),
-		  Benjamin Drieu (benj@debian.org),
-		  Jorgen Schaefer (forcer@users.sourceforge.net),
-		  Francis Litterio (franl@users.sourceforge.net),
-		  Damien Elmes (erc@repose.cx),
-		  Lawrence Mitchell (wence@gmx.li),
-		  Sandra Jean Chua (sacha@free.net.ph),
-		  Jeremy Bertram Maitin-Shepard (jbms@gentoo.org),
-		  Johan Bockgard (bojohan@users.sourceforge.net),
-		  Edward O'Connor (ted@oconnor.cx),
-		  Brian Palmer (bpalmer@rescomp.Stanford.EDU),
-		  Adrian Aichner (adrian@xemacs.org),
-		  Michael Olson (mwolson@gnu.org)
-
-Copyright:
-
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-     2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-   Copyright (C) 2004 Brian Palmer
-
-   This package 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; version 2 dated June, 1991.
-
-   This package 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 this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/maint/conffiles b/debian/maint/conffiles
deleted file mode 100644
index 91af3c7..0000000
--- a/debian/maint/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/emacs/site-start.d/50erc.el
diff --git a/debian/maint/postinst b/debian/maint/postinst
deleted file mode 100644
index a0dde2b..0000000
--- a/debian/maint/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ "$1" = "configure" ] && \
-   [ -x /usr/lib/emacsen-common/emacs-package-install ]; then
-    /usr/lib/emacsen-common/emacs-package-install erc
-fi
-
-if [ "$1" = "configure" ]; then
-    install-info --quiet --section "Emacs" "emacs" /usr/share/info/erc.info
-fi
diff --git a/debian/maint/prerm b/debian/maint/prerm
deleted file mode 100644
index 45e0376..0000000
--- a/debian/maint/prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ -x /usr/lib/emacsen-common/emacs-package-remove ] ; then
-    /usr/lib/emacsen-common/emacs-package-remove erc
-fi
-
-if [ "$1" = remove ] || [ "$1" = upgrade ]; then
-	install-info --quiet --remove /usr/share/info/erc.info
-fi
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index f8e8c9b..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /usr/bin/make -f
-## Written by Gergely Nagy <algernon@debian.org>
-## This is under GPL v2.
-
-PACKAGE		= erc
-PKGDIR		= debian/${PACKAGE}
-SOURCES		= $(wildcard *.el)
-DOCDIR		= /usr/share/doc/${PACKAGE}
-INFODIR		= /usr/share/info
-LISPDIR		= /usr/share/emacs/site-lisp/erc
-
-configure: configure-stamp
-configure-stamp:
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	makeinfo erc.texi
-	texi2html erc.texi
-	touch build-stamp
-
-clean: 
-	test -e debian/control 
-	rm -rf debian/erc debian/files
-
-install: build
-	test -e debian/control
-	install -d ${PKGDIR}${LISPDIR} ${PKGDIR}/etc/emacs/site-start.d
-	install -m 0644 ${SOURCES} ${PKGDIR}${LISPDIR}
-
-binary-erc: install
-	test -e debian/control && test "x`whoami`" = "xroot"
-## Install debian-specific stuff
-# Some directories
-	install -d ${PKGDIR}${DOCDIR} \
-		${PKGDIR}/usr/lib/emacsen-common/packages/install \
-		${PKGDIR}/usr/lib/emacsen-common/packages/remove
-# The changelog..
-	install -m 0644 debian/changelog ${PKGDIR}${DOCDIR}/changelog.Debian
-	install -m 0644 ChangeLog ${PKGDIR}${DOCDIR}/changelog
-	cat ChangeLog.2005 >> ${PKGDIR}${DOCDIR}/changelog
-	cat ChangeLog.2004 >> ${PKGDIR}${DOCDIR}/changelog
-	cat ChangeLog.2003 >> ${PKGDIR}${DOCDIR}/changelog
-	cat ChangeLog.2002 >> ${PKGDIR}${DOCDIR}/changelog
-	cat ChangeLog.2001 >> ${PKGDIR}${DOCDIR}/changelog
-# ..the copyright file..
-	install -m 0644 debian/copyright ${PKGDIR}${DOCDIR}/
-# ..some documentation
-	install -m 0644 CREDITS HISTORY NEWS erc.html ${PKGDIR}${DOCDIR}/
-	install -d ${PKGDIR}${INFODIR}
-	install -m 0644 erc.info ${PKGDIR}${INFODIR}/erc.info
-# the emacs-install scripts
-	install -m 0755 debian/scripts/install \
-		${PKGDIR}/usr/lib/emacsen-common/packages/install/${PACKAGE}
-	install -m 0755 debian/scripts/remove \
-		${PKGDIR}/usr/lib/emacsen-common/packages/remove/${PACKAGE}
-# Install an autoload script
-	install -m 0644 debian/scripts/startup.${PACKAGE} \
-		${PKGDIR}/etc/emacs/site-start.d/50${PACKAGE}.el
-## Compress stuff
-	gzip -9f ${PKGDIR}${DOCDIR}/changelog.Debian \
-		 ${PKGDIR}${DOCDIR}/changelog \
-		 ${PKGDIR}${DOCDIR}/NEWS
-## Fix permissions
-	find ${PKGDIR} -print0 2>/dev/null | xargs -0r chown \
-						   --no-dereference 0.0
-	find ${PKGDIR} ! -type l -print 0 2>/dev/null | xargs -0r \
-		chmod go=rX,u+rw,a-s
-## Install stuff to DEBIAN/
-	install -d ${PKGDIR}/DEBIAN
-	install -m 0755 debian/maint/postinst debian/maint/prerm \
-		${PKGDIR}/DEBIAN/
-# Install conffile list
-	install -m 0644 debian/maint/conffiles ${PKGDIR}/DEBIAN/conffiles
-## Install READMEs
-	install -m 0644 debian/README.erc-speak debian/README.Debian \
-		README ${PKGDIR}${DOCDIR}/
-## Generate DEBIAN/md5sums
-	cd ${PKGDIR} >/dev/null ;\
-	 find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
-## Generate DEBIAN/control
-	dpkg-gencontrol -isp -p${PACKAGE} -P${PKGDIR}
-## Build the binary package
-	dpkg --build ${PKGDIR} ..
-
-binary-indep: binary-erc
-binary-arch: ;
-binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean build binary-erc install
diff --git a/debian/scripts/install b/debian/scripts/install
deleted file mode 100755
index 722b4d9..0000000
--- a/debian/scripts/install
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# -*- Makefile -*-
-
-# This wrapper was written by Michael Olson <mwolson@gnu.org>.
-
-# The purpose for doing this is to ensure that only the first argument
-# is acted on.  There does not seem to be a feasible way of doing this
-# using Make.
-
-# The only inconveniences we suffer here are (1) an extra shell
-# instance is loaded and (2) all `$' characters must be escaped.
-
-make -f - $1 <<EOF
-## Written by Gergely Nagy <algernon@debian.org>
-## Adapted by Mario Lang <mlang@debian.org>
-
-PACKAGE	:= erc
-ELDIR	:= /usr/share/emacs/site-lisp/\${PACKAGE}
-ELFILES	:= \$(filter-out erc-bbdb.el erc-speedbar.el erc-speak.el erc-chess.el erc-ibuffer.el, \
-	     \$(subst \${ELDIR}/,,\$(wildcard \${ELDIR}/erc*.el)))
-SITEFLAG = --no-site-file
-FLAGS	= -q -batch -l path.el -f batch-byte-compile
-FLAVOUR	= \$@
-ELCDIR	= /usr/share/\${FLAVOUR}/site-lisp/\${PACKAGE}
-FILES = \$(ELFILES)
-
-emacs: ;
-
-xemacs%: SITEFLAG = -no-site-file
-
-emacs20:
-	@echo install/erc: Handling install for emacsen flavor \$@
-	@echo Sorry, ERC does no longer support emacs20.
-	@echo We recommend that you install emacs21.
-
-.DEFAULT: \${ELCDIR}/path.el
-	@echo install/erc: Handling install for emacsen flavor \$(FLAVOUR)
-	@install -m 755 -d \${ELCDIR}
-	@cd \${ELDIR} && cp \${FILES} \${ELCDIR}
-	@cd \${ELCDIR} && \
-	echo "(setq load-path (cons \".\" load-path) byte-compile-warnings nil)" >path.el && \
-	\${FLAVOUR} \${SITEFLAG} \${FLAGS} \${FILES}
-	@cd \${ELCDIR} && rm -f \${FILES} path.el
-
-.SUFFIXES:
-.PHONY:
-EOF
diff --git a/debian/scripts/remove b/debian/scripts/remove
deleted file mode 100755
index 57c17ca..0000000
--- a/debian/scripts/remove
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-set -e
-
-FLAVOR=$1
-PACKAGE=erc
-
-if [ ${FLAVOR} != emacs ]; then
-    echo remove/erc: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff --git a/debian/scripts/startup.erc b/debian/scripts/startup.erc
deleted file mode 100644
index f0f6eaf..0000000
--- a/debian/scripts/startup.erc
+++ /dev/null
@@ -1,13 +0,0 @@
-;; -*-emacs-lisp-*-
-;; Emacs startup file for the Debian erc package
-
-; add `/usr/share/{emacs20,xemacs20,...}/site-lisp/erc' to the
-; load-path
-(setq load-path (cons (concat "/usr/share/"
-                              "emacs"
-                              "/site-lisp/erc") load-path))
-(setq load-path (cons (concat "/usr/share/"
-                              (symbol-name flavor)
-                              "/site-lisp/erc") load-path))
-
-(load "erc-auto")



From MAILER-DAEMON Sun Oct 14 00:50:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQU-0005iy-KU
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQT-0005iD-Kr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQT-0005ho-6s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOq-00050C-C6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
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@hcoop.net>) id 1IgvOq-0003vu-3Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOp-00054m-E5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOp-0005hH-Fr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOp-0005hH-Fr@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:23 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Update copyright years.
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, 14 Oct 2007 04:50:05 -0000

commit 54329b0119621fa264d0e3ccf0d5e76ff7f694d2
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Aug 5 23:53:53 2006 +0000

    erc-log: Update copyright years.
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-32

diff --git a/erc-log.el b/erc-log.el
index 32924e6..19e7205 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 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lawrence Mitchell <wence@gmx.li>
 ;; Keywords: IRC, chat, client, Internet, logging



From MAILER-DAEMON Sun Oct 14 00:50:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQU-0005j2-Mp
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQU-0005ib-1s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOq-0004wJ-LO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOk-0004vz-Pe
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
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@hcoop.net>) id 1IgvOk-0003uM-Hw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOj-000532-RN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOj-0005YA-Ue
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOj-0005YA-Ue@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.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: Sun, 14 Oct 2007 04:50:06 -0000

commit bb14c89d124124506ac1ab5b4587fd3664896648
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jul 2 05:28:03 2006 +0000

    Merged from erc--rel--5.1
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-15
       Fix error in /PART, undesired behavior in part-reason-various.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-14

diff --git a/ChangeLog b/ChangeLog
index 920fb2b..9345e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-02  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
+	can happen when doing /PART.
+
+	* erc.el (erc-quit-reason-various-alist)
+	(erc-part-reason-various-alist): In the example, use "^$" as an
+	example, since "" matches anything.
+	(erc-quit-reason-various, erc-part-reason-various): If no argument
+	is given, and no matches are found, use our default reason instead
+	of "nil".
+
 2006-06-27  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el: Update maintainer information and URLs.
diff --git a/erc-backend.el b/erc-backend.el
index 5f86ea5..817a67d 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -851,8 +851,10 @@ Finds hooks by looking in the `erc-server-responses' hashtable."
   (let ((hook (or (erc-get-hook (erc-response.command message))
                   'erc-default-server-functions)))
     (run-hook-with-args-until-success hook process message)
-    (with-current-buffer (erc-server-buffer)
-      (run-hook-with-args 'erc-timer-hook (erc-current-time)))))
+    (let ((server-buffer (erc-server-buffer)))
+      (when (buffer-live-p server-buffer)
+        (with-current-buffer server-buffer
+          (run-hook-with-args 'erc-timer-hook (erc-current-time)))))))
 
 (add-hook 'erc-default-server-functions 'erc-handle-unknown-server-response)
 
diff --git a/erc.el b/erc.el
index fdc524a..0dcdba0 100644
--- a/erc.el
+++ b/erc.el
@@ -872,7 +872,7 @@ As an example:
 	(\"xmms\" dme:now-playing)
 	(\"version\" erc-quit-reason-normal)
 	(\"home\" \"Gone home !\")
-	(\"\" \"Default Reason\")))
+	(\"^$\" \"Default Reason\")))
 If the user types \"/quit zippy\", then a Zippy the Pinhead quotation
 will be used as the quit message."
   :group 'erc-quit-and-part
@@ -896,7 +896,7 @@ As an example:
 	(\"xmms\" dme:now-playing)
 	(\"version\" erc-part-reason-normal)
 	(\"home\" \"Gone home !\")
-	(\"\" \"Default Reason\")))
+	(\"^$\" \"Default Reason\")))
 If the user types \"/part zippy\", then a Zippy the Pinhead quotation
 will be used as the part message."
   :group 'erc-quit-and-part
@@ -3058,8 +3058,8 @@ If S is non-nil, it will be used as the quit reason."
     (cond
      ((functionp res) (funcall res))
      ((stringp res) res)
-     ;; hopefully never reached
-     (s))))
+     (s s)
+     (t (erc-quit-reason-normal)))))
 
 (defun erc-part-reason-normal (&optional s)
   "Normal part message.
@@ -3085,7 +3085,8 @@ If S is non-nil, it will be used as the quit reason."
     (cond
      ((functionp res) (funcall res))
      ((stringp res) res)
-     (s))))
+     (s s)
+     (t (erc-part-reason-normal)))))
 
 (defun erc-cmd-QUIT (reason)
   "Disconnect from the current server.



From MAILER-DAEMON Sun Oct 14 00:50:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQV-0005k2-Qz
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQU-0005jH-QJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQU-0005ip-Bs
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOq-00050B-Al
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
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@hcoop.net>) id 1IgvOq-0003vq-0d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOp-00054g-48
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOp-0005gm-7R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOp-0005gm-7R@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:23 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Make log file names safe.
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, 14 Oct 2007 04:50:07 -0000

commit df12cd4ddd24875b5041201120dfa0dc35bec468
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Aug 5 23:52:52 2006 +0000

    erc-log: Make log file names safe.
    
    * erc-log.el (erc-log-standardize-name): New function that returns a
      filename that is safe for use for a log file.
      (erc-current-logfile): Use it.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-31

diff --git a/ChangeLog b/ChangeLog
index 67d944d..0d54e14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-05  Michael Olson  <mwolson@gnu.org>
 
+	* erc-log.el (erc-log-standardize-name): New function that returns
+	a filename that is safe for use for a log file.
+	(erc-current-logfile): Use it.
+
 	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 	since that is a fairly standard directory.
 	(erc-select-startup-file): Re-write to use
diff --git a/erc-log.el b/erc-log.el
index 78fab79..32924e6 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -71,8 +71,6 @@
 ;; markers.
 
 ;;; TODO:
-;; * Erc needs a generalised make-safe-file-name function, so that
-;;   generated file names don't contain any invalid file characters.
 ;;
 ;; * Really, we need to lock the logfiles somehow, so that if a user
 ;;   is running multiple emacsen and/or on the same channel as more
@@ -299,17 +297,27 @@ is writeable (it will be created as necessary) and
 	   (funcall erc-enable-logging (or buffer (current-buffer)))
 	 erc-enable-logging)))
 
+(defun erc-log-standardize-name (filename)
+  "Make FILENAME safe to use as the name of an ERC log.
+This will not work with full paths, only names.
+
+Any unsafe characters in the name are replaced with \"!\".  The
+filename is downcased."
+  (downcase (erc-replace-regexp-in-string
+	     "[/\\]" "!" (convert-standard-filename filename))))
+
 (defun erc-current-logfile (&optional buffer)
   "Return the logfile to use for BUFFER.
 If BUFFER is nil, the value of `current-buffer' is used.
 This is determined by `erc-generate-log-file-name-function'.
 The result is converted to lowercase, as IRC is case-insensitive"
   (expand-file-name
-   (downcase (funcall erc-generate-log-file-name-function
-		      (or buffer (current-buffer))
-		      (or (erc-default-target) (buffer-name buffer))
-		      (erc-current-nick)
-		      erc-session-server erc-session-port))
+   (erc-log-standardize-name
+    (funcall erc-generate-log-file-name-function
+	     (or buffer (current-buffer))
+	     (or (erc-default-target) (buffer-name buffer))
+	     (erc-current-nick)
+	     erc-session-server erc-session-port))
    erc-log-channels-directory))
 
 (defun erc-generate-log-file-name-with-date (buffer &rest ignore)



From MAILER-DAEMON Sun Oct 14 00:50:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQY-0005mv-RB
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQV-0005je-Bd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOq-0004u4-TX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOj-0004ty-19
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
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@hcoop.net>) id 1IgvOi-0003tl-Rm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOi-00052Q-4O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOi-0005V9-5a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOi-0005V9-5a@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:16 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make erc-active-buffer command a bit
	safer.
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, 14 Oct 2007 04:50:07 -0000

commit ed6786aa78b18f5e3a92d15b2cb8229d766fde85
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Jun 14 21:29:42 2006 +0000

    Make erc-active-buffer command a bit safer.
    
    * erc.el (erc-active-buffer): If the active buffer has been deleted,
      default to the server buffer.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-8

diff --git a/ChangeLog b/ChangeLog
index 167a705..16ae791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-14  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-active-buffer): If the active buffer has been
+	deleted, default to the server buffer.
+
 2006-06-12  Michael Olson  <mwolson@gnu.org>
 
 	* NEWS: Add items since the 5.1.2 release.
diff --git a/erc.el b/erc.el
index c3c2a54..76ef789 100644
--- a/erc.el
+++ b/erc.el
@@ -1373,7 +1373,10 @@ server buffer")
 (defun erc-active-buffer ()
   "Return the value of `erc-active-buffer' for the current server.
 Defaults to the server buffer."
-  (with-current-buffer (erc-server-buffer) erc-active-buffer))
+  (with-current-buffer (erc-server-buffer)
+    (if (buffer-live-p erc-active-buffer)
+	erc-active-buffer)
+    (setq erc-active-buffer (current-buffer))))
 
 (defun erc-set-active-buffer (buffer)
   "Set the value of `erc-active-buffer' to BUFFER."



From MAILER-DAEMON Sun Oct 14 00:50:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQZ-0005n1-2A
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQV-0005jz-NB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOq-0004sz-KT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOh-0004sn-8v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
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@hcoop.net>) id 1IgvOh-0003tE-1E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOg-00051s-BD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOg-0005S9-Ct
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOg-0005S9-Ct@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update AUTHORS.
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, 14 Oct 2007 04:50:08 -0000

commit 8f65bf9977453f3e502ec396da85355a3ec43c41
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Jun 3 18:04:45 2006 +0000

    Update AUTHORS.
    
    * AUTHORS: Update for Savannah move.  No old entries have been removed,
      in case people have not registered yet on Savannah.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-2

diff --git a/AUTHORS b/AUTHORS
index 4dace41..41ec666 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,21 +1,21 @@
-adriana     Adrian Aichner <adrian@xemacs.org>
 algernon    Gergely Nagy <algernon@debian.org>
+anaran      Adrian Aichner <adrian@xemacs.org>
 antifuchs   Andreas Fuchs <asf@void.at>
 benj2       Benjamin Drieu <benj@debian.org>
-bigmike160  Michael Olson <mwolson@gnu.org>
 bojohan     Johan Bockgard <bojohan@users.sourceforge.net>
+bpalmer     Brian Palmer <bpalmer@gmail.com>
 disumu      Diane Murray <disumu@x3y2z1.net>
-elisteran   Brian Palmer <bpalmer@gmail.com>
-emcdloc     Edward O'Connor <ted@oconnor.cx>
-forcer      Jorgen Schaefer <forcer@users.sourceforge.net>
+forcer      Jorgen Schaefer <forcer@forcix.cx>
 franl       Francis Litterio <franl@users.sourceforge.net>
+hober       Edward O'Connor <ted@oconnor.cx>
 jbms        Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 jwiegley    John Wiegley <johnw@gnu.org>
 kensanata   Alex Schroeder <alex@gnu.org>
 mlang       Mario Lang <mlang@delysid.org>
 mtoledo     Marcelo Toledo <marcelo@marcelotoledo.org>
+mwolson     Michael Olson <mwolson@gnu.org>
 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>
-wencem      Lawrence Mitchell <wence@gmx.li>
+wence       Lawrence Mitchell <wence@gmx.li>
diff --git a/ChangeLog b/ChangeLog
index 2d6c995..818612b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-03  Michael Olson  <mwolson@gnu.org>
+
+	* AUTHORS: Update for Savannah move.  No old entries have been
+	removed, in case people have not registered yet on Savannah.
+
 2006-06-01  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-buffer-filter): Make sure all buffers returned from



From MAILER-DAEMON Sun Oct 14 00:50:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQZ-0005nQ-Im
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQW-0005ke-6i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOq-0004rG-Fk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOe-0004q2-Bl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
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@hcoop.net>) id 1IgvOd-0003rz-TY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOd-00050n-8C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOd-0005Me-AN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOd-0005Me-AN@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:11 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:50:08 -0000

commit 66323cbd9ea064be6799096edcb92a7c51077cd8
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Mar 27 03:25:05 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-149

diff --git a/erc.el b/erc.el
index 223bc2e..6ec06bf 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.812 $"
+(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.813 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:50:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQZ-0005ni-QM
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQW-0005l3-Kb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOq-0004na-IH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOb-0004nS-G7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
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@hcoop.net>) id 1IgvOb-0003r7-8x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOa-0004zn-JZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOa-0005I7-Lw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOa-0005I7-Lw@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:08 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-identd: Fix 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: Sun, 14 Oct 2007 04:50:09 -0000

commit 2af6f3edbdeca296dc111c52466f7525ebb68f33
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 25 05:34:50 2006 +0000

    erc-identd: Fix bug.
    
    * erc-identd.el (erc-identd-start): Fix a bug by making sure that
      erc-identd-process is set properly.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-140

diff --git a/ChangeLog b/ChangeLog
index d9007e1..1343da5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-25  Michael Olson  <mwolson@gnu.org>
+
+	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
+	erc-identd-process is set properly.
+
 2006-03-21  Michael Olson  <mwolson@gnu.org>
 
 	* CREDITS: Add Nelson Ferreira.  Change contact address.
diff --git a/erc-identd.el b/erc-identd.el
index 5cb179c..0b9532a 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -60,14 +60,14 @@ system."
 	(setq port (string-to-number port))))
   (if erc-identd-process
       (delete-process erc-identd-process))
-  (if (fboundp 'make-network-process)
-      (setq erc-identd-process
+  (setq erc-identd-process
+	(if (fboundp 'make-network-process)
 	    (make-network-process :name "identd"
 				  :buffer (generate-new-buffer "identd")
 				  :service port :server t :noquery t
 				  :filter 'erc-identd-filter))
-    (open-network-stream-server "identd" (generate-new-buffer "identd")
-				port nil 'erc-identd-filter)))
+	(open-network-stream-server "identd" (generate-new-buffer "identd")
+				    port nil 'erc-identd-filter)))
 
 (defun erc-identd-stop (&rest ignore)
   (interactive)



From MAILER-DAEMON Sun Oct 14 00:50:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQc-0005qE-UM
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQY-0005lx-0J
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQX-0005lS-DW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP9-00054A-Oi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP9-000416-Dr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP8-0005BW-Na
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP8-0006BP-PQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP8-0006BP-PQ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:42 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Simplified
	erc-restore-text-properties, moved it to 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: Sun, 14 Oct 2007 04:50:10 -0000

commit 2e39b828140367094385e13a2bc6f3484766d549
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Tue Jan 16 17:05:37 2007 +0000

    Simplified erc-restore-text-properties, moved it to erc.el.
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-92

diff --git a/ChangeLog b/ChangeLog
index 59fd87d..bc6b1c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-16  Diane Murray  <disumu@x3y2z1.net>
+
+	* 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
diff --git a/erc-fill.el b/erc-fill.el
index 9552ce8..3305146 100644
--- a/erc-fill.el
+++ b/erc-fill.el
@@ -187,14 +187,6 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'."
       (length (format-time-string erc-timestamp-format))
     0))
 
-(defun erc-restore-text-properties ()
-  "Restore the property 'erc-parsed for the region."
-  (let* ((parsed-posn (text-property-not-all (point-min) (point-max)
-                                             'erc-parsed nil))
-         (parsed-prop (when parsed-posn
-                        (get-text-property parsed-posn 'erc-parsed))))
-    (put-text-property (point-min) (point-max) 'erc-parsed parsed-prop)))
-
 (provide 'erc-fill)
 
 ;;; erc-fill.el ends here
diff --git a/erc.el b/erc.el
index 5d82269..bdbb9ff 100644
--- a/erc.el
+++ b/erc.el
@@ -6237,6 +6237,14 @@ This function should be on `erc-kill-channel-hook'."
   "Find the next occurrence of the `erc-parsed' text property."
   (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
 
+(defun erc-restore-text-properties ()
+  "Restore the property 'erc-parsed for the region."
+  (let ((parsed-posn (erc-find-parsed-property)))
+    (put-text-property
+     (point-min) (point-max)
+     'erc-parsed (when parsed-posn
+                   (get-text-property parsed-posn 'erc-parsed)))))
+
 (defun erc-get-parsed-vector (point)
   "Return the whole parsed vector on POINT."
   (get-text-property point 'erc-parsed))



From MAILER-DAEMON Sun Oct 14 00:50:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQd-0005qY-Aw
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQY-0005mx-Tp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQY-0005mL-C2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP9-000549-CS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP9-00040O-4V
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP8-0005BN-Ck
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP8-0006Au-GE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP8-0006Au-GE@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:42 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Manual: Document erc-capab-identify
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, 14 Oct 2007 04:50:11 -0000

commit 296cd61ee1b1c5abc5399c41223732551f1e72cf
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Jan 13 21:47:07 2007 +0000

    Manual: Document erc-capab-identify
    
    * erc.texi (Modules): Document erc-capab-identify.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-91

diff --git a/ChangeLog b/ChangeLog
index 1598161..59fd87d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	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
diff --git a/erc.texi b/erc.texi
index 1c203cd..a1347b0 100644
--- a/erc.texi
+++ b/erc.texi
@@ -411,6 +411,10 @@ Integrate with the Big Brother Database
 @item button
 Buttonize URLs, nicknames, and other text
 
+@cindex modules, capab-identify
+@item capab-identify
+Mark unidentified users on freenode and other servers supporting CAPAB.
+
 @cindex modules, completion
 @item pcomplete
 Complete nicknames and commands (programmable)



From MAILER-DAEMON Sun Oct 14 00:50:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQe-0005rZ-IM
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQa-0005oi-Sj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQZ-0005nC-Ci
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP9-000548-9S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP8-00040U-Th
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP7-0005B5-QD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP7-00069u-Rl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP7-00069u-Rl@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:41 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Moved function to find `erc-parsed'
	property to 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: Sun, 14 Oct 2007 04:50:14 -0000

commit 70a1912606485c1b409774319cec981120fa0b86
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 11 12:44:32 2007 +0000

    Moved function to find `erc-parsed' property to erc.el.
    
    * 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'.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-89

diff --git a/ChangeLog b/ChangeLog
index 503d29d..22e9deb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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'
diff --git a/erc-capab.el b/erc-capab.el
index 6155172..eb90722 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -174,8 +174,7 @@ PARSED is an `erc-parsed' response struct."
   "Add `erc-capab-identify-prefix' to nickname if user is unidentified."
   (when (and erc-capab-identify-prefix
              (erc-with-server-buffer erc-capab-identify-activated))
-    (goto-char (point-min))
-    (goto-char (or (erc-capab-find-parsed) (point-min)))
+    (goto-char (or (erc-find-parsed-property) (point-min)))
     (let ((nickname (erc-capab-get-unidentified-nickname
                      (erc-get-parsed-vector (point)))))
       (when (and nickname
@@ -187,17 +186,6 @@ PARSED is an `erc-parsed' response struct."
                                 'face (get-char-property (- (point) 1)
                                                          'face)))))))
 
-(defun erc-capab-find-parsed ()
-  "Return the position of text found with the `erc-parsed' property."
-  (catch 'position
-    (while (< (point) (point-max))
-      (cond ((get-char-property (point) 'erc-parsed)
-             (throw 'position (point)))
-            (t
-             (goto-char (or (next-single-property-change
-                             (point) 'erc-parsed)
-                            (point-max))))))))
-
 (defun erc-capab-get-unidentified-nickname (parsed)
   "Return the nickname of the user if unidentified.
 PARSED is an `erc-parsed' response struct."
diff --git a/erc-track.el b/erc-track.el
index 3c8f93a..f836a78 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -773,10 +773,6 @@ is in `erc-mode'."
 		      str)
    (erc-faces-in str)))
 
-(defun erc-find-parsed-property ()
-  "Find the next occurrence of the `erc-parsed' text property."
-  (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
-
 ;;; Buffer switching
 
 (defvar erc-track-last-non-erc-buffer nil
diff --git a/erc.el b/erc.el
index e6e21c8..44560a6 100644
--- a/erc.el
+++ b/erc.el
@@ -6230,6 +6230,10 @@ This function should be on `erc-kill-channel-hook'."
 
 ;;; Dealing with `erc-parsed'
 
+(defun erc-find-parsed-property ()
+  "Find the next occurrence of the `erc-parsed' text property."
+  (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
+
 (defun erc-get-parsed-vector (point)
   "Return the whole parsed vector on POINT."
   (get-text-property point 'erc-parsed))



From MAILER-DAEMON Sun Oct 14 00:50:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQf-0005s7-4d
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQc-0005pf-2y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQa-0005oE-J4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOz-00053Q-ES
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
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@hcoop.net>) id 1IgvOz-0003yk-6w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOy-00057e-GM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOy-0005vO-IR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOy-0005vO-IR@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:32 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix bug in last patch
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, 14 Oct 2007 04:50:14 -0000

commit e2faae921abf78683ed31af09236a9eabd090a90
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Nov 12 05:39:42 2006 +0000

    Fix bug in last patch
    
    * erc-log.el (erc-log-save-all-buffers): Don't filter out server buffers
      prematurely.  That was testing code.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-60

diff --git a/erc-log.el b/erc-log.el
index e548645..d3da45f 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -282,8 +282,7 @@ Returns nil iff `erc-server-buffer-p' returns t."
 ;; Make sure that logs get saved, even if someone overrides the active
 ;; process prompt for a quick exit from Emacs
 (defun erc-log-save-all-buffers ()
-  (dolist (buffer (erc-buffer-filter #'(lambda ()
-					 (not (erc-server-buffer-p)))))
+  (dolist (buffer (erc-buffer-list))
     (erc-save-buffer-in-logs buffer)))
 
 ;;;###autoload



From MAILER-DAEMON Sun Oct 14 00:50:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQf-0005sC-Jd
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQc-0005q7-PV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQc-0005pU-0l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP9-000547-9O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP8-0003zx-TO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP8-0005BB-4d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP8-0006AP-7N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP8-0006AP-7N@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:42 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix display bug for paths that look
	like commands
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, 14 Oct 2007 04:50:15 -0000

commit 7485a803c2e380648e952d4df5505b1971b26ddf
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Jan 13 19:35:02 2007 +0000

    Fix display bug for paths that look like commands
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-90

diff --git a/ChangeLog b/ChangeLog
index 22e9deb..1598161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2007-01-11  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el (erc-find-parsed-property): Moved here from erc-track.el
diff --git a/erc.el b/erc.el
index 44560a6..5d82269 100644
--- a/erc.el
+++ b/erc.el
@@ -4921,6 +4921,9 @@ Specifically, return the position of `erc-insert-marker'."
    erc-input-marker
    (erc-end-of-input-line)))
 
+(defvar erc-command-regexp "^/\\([A-Za-z]+\\)\\(\\s-+.*\\|\\s-*\\)$"
+  "Regular expression used for matching commands in ERC.")
+
 (defun erc-send-input (input)
   "Treat INPUT as typed in by the user. It is assumed that the input
 and the prompt is already deleted.
@@ -4942,7 +4945,7 @@ This returns non-nil only iff we actually send anything."
       (run-hook-with-args 'erc-send-pre-hook input)
       (when erc-send-this
 	(if (or (string-match "\n" str)
-		(not (char-equal (aref str 0) ?/)))
+		(not (string-match erc-command-regexp str)))
 	    (mapc
 	     (lambda (line)
 	       (mapc
@@ -5007,7 +5010,7 @@ current position."
   "Extract command and args from the input LINE.
 If no command was given, return nil.  If command matches, return a
 list of the form: (command args) where both elements are strings."
-  (when (string-match "^/\\([A-Za-z]+\\)\\(\\s-+.*\\|\\s-*\\)$" line)
+  (when (string-match erc-command-regexp line)
     (let* ((cmd (erc-command-symbol (match-string 1 line)))
 	   ;; note: return is nil, we apply this simply for side effects
 	   (canon-defun (while (and cmd (symbolp (symbol-function cmd)))



From MAILER-DAEMON Sun Oct 14 00:50:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQg-0005tC-SW
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOs-0004uM-Di
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOV-0004hR-GF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004gu-9C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003nx-CL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOR-0004wL-OB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:47:59 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOR-000527-QX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:47:59 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOR-000527-QX@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:47:59 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix some erc-migrate-modules 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: Sun, 14 Oct 2007 04:50:16 -0000

commit 59e2119b78679f6c7c514af9aa363088e18d5087
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Feb 10 22:06:11 2006 +0000

    Fix some erc-migrate-modules bugs.
    
    * Makefile (debbuild): Split from debrelease.
      (debrevision-mwolson): New rule that causes a Debian revision to be
      built.
    
    * erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to Johan
      Bockgård.
      (erc-modules): Change use of 'pcomplete to 'completion.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-108

diff --git a/ChangeLog b/ChangeLog
index cbddc26..ea74df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-10  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (debbuild): Split from debrelease.
+	(debrevision-mwolson): New rule that causes a Debian revision to
+	be built.
+
+	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
+	Johan Bockgård.
+	(erc-modules): Change use of 'pcomplete to 'completion.
+
 2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-capab.el: Require erc.
diff --git a/Makefile b/Makefile
index cc902ea..fef2a64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION=5.1.1
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.0.4-2
+LASTUPLOAD = 5.1.1-1
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
@@ -80,6 +80,15 @@ distclean:
 	-rm -f $(MANUAL).info $(MANUAL).html $(TARGET)
 	-rm -Rf ../$(SNAPDIR)
 
+debbuild: 
+	(cd ../$(SNAPDIR) && \
+	  dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
+	    -us -uc -rfakeroot && \
+	  echo "Running lintian ..." && \
+	  lintian -i ../erc_$(VERSION)*.deb || : && \
+	  echo "Done running lintian." && \
+	  debsign)
+
 debrelease: $(ALLSOURCE) $(SPECIAL) distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
 	cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
@@ -98,13 +107,14 @@ debrelease: $(ALLSOURCE) $(SPECIAL) distclean
 	  ../$(SNAPDIR)/debian/.arch-ids \
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
-	(cd ../$(SNAPDIR) && \
-	  dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
-	    -us -uc -rfakeroot && \
-	  echo "Running lintian ..." && \
-	  lintian -i ../erc_$(VERSION)*.deb || : && \
-	  echo "Done running lintian." && \
-	  debsign)
+	$(MAKE) debbuild
+
+debrevision-mwolson:
+	-rm -f ../../dist/erc_*
+	-rm -f ../erc_$(VERSION)-*
+	-rm -fr ../erc-$(VERSION)
+	$(MAKE) debrelease
+	cp ../erc_$(VERSION)* ../../dist
 
 debrelease-mwolson:
 	-rm -f ../../dist/erc_*
diff --git a/erc.el b/erc.el
index 7d34dec..44bb402 100644
--- a/erc.el
+++ b/erc.el
@@ -1719,20 +1719,13 @@ all channel buffers on all servers."
 (defun erc-migrate-modules (mods)
   "Migrate old names of ERC modules to new ones."
   ;; modify `transforms' to specify what needs to be changed
-  ;; each item is in the format '(new .old)
-  (let ((transforms '((pcomplete . completion)))
-	(modules (copy-alist mods)))
-    (dolist (transform transforms)
-      (let ((addp nil))
-	(setq modules (erc-delete-if `(lambda (val)
-					(and (eq val ',(car transform))
-					     (setq addition t)))
-				     modules))
-	(when addp
-	  (add-to-list 'modules (cdr transform)))))
-    (erc-delete-dups modules)))
-
-(defcustom erc-modules '(netsplit fill button match track pcomplete readonly
+  ;; each item is in the format '(old . new)
+  (let ((transforms '((pcomplete . completion))))
+    (erc-delete-dups
+     (mapcar (lambda (m) (or (cdr (assoc m transforms)) m))
+	     mods))))
+
+(defcustom erc-modules '(netsplit fill button match track completion readonly
 				  ring autojoin noncommands irccontrols
 				  stamp)
   "A list of modules which erc should enable.



From MAILER-DAEMON Sun Oct 14 00:50:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQh-0005tJ-2Q
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQe-0005rD-1z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQd-0005qP-3x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP9-000545-2E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP8-00040B-D4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP1-00058Q-91
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP1-0005zP-Ax
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP1-0005zP-Ax@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:35 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Remove copyright notice for last
	individual contributor
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, 14 Oct 2007 04:50:16 -0000

commit 337fdcb950efab770262d0f5cb630603f4c8b1c3
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Dec 8 05:39:47 2006 +0000

    Remove copyright notice for last individual contributor
    
    * erc.el: Re-evaluate contributions from a contributor, and found them
      under 15 lines of non-obvious code, so it is safe to remove the
      copyright notice.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-68

diff --git a/CREDITS b/CREDITS
index da7ad34..064d8fb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -44,6 +44,10 @@ Adrian Aichner <adrian@xemacs.org>:
 Marcelo Toledo <marcelo@marcelotoledo.org>:
   * Made it possible to display notices in the current buffer.
 
+Brian Palmer <bpalmer@gmail.com>
+  * Made changes to erc.el (10 lines).
+  * Made changes to erc-list.el (>15 lines).
+
 Arne Schwabe <arne@rfc2549.org>:
   * Helped with handlers for 313 and 330 (erc.el).
 
diff --git a/ChangeLog b/ChangeLog
index 6443029..e1dcb12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* CREDITS: Add Juanma Barranquero.
 
+	* erc.el: Re-evaluate contributions from a contributor, and found
+	them under 15 lines of non-obvious code, so it is safe to remove
+	the copyright notice.
+
 2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
diff --git a/erc.el b/erc.el
index 177190e..fe010e7 100644
--- a/erc.el
+++ b/erc.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006 Free Software Foundation, Inc.
-;; Copyright (C) 2004 Brian Palmer
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),



From MAILER-DAEMON Sun Oct 14 00:50:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQi-0005uH-6A
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQg-0005sr-CI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQe-0005rf-Of
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOs-00050g-7l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
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@hcoop.net>) id 1IgvOr-0003wK-Em
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOq-00055A-Iy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOq-0005jH-MO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOq-0005jH-MO@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make sure IRC process is terminated
	after /QUIT.
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, 14 Oct 2007 04:50:18 -0000

commit 63ba7248c290289e5d8a00c0e8d8e9b350a23ca7
Merge: 287dc8e... 48a009c... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 6 08:24:06 2006 +0000

    Make sure IRC process is terminated after /QUIT.
    
    * erc-backend.el (erc-server-send-ping): New function that sends a ping
      to the IRC process corresponding with the given buffer.  Split from
      erc-server-setup-periodical-ping.  Use delete-process instead of
      kill-process.  Set the timer slot to nil in the timer-alist, not the
      buffer slot.
      (erc-server-setup-periodical-ping): Rename from
      erc-server-setup-periodical-server-ping.
      (erc-server-filter-function): Use erc-current-time instead of
      current-time.
    
    * erc.el (erc-cmd-QUIT): If the IRC process has not terminated itself
      within 4 seconds of completing our quit-hook, kill it manually.
      Freenode in particular needs this.
      (erc-connection-established): Use erc-server-setup-periodical-ping
      instead of erc-server-setup-periodical-server-ping.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-36

diff --cc ChangeLog
index 42b6daf,063f8b1,cef3944..c977823
--- a/ChangeLog
+++ b/ChangeLog
@@@@ -1,681 -1,580 -1,12 +1,692 @@@@
  +2006-08-06  Michael Olson  <mwolson@gnu.org>
  +
 ++	* erc-backend.el (erc-server-send-queue): Update from Circe
 ++	version of this function.
 ++	(erc-server-ping-timer-alist): New variable that keeps track of
 ++	ping timers according to their associated server.
 ++	(erc-server-last-received-time): New variable that specifies the
 ++	time of the last message we received from the server.  This is
 ++	used to detect hung processes.
-  	(erc-server-setup-periodical-server-ping): If the server buffer no
-  	longer exists, cancel the timer.  If the server process has not
-  	given us a message, including PING responses, since the last PING,
-  	kill it.  This is necessary to deal with some aberrant freenode
-  	behavior.  Idea taken from rcirc.
+++	(erc-server-send-ping): New function that sends a ping to the IRC
+++	process corresponding with the given buffer.  Split from
+++	erc-server-setup-periodical-ping.  If the server buffer no longer
+++	exists, cancel the timer.  If the server process has not given us
+++	a message, including PING responses, since the last PING, kill it.
+++	This is necessary to deal with some aberrant freenode behavior.
+++	Idea taken from rcirc.
+++	(erc-server-setup-periodical-ping): Rename from
+++	erc-server-setup-periodical-server-ping.
+++	(erc-server-filter-function): Use erc-current-time instead of
+++	current-time.
 ++
  +	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
  +	multi-tty Emacs.
  +	(erc-select-startup-file): Fix bug introduced by recent change.
+++	(erc-cmd-QUIT): If the IRC process has not terminated itself
+++	within 4 seconds of completing our quit-hook, kill it manually.
+++	Freenode in particular needs this.
+++	(erc-connection-established): Use erc-server-setup-periodical-ping
+++	instead of erc-server-setup-periodical-server-ping.
  +
  +2006-08-05  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-log.el (erc-log-standardize-name): New function that returns
  +	a filename that is safe for use for a log file.
  +	(erc-current-logfile): Use it.
  +
  +	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
  +	since that is a fairly standard directory.
  +	(erc-select-startup-file): Re-write to use
  +	convert-standard-filename, which will ensure that MS-DOS systems
  +	look for the _ercrc.el file.
  +
  +2006-08-02  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.el (erc-version-string): Release ERC 5.1.4.
  +
  +	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
  +
  +	* erc.el (erc-active-buffer): Fix bug that caused messages to go
  +	to the wrong buffer.  Thanks to offby1 for the report.
  +
  +	* erc-backend.el (erc-coding-system-for-target): Handle case where
  +	target is nil.  Thanks to Kai Fan for the patch.
  +
  +2006-07-29  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-log.el (erc-log-setup-logging): Don't offer to save the
  +	buffer.  It will be saved automatically killed.  Thanks to Johan
  +	Bockgård and Tassilo Horn for pointing this out.
  +
  +2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
  +
  +	* erc.el (define-erc-module): Make find-function and find-variable
  +	find the names constructed by `define-erc-module' in Emacs 22.
  +
  +2006-07-14  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-log.el (log): Make sure that we enable logging on
  +	already-opened buffers as well, in case the user toggles this
  +	module after loading ERC.  Also be sure to remove logging ability
  +	from all ERC buffers when the module is disabled.
  +	(erc-log-setup-logging): Set buffer-file-name to nil rather than
  +	the empty string.  This should fix some errors that occur when
  +	quitting Emacs without first killing all ERC buffers.
  +	(erc-log-disable-logging): New function that removes the logging
  +	ability from the current buffer.
  +
  +	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
  +
  +2006-07-12  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
  +	than call toggle-read-only.
  +
  +	* Makefile (debrelease-mwolson): Remove and consolidate with the
  +	`debrelease' target.
  +	(debrevision): Rename from `debrevision-mwolson'.
  +
  +	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
  +	add autoload cookie.
  +
  +2006-07-09  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.el (erc-version-string): Release ERC 5.1.3.
  +
  +	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
  +
  +	* servers.pl: Add copyright notice.
  +
  +	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
  +	from being set automatically away and current buffer is not an ERC
  +	buffer.
  +
  +	* erc-identd.el: Fix compiler error.
  +
  +	* erc.texi (Development): Use @subheading instead of @subsection.
  +	(Advanced Usage): Add menu.
  +	(Connecting): Fully document how to connect to an IRC server.
  +	(Options, Tips and Tricks, Sample Configuration): New unwritten
  +	sections.
  +
  +	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
  +	(erc-user-full-name, erc-password): Docfixes and customization
  +	interface tweaks.
  +	(erc-try-new-nick-p): Rename from
  +	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
  +	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
  +	of `erc-nick-uniquifier', in case someone wants multiple
  +	characters.
  +	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
  +	(erc-compute-port): Docfixes.
  +
  +	* FOR-RELEASE: Put in future-first order.
  +
  +	* erc-log.el (log): Move all add-hook calls here, rather than
  +	executing them immediately, and also cause them to be un-hooked
  +	when the module is removed.
  +	(erc-save-buffer-on-part): Move next to
  +	`erc-save-queries-on-quit'.
  +	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
  +	(erc-log-write-after-send, erc-log-write-after-insert): Default to
  +	nil.  This makes things fast, but reasonably failsafe, by default.
  +
  +2006-07-08  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
  +	default, since most IRC clients don't do this.
  +	(erc-log-write-after-send): New option that determines whether the
  +	log file will be written to after every sent message.
  +	(erc-log-write-after-insert): New option that determines whether
  +	the log file will be written to when new text is added to a logged
  +	ERC buffer.
  +	(log): Use the aforementioned options.
  +
  +	* erc.texi (Modules): Document the "completion" module.
  +
  +	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
  +	have a nil element in the list when ignore-self is non-nil.
  +
  +2006-07-05  Michael Olson  <mwolson@gnu.org>
  +
 - 	* erc.el (erc-modules): Use `set' instead of `set-default', since
 - 	this setting should never be buffer-local.  Add the `list' and
 - 	`page' modules to the list.
 ++	* erc.el (erc-modules): Add the `page' module to the list.
  +
  +	* erc.texi (Modules): Add entries for `list' and `page' modules.
  +	Change "spell" to "spelling".
  +	(History): Use past tense throughout.
  +
  +2006-07-02  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
  +	can happen when doing /PART.
  +
  +	* erc.el (erc-quit-reason-various-alist)
  +	(erc-part-reason-various-alist): In the example, use "^$" as an
  +	example, since "" matches anything.
  +	(erc-quit-reason-various, erc-part-reason-various): If no argument
  +	is given, and no matches are found, use our default reason instead
  +	of "nil".
  +
  +2006-07-01  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-identd.el (erc-identd-start): XEmacs defines neither
  +	`make-network-process' nor `open-network-stream-server', so just
  +	fail silently.
  +
  +2006-06-30  Michael Olson  <mwolson@gnu.org>
  +
  +	* HISTORY: Update.
  +
  +	* erc.texi (Modules): Mention identd.
  +	(Releases): Update mailing list address and download location.
  +	(Development): Refactor.  Provide updated directions for Arch.
  +	Make URLs clickable.
  +	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
  +	(Getting Started): Give simpler example.  We do not need to
  +	explicitly load every module.
  +	(History): Update.
  +
 - 	* erc-autoaway.el, erc-autojoin.el, erc-backend.el, erc-bbdb.el:
 - 	erc-button.el, erc-chess.el, erc-compat.el, erc-complete.el:
 ++	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 ++	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
  +	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
  +	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 - 	erc-nets.el, erc-netsplit.el, erc-nicklist.el, erc-nickserv.el:
 - 	erc-pcomplete.el, erc-replace.el, erc-ring.el, erc-speedbar.el:
 - 	erc-spelling.el, erc-stamp.el, erc-track.el, erc.el: Remove
 - 	version strings.
 ++	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 ++	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 ++	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 ++	erc.el: Remove version strings.
  +
  +	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
  +	module versions anymore.
  +	(erc-version-modules): Remove, since we do not use this function
  +	anymore.
  +	(erc-latest-version, erc-ediff-latest-version): Remove, since this
  +	was only useful back when ERC consisted of one file.
  +	(erc-modules): Add line for identd.
  +	(erc-get-channel-mode-from-keypress): Typo fix.
  +
  +	* erc-imenu.el: Remove unnecessary lines in header.
  +
  +	* erc-goodies.el (erc-handle-irc-url): Docfix.
  +
  +	* erc-identd.el: Define an ERC module for this.
  +	(erc-identd-start): Don't create a process buffer if possible.
  +	Otherwise, use conventional hidden names for process buffers.
  +
  +2006-06-29  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-backend.el (erc-coding-system-for-target): Match
  +	case-insensitively.  Use a pattern match instead of `assoc', as
  +	per the documentation for `erc-encoding-coding-alist'.
  +
  +	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
  +
  +2006-06-27  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.el: Update maintainer information and URLs.
  +
  +2006-06-21  Michael Olson  <mwolson@gnu.org>
  +
  +	* Makefile (upload): Make this work with the GNU upload system.
  +
  +2006-06-14  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.el (erc-active-buffer): If the active buffer has been
  +	deleted, default to the server buffer.
  +	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
  +	control really toggle, not unconditionally turn off.
  +
  +2006-06-12  Michael Olson  <mwolson@gnu.org>
  +
  +	* NEWS: Add items since the 5.1.2 release.
  +
  +	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
  +	indicates whether the current away status was caused by this
  +	module.
  +	(erc-autoaway-set-back): Only set back if this module set the user
  +	away.
  +	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
  +	(erc-autoaway-reset-indicators): New function that resets some
  +	indicators when the user is no longer away.
  +	(autoaway): Add the above function to the 305 hook.
  +
  +2006-06-05  Romain Francoise  <romain@orebokech.com>
  +
  +	* erc.texi (History): Fix various typos.
  +
  +2006-06-04  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
  +	definition of the autoaway module.
  +	(autoaway): Don't do anything if erc-autoaway-idle-method is
  +	unbound.  This prevents an error on startup.
  +
  +2006-06-03  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
  +	(erc-autoaway-idle-method): Renamed from
  +	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
  +	how to do this, so it's best to make this take symbol values.
  +	Improve documentation.  Remove warning against Emacs idle-time;
  +	the point is moot now that we get user idle time via a different
  +	method.  Make sure we disable and re-enable the module when
  +	changing this value.
  +	(autoaway): Conditionalize on the above option.  If using the idle
  +	timer or user idle methods, don't add anything to the
  +	send-completed or server-001 hooks, since it is unnecessary.
  +	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
  +	Docfix.
  +	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
  +	(erc-autoaway-reset-idle-irc): Renamed from
  +	`erc-autoaway-reset-idle'.  Don't pass line to
  +	`erc-autoaway-set-away', since it is not used.
  +	(erc-autoaway-reset-idle-user): New function that resets the idle
  +	state for user idle time.
  +	(erc-autoaway-set-back): Remove line argument, since it is not
  +	used.
  +
  +	* Makefile (upload): Make this work for Savannah uploads.
  +
  +	* AUTHORS: Update for Savannah move.  No old entries have been
  +	removed, in case people have not registered yet on Savannah.
  +
  +2006-06-01  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.el (erc-buffer-filter): Make sure all buffers returned from
  +	this are live.
  +
  +2006-05-15  Michael Olson  <mwolson@gnu.org>
  +
  +	* README: Add License information.  Permit images to be used,
  +	distributed, and modified without restriction.
  +
  +2006-05-01  Edward O'Connor  <ted@oconnor.cx>
  +
  +	* erc-goodies.el: (erc-handle-irc-url): New function, suitable as
  +	a value for `url-irc-function'.
  +
  +2006-04-18  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
  +	argument IGNORE-SELF.  If this is non-nil, don't return the user's
  +	current nickname.  Doc fix.
  +	(pcomplete/erc-mode/complete-command): Don't complete the current
  +	nickname.
  +
  +2006-04-05  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
  +	build date as it's shown in `emacs-version'.
  +
  +	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
  +	with the same face property as the previous character.
  +
  +2006-04-02  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
  +	erc.el: Make sure to include a newline inside of negated classes,
  +	so that a newline is not matched.
  +
  +2006-04-01  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-backend.el (erc-server-connect-function): Don't try to
  +	detect the existence of the `open-network-stream-nowait' function,
  +	since I can't find it in Emacs21, XEmacs21, or Emacs22.
  +
  +2006-03-27  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.texi: Update direntry.  Remove unneeded local variables.
  +
  +2006-03-26  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.el (erc-header-line): New face that will be used to colorize
  +	the text of the header-line, provided that
  +	`erc-header-line-face-method' is non-nil.
  +	(erc-prompt-face): Fix formatting.
  +	(erc-header-line-face-method): New option that determines the
  +	method used for colorizing header-line text.  This may be a
  +	function, nil, or non-nil.
  +	(erc-update-mode-line-buffer): Use the aforementioned option and
  +	face to colorize the header-line text, if that is what the user
  +	wants.
  +	(erc-send-input): If flood control is not activated, don't split
  +	the input line.
  +
  +2006-03-25  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
  +	that fixes the case where there is no leading whitespace.  Only
  +	remove the first space character, though.
  +
  +	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
  +	erc-identd-process is set properly.
  +	(erc-identd-start, erc-identd-stop): Add autoload cookies.
  +	(erc-identd-start): Pass :host parameter so this works with Emacs
  +	22.
  +
  +2006-03-21  Michael Olson  <mwolson@gnu.org>
  +
  +	* CREDITS: Add Nelson Ferreira.  Change contact address.
  +
  +	* erc-bbdb.el: Install patch from Nelson Ferreira.
  +	(erc-bbdb-electric-p): New option that indicates whether to make
  +	the BBDB buffer electric.  Defaults to "not electric".
  +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
  +
  +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
  +	<C-tab> for `erc-button-previous' as it is a more standard key
  +	binding for this type of function.
  +
 ++2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* erc-capab.el: Removed things that were accidentally committed on
 ++	2006-02-20.  Removed Todo section.
 ++	(erc-capab-unidentified): Removed.
 ++
 ++2006-02-26  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 ++	(erc-capab-unidentified): Fix compiler warning by specifying
 ++	group.
 ++
 ++2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 ++	to explain thoughts better.  `erc-server-parameters' is an
 ++	associated list when it's set, not a string.
 ++
  +2006-02-19  Michael Olson  <mwolson@gnu.org>
  +
 ++	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 ++	parameters are strings before using them.  Thanks to Alejandro
 ++	Benitez for the report.
 ++
  +	* erc.el (erc-version-string): Release ERC 5.1.2.
  +
  +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
  +	<C-tab>.
  +	(erc-button-previous): New function.
  +
  +2006-02-15  Michael Olson  <mwolson@gnu.org>
  +
 ++	* NEWS: Add category for ERC 5.2.
 ++
  +	* erc.el (erc): Move to the end of the buffer when a continued
  +	session is detected.  Thanks to e1f and indio for the report and
  +	testing a potential fix.
  +
  +2006-02-14  Michael Olson  <mwolson@gnu.org>
  +
  +	* debian/changelog: Prepare a new Debian package.
  +
  +	* Makefile (debprepare): New rule that creates an ERC snapshot
  +	directory for use in both new Debian releases and revisions for
  +	Debian packages.
  +	(debrelease, debrevision-mwolson): Use debprepare.
  +
  +	* NEWS: Bring up-to-date.
  +
  +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
  +	timestamps before rather than after erc-fill-column when
  +	erc-timestamp-right-column is nil.  This way we won't surprise
  +	anyone unpleasantly, or so it is hoped.
  +
  +2006-02-13  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
  +
  +2006-02-11  Michael Olson  <mwolson@gnu.org>
  +
 ++	* erc.el (erc-update-modules): Handle erc-capab-identify
 ++	correctly.  Make some requirements shorter, so that it's easier to
 ++	see why they are needed.
 ++
 ++	* erc-capab.el: Add autoload cookie for capab-identify.
 ++	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 ++	Minor whitespace fix in code.
 ++
  +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
  +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
  +	whether we are in Emacs 22, and using X.  Improve documentation.
  +	(erc-insert-aligned): Remove calculation of offset, since
  +	:align-to pos works after all.  Unlike the previous solution, this
  +	one works when erc-stamp.el is compiled.
  +	(erc-insert-timestamp-right): Don't add length of string, and then
  +	later remove its displayed width.  This puts timestamps after
  +	erc-fill-column when erc-timestamp-right-column is nil, rather
  +	than before it.  It also fixes a subtle bug.  Remove use of
  +	`current-window', since there is no variable by that name in
  +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
  +	`erc-fill-column' is non-nil before using it.
  +
  +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* erc-list.el: Define `list' module which sets the alias
  +	`erc-cmd-LIST' to `erc-list-channels' when enabled and
  +	`erc-list-channels-simple' when disabled.
  +	(erc-list-channels): Was `erc-cmd-LIST', renamed.
  +	(erc-list-channels-simple): New function.
  +
  +	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
  +	`capab-identify' description.  Moved customization options left in
  +	source code.
  +
  +	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
  +
 ++	* erc-capab.el: Put a little more detail into Usage section.
 ++	(define-erc-module): Run `erc-capab-identify-setup' in all open
 ++	server buffers when enabling.
 ++	(erc-capab-identify-setup): Make PROC and PARSED optional
 ++	arguments.
 ++	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 ++	should now also match nicknames that are formatted differently
 ++	than the default.
 ++
  +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
  +	before calling `with-current-buffer'.
  +
  +2006-02-10  Michael Olson  <mwolson@gnu.org>
  +
  +	* Makefile (debbuild): Split from debrelease.
  +	(debrevision-mwolson): New rule that causes a Debian revision to
  +	be built.
  +
 ++	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 ++	Johan Bockgård.
 ++	(erc-modules): Change use of 'pcomplete to 'completion.
 ++
  +2006-02-09  Diane Murray  <disumu@x3y2z1.net>
  +
 - 	* erc.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 ++	* erc-capab.el: Require erc.
 ++	(erc-capab-send-identify-messages): Use `erc-server-send'.
 ++	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 ++	the flags so we can also check whether the `erc-identified' text
 ++	property is there at all.
 ++	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 ++	This fixes a bug where the prefix wasn't inserted when timestamps
 ++	are inserted on the right.  Tweaked nickname regexp.
 ++	(erc-capab-find-parsed): New function.
 ++	(erc-capab-get-unidentified-nickname): Updated to check for 0
 ++	flag.  Only get nickname if there's a nickuserhost associated with
 ++	this message.
 ++
 ++	* erc-capab.el: New file.  Adds the new module
 ++	`erc-capab-identify', which allows flagging of unidentified users
 ++	on servers running an ircd based on dancer - irc.freenode.net, for
 ++	example.
 ++
 ++	* erc.el (erc-modules): Added `capab-identify' to options.
 ++	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
  +	(erc-get-parsed-vector-type): Moved here from erc-match.el.
  +	(erc-version-string): Remove "(CVS)".
  +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
  +	connections work as expected.  Connecting with `open-tls-stream'
  +	only seems to work (if at all?) when using the tls.el located in
  +	lisp/net/ in Emacs22.
  +
  +	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
  +	(erc-get-parsed-vector-type): Moved these functions to erc.el
  +	since they can be useful outside of the text matching module.
  +
 - 	* NEWS: Added tls.el -> ssl.el change.
 ++	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 ++	erc-services.el since the file name has changed.
 ++
 ++	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
  +
  +	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
  +	to "ERC".
  +
  +2006-02-07  Michael Olson  <mwolson@gnu.org>
  +
 ++	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 ++	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 ++	the filenames in DOS.
 ++
 ++	* erc-goodies.el: Comment fix.
 ++
 ++	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 ++	commentary.  Use define-erc-module so that it's possible to
 ++	actually use this.
 ++	(erc-hecomplete): Rename function from `erc-complete'.
 ++	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 ++
 ++	* erc-join.el: Rename from erc-autojoin.el.
 ++
 ++	* erc-networks.el: Rename from erc-nets.el.
 ++
 ++	* erc-services.el: Rename from erc-nickserv.el.
 ++
  +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
  +	the simpler `indent-to' function when
  +	`erc-timestamp-right-align-by-pixel' is nil.
  +	(erc-insert-timestamp-right): If the timestamp goes on the
  +	following line, don't add timestamp properties to the spaces in
  +	front of it.
  +
 ++	* erc.el (erc-migrate-modules): New function that eases migration
 ++	of module names.
 ++	(erc-modules): Call erc-migrate-modules in the :get accessor.
 ++	(erc-modules, erc-update-modules): Update for new modules names.
 ++
  +2006-02-05  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* FOR-RELEASE: Added two things to do before the next release of
  +	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
  +	the `C-c C-SPC' and `C-c C-@' global keybindings.
  +
  +2006-02-05  Michael Olson  <mwolson@gnu.org>
  +
  +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
  +	directory correctly.
  +
  +	* debian/changelog: Update for 5.1.1 release.
  +
  +	* debian/control (Suggests): Suggest emacs-chess instead of
  +	Recommending it.  Thanks to Era Eriksson for the report.
  +
  +	* debian/maint/postinst: Install the Info documentation.
  +
  +	* debian/maint/prerm: Handle removing of Info documentation.
  +
  +	* debian/rules (configure, configure-stamp, build, build-stamp):
  +	Generate HTML and Info documentation.
  +	(binary-erc): Install HTML and Info documentation.
  +
  +	* erc-spelling.el (erc-spelling-init): If
  +	`erc-spelling-dictionaries' is nil, do not set
  +	ispell-local-dictionary.  Before, it was being set to nil, which
  +	was causing a long delay while the ispell process restarted.
  +	(erc-spelling-unhighlight-word): New function that removes
  +	flyspell properties from a spell-checked word.
  +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
  +	that have '/' before them.
  +
  +2006-02-04  Michael Olson  <mwolson@gnu.org>
  +
  +	* Makefile (VERSION): Update to 5.1.1.
  +
  +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
  +	that Emacs does in its NEWS file.
  +
  +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
  +
  +	* erc-complete.el (erc-nick-completion-exclude-myself)
  +	(erc-try-complete-nick): Use better function for getting list of
  +	channel users.
  +
  +	* erc-goodies.el: Docfix.
  +
  +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
  +	being treated properly.
  +
  +	* erc.texi (History): Note that ERC is now included with Emacs.
  +
  +	* erc.el (erc-version-string): Release ERC 5.1.1.
  +
  +2006-01-31  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-stamp.el: Update copyright years.
  +
  +2006-01-30  Simon Josefsson  <jas@extundo.com>
  +
  +	* erc.el (erc-open-ssl-stream): Use tls.el.
  +
  +2006-01-30  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
  +	that determines whether to use pixel values to align right
  +	timestamps.  The default is not to do so, since it only works with
  +	Emacs22 on X, and even then some people have trouble.
  +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
  +
  +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
  +
  +	* erc-viper.el: Ensure we only alter Viper's configuration when
  +	necessary, as Viper may already take ERC into account.
  +
  +2006-01-29  Michael Olson  <mwolson@gnu.org>
  +
  +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
  +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
  +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
  +
  +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
  +	variable.
  +	(erc-speedbar-goto-buffer): Fix compiler warning.
  +
  +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
  +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
  +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
  +	work without compiler warnings.
  +
  +	* man/erc.texi (Obtaining ERC, Installation): Note that these
  +	sections may be skipped if using the version of ERC that comes
  +	with Emacs.
  +
   2006-01-28  Michael Olson  <mwolson@gnu.org>
   
  -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
  -	Space out copyright years like the rest of Emacs.  Use the Emacs
  -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
  -	IRC Client", since there are now several IRC clients for Emacs.
  +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
  +	guidelines.
  +
  +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
  +	the Emacs copyright statement.  Refer to ourselves as ERC rather
  +	than "Emacs IRC Client", since there are now several IRC clients
  +	for Emacs.
  +
  +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
   
  -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
  -	insert spaces instead of using special text property.
  +	* erc-ibuffer.el: Require 'erc.
  +
  +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
  +	it exists.
  +
  +	* erc-stamp.el (erc-insert-aligned): Only use the special text
  +	property when window-system is X.
  +
  +	* erc.texi (History): Note that ERC 5.1 is released.
   
   2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
   
@@@@ -979,10 -878,10 -309,6 +990,10 @@@@
   	* erc-track.el (erc-track-remove-from-mode-line): Handle case
   	where global-mode-string is not a list.  Emacs22 permits this.
   
 - See ChangeLog.2005 for earlier changes.
  -    Copyright (C) 2006 Free Software Foundation, Inc.
  -  Copying and distribution of this file, with or without modification,
  -  are permitted provided the copyright notice and this notice are preserved.
 ++See ChangeLog.05 for earlier changes.
  +
  +;; Local Variables:
  +;; coding: utf-8
  +;; End:
  +
  +;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --cc erc-backend.el
index b73433c,705ca7a,8c4b915..62dc017
--- a/erc-backend.el
+++ b/erc-backend.el
@@@@ -407,33 -399,20 -407,20 +407,34 @@@@ Currently this is called by `erc-send-i
       (upcase-word 1)
       (buffer-string)))
   
---(defun erc-server-setup-periodical-server-ping (&rest ignore)
+++(defun erc-server-send-ping (buf)
+++  "Send a ping to the IRC server buffer in BUF.
+++Additionally, detect whether the IRC process has hung."
+++  (if (buffer-live-p buf)
+++      (with-current-buffer buf
+++        (if (> (erc-time-diff (erc-current-time)
+++                              erc-server-last-received-time)
+++               erc-server-send-ping-interval)
+++            ;; if the process is hung, kill it
+++            (delete-process erc-server-process)
+++          (erc-server-send (format "PING %.0f" (erc-current-time)))))
+++    ;; remove timer if the server buffer has been killed
+++    (let ((timer (assq buf erc-server-ping-timer-alist)))
+++      (when timer
+++        (erc-cancel-timer (cdr timer))
+++        (setcdr timer nil)))))
+++
+++(defun erc-server-setup-periodical-ping (&rest ignore)
     "Set up a timer to periodically ping the current server."
     (and erc-server-ping-handler (erc-cancel-timer erc-server-ping-handler))
     (when erc-server-send-ping-interval
---    (setq erc-server-ping-handler
---          (run-with-timer
---           4 erc-server-send-ping-interval
---           (lambda (buf)
-               (if (buffer-live-p buf)
-                   (with-current-buffer buf
-                     (if (> (erc-time-diff (erc-current-time)
-                                           erc-server-last-received-time)
-                            erc-server-send-ping-interval)
-                         ;; if the process is hung, kill it
-                         (kill-process erc-server-process)
-                       (erc-server-send
-                        (format "PING %.0f"
-                                (erc-current-time)))))
-                 ;; remove timer if the server buffer has been killed
-                 (let ((timer (assq buf erc-server-ping-timer-alist)))
-                   (when timer
-                     (erc-cancel-timer (cdr timer))
-                     (setcar timer nil)))))
-             (current-buffer)))
 --             (when (buffer-live-p buf)
 --               (with-current-buffer buf
 --                 (erc-server-send
 --                  (format "PING %.0f"
 --                          (erc-current-time))))))
 --           (current-buffer)))))
+++    (setq erc-server-ping-handler (run-with-timer
+++                                   4 erc-server-send-ping-interval
+++                                   #'erc-server-send-ping
+++                                   (current-buffer)))
 ++    (setq erc-server-ping-timer-alist (cons (cons (current-buffer)
 ++                                                  erc-server-ping-handler)
 ++                                            erc-server-ping-timer-alist))))
   
   (defun erc-server-process-alive ()
     "Return non-nil when `erc-server-process' is open or running."
@@@@ -483,7 -460,6 -468,6 +484,7 @@@@ We will store server variables in the c
   (defun erc-server-filter-function (process string)
     "The process filter for the ERC server."
     (with-current-buffer (process-buffer process)
-      (setq erc-server-last-received-time (current-time))
+++    (setq erc-server-last-received-time (erc-current-time))
       ;; If you think this is written in a weird way - please refer to the
       ;; docstring of `erc-server-processing-p'
       (if erc-server-processing-p
diff --cc erc.el
index e237003,d6dbed2,98a369f..dbe5888
--- a/erc.el
+++ b/erc.el
@@@@ -67,7 -67,7 -66,7 +67,7 @@@@
   
   ;;; Code:
   
 - (defconst erc-version-string "Version 5.1.4"
  -(defconst erc-version-string "Version 5.1 (CVS) $Revision: 1.799 $"
 ++(defconst erc-version-string "Version 5.1.4 (devel)"
     "ERC version.  This is used by function `erc-version'.")
   
   (eval-when-compile (require 'cl))
@@@@ -1777,49 -1765,43 -1736,40 +1777,49 @@@@ removed from the list will be disabled.
   	 ;; this test is for the case where erc hasn't been loaded yet
   	 (when (fboundp 'erc-update-modules)
   	   (erc-update-modules)))
 --  :type '(set :greedy t
 --	      (const :tag "Set away status automatically" autoaway)
 --	      (const :tag "Join channels automatically" autojoin)
 --	      (const :tag "Integrate with Big Brother Database" bbdb)
 --	      (const :tag "Buttonize URLs, nicknames, and other text" button)
 --	      (const :tag "Wrap long lines" fill)
 - 	      (const :tag "Launch an identd server on port 8113" identd)
 --	      (const :tag "Highlight or remove IRC control characters"
 --		     irccontrols)
 - 	      (const :tag "List channels nicely in a separate buffer" list)
 --	      (const :tag "Save buffers in logs" log)
 --	      (const :tag "Highlight pals, fools, and other keywords" match)
 --	      (const :tag "Detect netsplits" netsplit)
 --	      (const :tag "Don't display non-IRC commands after evaluation"
 --		     noncommands)
 --	      (const :tag
 --		     "Notify when the online status of certain users changes"
 --		     notify)
 - 	      (const :tag "Process CTCP PAGE requests from IRC" page)
 --	      (const :tag "Complete nicknames and commands (programmable)"
 --		     pcomplete)
 --	      (const :tag "Complete nicknames and commands (old)" completion)
 --	      (const :tag "Make displayed lines read-only" readonly)
 --	      (const :tag "Replace text in messages" replace)
 --	      (const :tag "Enable an input history" ring)
 --	      (const :tag "Scroll to the bottom of the buffer" scrolltobottom)
 --	      (const :tag "Identify to Nickserv (IRC Services) automatically"
 --		     services)
 --	      (const :tag "Convert smileys to pretty icons" smiley)
 --	      (const :tag "Play sounds when you receive CTCP SOUND requests"
 --		     sound)
 --	      (const :tag "Add timestamps to messages" stamp)
 --	      (const :tag "Check spelling" spelling)
 --	      (const :tag "Track channel activity in the mode-line" track)
 --	      (const :tag "Truncate buffers to a certain size" truncate)
 --	      (const :tag "Translate morse code in messages" unmorse)
 --	      (repeat :tag "Others" :inline t symbol))
 ++  :type
 ++  '(set
 ++    :greedy t
 ++    (const :tag "Set away status automatically" autoaway)
 ++    (const :tag "Join channels automatically" autojoin)
 ++    (const :tag "Integrate with Big Brother Database" bbdb)
 ++    (const :tag "Buttonize URLs, nicknames, and other text" button)
 ++    (const
 ++     :tag
 ++     "Mark unidentified users on freenode and other servers supporting CAPAB"
 ++     capab-identify)
 ++    (const :tag "Wrap long lines" fill)
 ++    (const :tag "Launch an identd server on port 8113" identd)
 ++    (const :tag "Highlight or remove IRC control characters"
 ++	   irccontrols)
 ++    (const :tag "List channels in a separate buffer" list)
 ++    (const :tag "Save buffers in logs" log)
 ++    (const :tag "Highlight pals, fools, and other keywords" match)
 ++    (const :tag "Detect netsplits" netsplit)
 ++    (const :tag "Don't display non-IRC commands after evaluation"
 ++	   noncommands)
 ++    (const :tag
 ++	   "Notify when the online status of certain users changes"
 ++	   notify)
 ++    (const :tag "Complete nicknames and commands (programmable)"
 ++	   completion)
 ++    (const :tag "Complete nicknames and commands (old)" hecomplete)
 ++    (const :tag "Process CTCP PAGE requests from IRC" page)
 ++    (const :tag "Make displayed lines read-only" readonly)
 ++    (const :tag "Replace text in messages" replace)
 ++    (const :tag "Enable an input history" ring)
 ++    (const :tag "Scroll to the bottom of the buffer" scrolltobottom)
 ++    (const :tag "Identify to Nickserv (IRC Services) automatically"
 ++	   services)
 ++    (const :tag "Convert smileys to pretty icons" smiley)
 ++    (const :tag "Play sounds when you receive CTCP SOUND requests"
 ++	   sound)
 ++    (const :tag "Add timestamps to messages" stamp)
 ++    (const :tag "Check spelling" spelling)
 ++    (const :tag "Track channel activity in the mode-line" track)
 ++    (const :tag "Truncate buffers to a certain size" truncate)
 ++    (const :tag "Translate morse code in messages" unmorse)
 ++    (repeat :tag "Others" :inline t symbol))
     :group 'erc)
   
   (defun erc-update-modules ()
@@@@ -3130,7 -3110,7 -3074,7 +3130,14 @@@@ the message given by REASON.
   	(erc-server-send (format "QUIT :%s" reason)))
         (run-hook-with-args 'erc-quit-hook erc-server-process)
         (when erc-kill-queries-on-quit
---	(erc-kill-query-buffers erc-server-process)))
+++	(erc-kill-query-buffers erc-server-process))
+++      ;; if the process has not been killed within 4 seconds, kill it
+++      (run-at-time 4 nil
+++		   (lambda (proc)
+++		     (when (and (processp proc)
+++				(memq (process-status proc) '(run open)))
+++		       (delete-process proc)))
+++		   erc-server-process))
       t)
      (t nil)))
   
@@@@ -4057,7 -4037,7 -4006,7 +4064,7 @@@@ Set user modes and run `erc-after-conne
         (setq erc-server-connected t)
         (erc-update-mode-line)
         (erc-set-initial-user-mode nick)
---      (erc-server-setup-periodical-server-ping)
+++      (erc-server-setup-periodical-ping)
         (run-hook-with-args 'erc-after-connect server nick))))
   
   (defun erc-set-initial-user-mode (nick)



From MAILER-DAEMON Sun Oct 14 00:50:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQZ-0005nr-TZ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQX-0005lL-7d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOq-0004of-Tz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOb-0004nC-9G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
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@hcoop.net>) id 1IgvOb-0003r3-0u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOa-0004zb-Au
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOa-0005He-D9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOa-0005He-D9@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:08 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:50:09 -0000

commit 5d3ad375d4aeee66978bb59f7dca051c75bb0f94
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Mar 21 05:41:22 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-139

diff --git a/erc-bbdb.el b/erc-bbdb.el
index fddd419..f4ef05b 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -50,7 +50,7 @@
 (require 'bbdb-gui)
 (require 'bbdb-hooks)
 
-(defconst erc-bbdb-version "$Revision: 1.33 $"
+(defconst erc-bbdb-version "$Revision: 1.34 $"
   "ERC BBDB revision.")
 
 (defgroup erc-bbdb nil



From MAILER-DAEMON Sun Oct 14 00:50:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQj-0005vc-G9
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQh-0005tt-Ie
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQg-0005t7-Lr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOs-00050h-FK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
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@hcoop.net>) id 1IgvOr-0003wT-RH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOq-00055G-UV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOq-0005jm-WC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOq-0005jm-WC@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix a couple of 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: Sun, 14 Oct 2007 04:50:20 -0000

commit 662591eb7ab0ce71cb6ab10d6d4e6f522c3c0e6e
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Aug 7 06:35:33 2006 +0000

    Fix a couple of bugs.
    
    * erc-backend.el (erc-process-sentinel-1): Use erc-display-message in
      several places instead of inserting text.
      (erc-process-sentinel): Move to the input-marker before removing the
      prompt.
    
    * erc.el (erc-port): Fix customization options.
      (erc-display-message): Handle null type explicitly.  Previously, this
      was relying on a chance side-effect.  Cosmetic indentation tweak.
      (english): Add 'finished and 'terminated entries to the catalog.  Add
      initial and terminal newlines to 'disconnected and
      'disconnected-noreconnect entries.  Avoid long lines.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-37

diff --git a/ChangeLog b/ChangeLog
index c977823..35e0777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-08-07  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
+	in several places instead of inserting text.
+	(erc-process-sentinel): Move to the input-marker before removing
+	the prompt.
+
+	* erc.el (erc-port): Fix customization options.
+	(erc-display-message): Handle null type explicitly.  Previously,
+	this was relying on a chance side-effect.  Cosmetic indentation
+	tweak.
+	(english): Add 'finished and 'terminated entries to the catalog.
+	Add initial and terminal newlines to 'disconnected and
+	'disconnected-noreconnect entries.  Avoid long lines.
+
 2006-08-06  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-server-send-queue): Update from Circe
diff --git a/erc-backend.el b/erc-backend.el
index 62dc017..abee916 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -518,11 +518,7 @@ action."
   (if erc-server-quitting
       ;; normal quit
       (progn
-        (let ((string "\n\n*** ERC finished ***\n")
-              (inhibit-read-only t))
-          (erc-put-text-property 0 (length string)
-                                 'face 'erc-error-face string)
-          (insert string))
+        (erc-display-message nil 'error (current-buffer) 'finished)
         (when erc-kill-server-buffer-on-quit
           (set-buffer-modified-p nil)
           (kill-buffer (current-buffer))))
@@ -544,12 +540,8 @@ action."
         (erc erc-session-server erc-session-port erc-server-current-nick
              erc-session-user-full-name t erc-session-password)
       ;; terminate, do not reconnect
-      (let ((string (concat "\n\n*** ERC terminated: " event
-                            "\n"))
-            (inhibit-read-only t))
-        (erc-put-text-property 0 (length string)
-                               'face 'erc-error-face string)
-        (insert string)))))
+      (erc-display-message nil 'error (current-buffer)
+                           'terminated ?e event))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."
@@ -570,6 +562,7 @@ action."
         (run-hook-with-args 'erc-disconnected-hook
                             (erc-current-nick) (system-name) "")
         ;; Remove the prompt
+        (goto-char (or (marker-position erc-input-marker) (point-max)))
         (forward-line 0)
         (erc-remove-text-properties-region (point) (point-max))
         (delete-region (point) (point-max))
diff --git a/erc.el b/erc.el
index dbe5888..375418c 100644
--- a/erc.el
+++ b/erc.el
@@ -157,8 +157,8 @@ parameters and authentication."
 This can be either a string or a number."
   :group 'erc
   :type '(choice (const :tag "None" nil)
-		 (const :tag "Port number" number)
-		 (const :tag "Port string" string)))
+		 (integer :tag "Port number")
+		 (string :tag "Port string")))
 
 (defcustom erc-nick nil
   "Nickname to use if one is not provided.
@@ -2369,6 +2369,8 @@ See also `erc-format-message' and `erc-display-line'."
 		  msg)))
     (setq string
 	  (cond
+	   ((null type)
+	    string)
 	   ((listp type)
 	    (mapc (lambda (type)
 		    (setq string
@@ -2381,7 +2383,7 @@ See also `erc-format-message' and `erc-display-line'."
     (if (not (erc-response-p parsed))
 	(erc-display-line string buffer)
       (unless (member (erc-response.command parsed) erc-hide-list)
-      (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
+	(erc-put-text-property 0 (length string) 'erc-parsed parsed string)
 	(erc-put-text-property 0 (length string) 'rear-sticky t string)
 	(erc-display-line string buffer)))))
 
@@ -5959,12 +5961,17 @@ All windows are opened in the current frame."
    (ctcp-request-to . "==> CTCP request from %n (%u@%h) to %t: %r")
    (ctcp-too-many . "Too many CTCP queries in single message. Ignoring")
    (flood-ctcp-off . "FLOOD PROTECTION: Automatic CTCP responses turned off.")
-   (flood-strict-mode . "FLOOD PROTECTION: Switched to Strict Flood Control mode.")
-   (disconnected . "Connection failed!  Re-establishing connection...")
-   (disconnected-noreconnect . "Connection failed!  Not re-establishing connection.")
+   (flood-strict-mode
+    . "FLOOD PROTECTION: Switched to Strict Flood Control mode.")
+   (disconnected . "\n\nConnection failed!  Re-establishing connection...\n")
+   (disconnected-noreconnect
+    . "\n\nConnection failed!  Not re-establishing connection.\n")
+   (finished . "\n\n*** ERC finished ***\n")
+   (terminated . "\n\n*** ERC terminated: %e\n")
    (login . "Logging in as \'%n\'...")
    (nick-in-use . "%n is in use. Choose new nickname: ")
-   (nick-too-long . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server")
+   (nick-too-long
+    . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server")
    (no-default-channel . "No default channel")
    (no-invitation . "You've got no invitation")
    (no-target . "No target")



From MAILER-DAEMON Sun Oct 14 00:50:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQj-0005vp-KM
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPz-0005Ys-EI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPt-0005RI-91
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPr-0005R4-9y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
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@hcoop.net>) id 1IgvPr-0004Dr-1B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPq-0005SR-CY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPq-0007Mh-EF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPq-0007Mh-EF@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:26 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix a few minor whitespace issues and
	a forgotten fix to the manual
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, 14 Oct 2007 04:50:20 -0000

commit c44f53d4e76fee799a0acc55a95376bcd379f207
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Sep 8 00:03:55 2007 -0400

    Fix a few minor whitespace issues and a forgotten fix to the manual
    
    * erc.el (erc-setup-buffer): Minor indentation fix to match Emacs trunk.
    
    * erc.texi (Top): Remove one space to match Emacs trunk.
      (Modules): Fix completion and hecomplete entries, which somehow never
      got back upstream.

diff --git a/ChangeLog b/ChangeLog
index 1a495f0..c3abd83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -237,6 +237,10 @@
 	* 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.
diff --git a/erc.el b/erc.el
index 222a1e2..d8459dc 100644
--- a/erc.el
+++ b/erc.el
@@ -1908,7 +1908,7 @@ removed from the list will be disabled."
 				  default-frame-alist)))
 	 (switch-to-buffer buffer)
 	 (when erc-frame-dedicated-flag
-	     (set-window-dedicated-p (selected-window) t))))
+	   (set-window-dedicated-p (selected-window) t))))
 	(t
 	 (if (active-minibuffer-window)
 	     (display-buffer buffer)
diff --git a/erc.texi b/erc.texi
index a803ff1..405082e 100644
--- a/erc.texi
+++ b/erc.texi
@@ -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
@@ -561,7 +561,8 @@ Buttonize URLs, nicknames, and other text
 Mark unidentified users on freenode and other servers supporting CAPAB.
 
 @cindex modules, completion
-@item pcomplete
+@cindex modules, pcomplete
+@item completion (aka pcomplete)
 Complete nicknames and commands (programmable)
 
 @cindex modules, fill
@@ -569,7 +570,7 @@ Complete nicknames and commands (programmable)
 Wrap long lines
 
 @cindex modules, hecomplete
-@item completion
+@item hecomplete
 Complete nicknames and commands (old).  This is the old module---you
 might prefer the ``completion'' module instead.
 



From MAILER-DAEMON Sun Oct 14 00:50:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQl-0005xc-SB
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQj-0005wH-Vf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQj-0005vK-1M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOs-00050i-GN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
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@hcoop.net>) id 1IgvOs-0003we-4i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOr-00055M-7V
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOr-0005kF-9l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOr-0005kF-9l@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:25 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix /QUIT 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: Sun, 14 Oct 2007 04:50:22 -0000

commit bb3df3a8ebd64ada8bc6a73793ce26d845b46cb5
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Aug 7 06:38:30 2006 +0000

    Fix /QUIT bug.
    
    * erc.el (erc-cmd-QUIT): Bind the current erc-server-process to
      server-proc.  If the IRC server responds quickly, it is possible for
      the connection to close, and hence server buffer to be killed, if
      erc-kill-server-buffer-on-quit is non-nil.  This avoids that problem.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-38

diff --git a/ChangeLog b/ChangeLog
index 35e0777..95b10b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,11 @@
 	(english): Add 'finished and 'terminated entries to the catalog.
 	Add initial and terminal newlines to 'disconnected and
 	'disconnected-noreconnect entries.  Avoid long lines.
+	(erc-cmd-QUIT): Bind the current erc-server-process to
+	server-proc.  If the IRC server responds quickly, it is possible
+	for the connection to close, and hence server buffer to be killed,
+	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
+	problem.
 
 2006-08-06  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc.el b/erc.el
index 375418c..a3a557b 100644
--- a/erc.el
+++ b/erc.el
@@ -3121,7 +3121,8 @@ the message given by REASON."
    ((string-match "^\\s-*\\(.*\\)$" reason)
     (let* ((s (match-string 1 reason))
 	   (buffer (erc-server-buffer))
-	   (reason (funcall erc-quit-reason (if (equal s "") nil s))))
+	   (reason (funcall erc-quit-reason (if (equal s "") nil s)))
+	   server-proc)
       (with-current-buffer (if (and buffer
 				    (bufferp buffer))
 			       buffer
@@ -3129,17 +3130,18 @@ the message given by REASON."
 	(erc-log (format "cmd: QUIT: %s" reason))
 	(setq erc-server-quitting t)
 	(erc-set-active-buffer (erc-server-buffer))
+	(setq server-proc erc-server-process)
 	(erc-server-send (format "QUIT :%s" reason)))
-      (run-hook-with-args 'erc-quit-hook erc-server-process)
+      (run-hook-with-args 'erc-quit-hook server-proc)
       (when erc-kill-queries-on-quit
-	(erc-kill-query-buffers erc-server-process))
+	(erc-kill-query-buffers server-proc))
       ;; if the process has not been killed within 4 seconds, kill it
       (run-at-time 4 nil
 		   (lambda (proc)
 		     (when (and (processp proc)
 				(memq (process-status proc) '(run open)))
 		       (delete-process proc)))
-		   erc-server-process))
+		   server-proc))
     t)
    (t nil)))
 



From MAILER-DAEMON Sun Oct 14 00:50:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQl-0005xl-VY
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQk-0005wz-W1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQk-0005wX-BF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOs-00050l-Kq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
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@hcoop.net>) id 1IgvOs-0003wk-AI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOr-00055S-HD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOr-0005km-JA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOr-0005km-JA@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:25 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-fill: Skip initial empty lines.
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, 14 Oct 2007 04:50:23 -0000

commit 05e10e6d90a28fea910cfa4ad90deef1d6f5cb63
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Aug 12 02:14:08 2006 +0000

    erc-fill: Skip initial empty lines.
    
    * erc-fill.el (erc-fill): Skip any initial empty lines so that we avoid
      errors when inserting disconnect messages and other messages that begin
      with newlines.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-39

diff --git a/ChangeLog b/ChangeLog
index 95b10b1..38af6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
+	avoid errors when inserting disconnect messages and other messages
+	that begin with newlines.
+
 2006-08-07  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
diff --git a/erc-fill.el b/erc-fill.el
index f945d83..d318864 100644
--- a/erc-fill.el
+++ b/erc-fill.el
@@ -122,7 +122,15 @@ characters. Set to nil to disable."
 You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'."
   (unless (erc-string-invisible-p (buffer-substring (point-min) (point-max)))
     (when erc-fill-function
-      (funcall erc-fill-function))))
+      ;; skip initial empty lines
+      (goto-char (point-min))
+      (save-match-data
+        (while (and (looking-at "[ \t\n]*$")
+                    (= (forward-line 1) 0))))
+      (unless (eobp)
+        (save-restriction
+          (narrow-to-region (point) (point-max))
+          (funcall erc-fill-function))))))
 
 (defun erc-fill-static ()
   "Fills a text such that messages start at column `erc-fill-static-center'."



From MAILER-DAEMON Sun Oct 14 00:50:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQe-0005rg-Oa
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPz-0005Yv-LS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPt-0005RS-4h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPr-0005RL-Jl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
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@hcoop.net>) id 1IgvPr-0004Dv-BB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPq-0005SX-LL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPq-0007NC-OC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPq-0007NC-OC@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:26 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add ability to specify a "filter
	function" for logging
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, 14 Oct 2007 04:50:14 -0000

commit f0aaf9083b3f18d75fbcdf685a07a772c8ae5d69
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Sep 8 02:23:44 2007 -0400

    Add ability to specify a "filter function" for logging
    
    * 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.

diff --git a/ChangeLog b/ChangeLog
index c3abd83..b332c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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>
diff --git a/erc-log.el b/erc-log.el
index 856f1dc..1733b3d 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -205,6 +205,16 @@ This should ideally, be a \"catch-all\" coding system, like
 `emacs-mule', or `iso-2022-7bit'."
   :group 'erc-log)
 
+(defcustom erc-log-filter-function nil
+  "*If non-nil, pass text through the given function before writing it to
+a log file.
+
+The function should take one argument, which is the text to filter."
+  :group 'erc-log
+  :type '(choice (function "Function")
+		 (const :tag "No filtering" nil)))
+
+
 ;;;###autoload (autoload 'erc-log-mode "erc-log" nil t)
 (define-erc-module log nil
   "Automatically logs things you receive on IRC into files.
@@ -405,17 +415,25 @@ You can save every individual message by putting this function on
   (or buffer (setq buffer (current-buffer)))
   (when (erc-logging-enabled buffer)
     (let ((file (erc-current-logfile buffer))
-	  (coding-system-for-write erc-log-file-coding-system))
+	  (coding-system erc-log-file-coding-system))
       (save-excursion
 	(with-current-buffer buffer
 	  (save-restriction
 	    (widen)
-	    ;; early on in the initalisation, don't try and write the log out
+	    ;; early on in the initialization, don't try and write the log out
 	    (when (and (markerp erc-last-saved-position)
 		       (> erc-insert-marker (1+ erc-last-saved-position)))
-	      (write-region (1+ (marker-position erc-last-saved-position))
-			    (marker-position erc-insert-marker)
-			    file t 'nomessage)
+	      (let ((start (1+ (marker-position erc-last-saved-position)))
+		    (end (marker-position erc-insert-marker)))
+		(if (functionp erc-log-filter-function)
+		    (let ((text (buffer-substring start end)))
+		      (with-temp-buffer
+			(insert (funcall erc-log-filter-function text))
+			(let ((coding-system-for-write coding-system))
+			  (write-region (point-min) (point-max)
+					file t 'nomessage))))
+		  (let ((coding-system-for-write coding-system))
+		    (write-region start end file t 'nomessage))))
 	      (if (and erc-truncate-buffer-on-save (interactive-p))
 		  (progn
 		    (let ((inhibit-read-only t)) (erase-buffer))



From MAILER-DAEMON Sun Oct 14 00:50:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQq-00061b-Ba
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPz-0005YA-2A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPs-0005Ri-N2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPr-0005Rd-TE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
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@hcoop.net>) id 1IgvPr-0004Dz-LJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPq-0005Sd-Ut
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPr-0007Nh-0Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPr-0007Nh-0Y@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:27 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] NEWS: Improve explanation of erc-tls
	and erc-ssl.
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, 14 Oct 2007 04:50:25 -0000

commit 0c09ce580f8b590fa5418a03987764fc3cb4cd26
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 9 21:16:22 2007 -0400

    NEWS: Improve explanation of erc-tls and erc-ssl.
    
    * NEWS: Improve explanation of erc-tls and erc-ssl.

diff --git a/NEWS b/NEWS
index 7a32f9b..483c8b3 100644
--- a/NEWS
+++ b/NEWS
@@ -6,9 +6,10 @@ See the end of the file for license conditions.
 * Changes in ERC 5.3
 
 ** New function `erc-tls' is to be used for connecting to a server via TLS.
-The function `erc-ssl' should never be used for that purpose any
-longer, which was the case with the version of ERC that is included
-with Emacs.
+It requires the tls.el library.
+
+** The function `erc-ssl' will now always use ssl.el, even in the version
+of ERC that comes with Emacs.
 
 ** Changes and additions to modules
 



From MAILER-DAEMON Sun Oct 14 00:50:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQq-00061l-GW
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQn-0005z4-FO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOo-0004uQ-BC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOj-0004uK-Bu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
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@hcoop.net>) id 1IgvOj-0003to-0N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOh-00052M-Pn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOh-0005Ue-S9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOh-0005Ue-S9@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:15 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix undesired autoaway behavior and
	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: Sun, 14 Oct 2007 04:50:25 -0000

commit 3e83ee1b01c429c146c109b5cd7cfd020513cffd
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jun 12 20:49:30 2006 +0000

    Fix undesired autoaway behavior and update NEWS.
    
    * NEWS: Add items since the 5.1.2 release.
    
    * erc-autoaway.el (erc-autoaway-caused-away): New variable that indicates
      whether the current away status was caused by this module.
      (erc-autoaway-set-back): Only set back if this module set the user
      away.
      (erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
      (erc-autoaway-reset-indicators): New function that resets some
      indicators when the user is no longer away.
      (autoaway): Add the above function to the 305 hook.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-7

diff --git a/ChangeLog b/ChangeLog
index de8539c..167a705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-06-12  Michael Olson  <mwolson@gnu.org>
+
+	* NEWS: Add items since the 5.1.2 release.
+
+	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
+	indicates whether the current away status was caused by this
+	module.
+	(erc-autoaway-set-back): Only set back if this module set the user
+	away.
+	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
+	(erc-autoaway-reset-indicators): New function that resets some
+	indicators when the user is no longer away.
+	(autoaway): Add the above function to the 305 hook.
+
 2006-06-04  Michael Olson  <mwolson@gnu.org>
 
 	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
diff --git a/Makefile b/Makefile
index 89f3560..51dd69c 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ release: autoloads distclean
 upload:
 	(cd .. && gpg --detach erc-$(VERSION).tar.gz && \
 	  gpg --detach erc-$(VERSION).zip && \
-	  echo open ftp://savannah.nongnu.org > upload.lftp ; \
+	  echo open ftp://savannah.gnu.org > upload.lftp ; \
 	  echo cd /incoming/savannah/erc >> upload.lftp ; \
 	  echo mput erc-$(VERSION).zip* >> upload.lftp ; \
 	  echo mput erc-$(VERSION).tar.gz* >> upload.lftp ; \
diff --git a/NEWS b/NEWS
index ef98227..3f8e955 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,51 @@ ERC NEWS                                                       -*- outline -*-
 
 **** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
+* Changes in ERC 5.1.3 (unreleased)
+
+** Fix use of /quote command with no initial whitespace.
+
+** Changes and additions to modules
+
+** Make it possible to customize the colorization of the header line.
+The `erc-header-line' face is used to color the header line.
+The `erc-header-line-face-method' determines the method to use when
+colorizing the header line.
+
+** Add the new function `erc-handle-irc-url', which is a suitable
+candidate to use for `url-irc-function'.  This permits some
+integration of url.el and ERC.
+
+*** Autoaway (erc-autoaway.el)
+
+**** Rename the `erc-autoaway-use-emacs-idle' option to
+`erc-autoaway-idle-method'.
+
+**** Add support for autoaway based on user idle time.
+This is now the default.
+
+**** If you set the AWAY status yourself, erc-autoaway will not
+interfere by un-setting AWAY prematurely.
+
+*** BBDB (erc-bbdb.el)
+
+**** Add new option `erc-bbdb-electric-p', which determines whether
+to make the BBDB buffer electric.  This defaults to not electric.
+
+*** Button (erc-button.el)
+
+**** Use <backtab> instead of <C-tab> for `erc-button-previous'.
+
+*** Identd (erc-identd.el)
+
+**** Fix a bug that involves starting the identd server.
+
+**** Make this work with Emacs 22.
+
+*** Programmable completion (erc-pcomplete.el)
+
+**** Don't complete the user's current nickname.
+
 * Changes in ERC 5.1.2
 
 ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index aac6549..880f731 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -76,7 +76,8 @@ Related variables: `erc-public-away-p' and `erc-away-nickname'."
        (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
       ((eq erc-autoaway-idle-method 'emacs)
        (erc-autoaway-reestablish-idletimer)))
-     (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)))
+     (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
+     (add-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators)))
   ;; Disable:
   ((when (boundp 'erc-autoaway-idle-method)
      (cond
@@ -88,7 +89,8 @@ Related variables: `erc-public-away-p' and `erc-away-nickname'."
       ((eq erc-autoaway-idle-method 'emacs)
        (erc-cancel-timer erc-autoaway-idletimer)
        (setq erc-autoaway-idletimer nil)))
-     (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away))))
+     (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
+     (remove-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators))))
 
 (defcustom erc-autoaway-idle-method 'user
   "*The method used to determine how long you have been idle.
@@ -171,6 +173,10 @@ in seconds."
 (defvar erc-autoaway-last-sent-time (erc-current-time)
   "The last time the user sent something.")
 
+(defvar erc-autoaway-caused-away nil
+  "Indicates whether this module was responsible for setting the
+user's away status.")
+
 (defun erc-autoaway-reset-idle-user (&rest stuff)
   "Reset the stored user idle time.
 This is one global variable since a user talking on one net can
@@ -191,8 +197,8 @@ talk on another net too."
 
 (defun erc-autoaway-set-back ()
   "Discard the away state globally."
-  (when (erc-away-p)
-    (setq erc-autoaway-last-sent-time (erc-current-time))
+  (when (and erc-autoaway-caused-away
+	     (erc-away-p))
     (erc-cmd-GAWAY "")))
 
 (defun erc-autoaway-possibly-set-away (current-time)
@@ -219,8 +225,14 @@ exceeds `erc-autoaway-idle-seconds'."
   ;; existing process.
   (when (and (erc-server-process-alive)
 	     (not (erc-away-p)))
+    (setq erc-autoaway-caused-away t)
     (erc-cmd-GAWAY (format erc-autoaway-message idle-time))))
 
+(defun erc-autoaway-reset-indicators (&rest stuff)
+  "Reset indicators used by the erc-autoaway module."
+  (setq erc-autoaway-last-sent-time (erc-current-time))
+  (setq erc-autoaway-caused-away nil))
+
 (provide 'erc-autoaway)
 
 ;;; erc-autoaway.el ends here



From MAILER-DAEMON Sun Oct 14 00:50:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQq-00061y-LU
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPz-0005Yp-9D
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPt-0005Sf-2h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPs-0005ST-U9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
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@hcoop.net>) id 1IgvPs-0004EM-Oy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPs-0005T1-1q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPs-0007Pf-3i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPs-0007Pf-3i@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:28 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-track: Docfix
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, 14 Oct 2007 04:50:25 -0000

commit deedec3b6caba241795c36b860311ef00ef6dc0b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 16 16:22:36 2007 -0400

    erc-track: Docfix
    
    * erc-track.el (erc-track-switch-direction): Mention
      erc-track-faces-priority-list.  Thanks to Leo for the suggestion.

diff --git a/ChangeLog b/ChangeLog
index 80ab5c1..d96d872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
 	* erc-sound.el: Fix typo in setting up instructions.
diff --git a/erc-track.el b/erc-track.el
index 5865257..1408adc 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -285,7 +285,11 @@ when there are no more active channels."
   oldest      -  find oldest active buffer
   newest      -  find newest active buffer
   leastactive -  find buffer with least unseen messages
-  mostactive  -  find buffer with most unseen messages."
+  mostactive  -  find buffer with most unseen messages.
+
+If set to 'importance, the importance is determined by position
+in `erc-track-faces-priority-list', where first is most
+important."
   :group 'erc-track
   :type '(choice (const importance)
 		 (const oldest)



From MAILER-DAEMON Sun Oct 14 00:50:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQq-00062C-Sh
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOo-0004zV-Pz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004oA-PL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOb-0004nj-Pr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
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@hcoop.net>) id 1IgvOb-0003rB-Ie
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOa-0004zt-T5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOa-0005Ie-Un
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOa-0005Ie-Un@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:08 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-identd: Make it really work with
	Emacs 22.
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, 14 Oct 2007 04:50:26 -0000

commit b6ea38211a1c804482c91f6baa8d6d6e6bf217c6
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 25 06:12:41 2006 +0000

    erc-identd: Make it really work with Emacs 22.
    
    * erc-identd.el (erc-identd-start, erc-identd-stop): Add autoload
      cookies.
      (erc-identd-start): Pass :host parameter so this works with Emacs 22.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-141

diff --git a/ChangeLog b/ChangeLog
index 1343da5..7f0d0e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 	erc-identd-process is set properly.
+	(erc-identd-start, erc-identd-stop): Add autoload cookies.
+	(erc-identd-start): Pass :host parameter so this works with Emacs
+	22.
 
 2006-03-21  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc-identd.el b/erc-identd.el
index 0b9532a..197d51c 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -1,6 +1,6 @@
 ;;; erc-identd.el --- RFC1413 (identd authentication protocol) server
 
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: comm, processes
@@ -46,6 +46,7 @@
 			     system-type (user-login-name)))
 	(process-send-eof erc-identd-process)))))
 
+;;;###autoload
 (defun erc-identd-start (&optional port)
   "Start an identd server listening to port 8113.
 Port 113 (auth) will need to be redirected to port 8113 on your
@@ -64,11 +65,13 @@ system."
 	(if (fboundp 'make-network-process)
 	    (make-network-process :name "identd"
 				  :buffer (generate-new-buffer "identd")
-				  :service port :server t :noquery t
-				  :filter 'erc-identd-filter))
-	(open-network-stream-server "identd" (generate-new-buffer "identd")
-				    port nil 'erc-identd-filter)))
+				  :host 'local :service port
+				  :server t :noquery t
+				  :filter 'erc-identd-filter)
+	  (open-network-stream-server "identd" (generate-new-buffer "identd")
+				      port nil 'erc-identd-filter))))
 
+;;;###autoload
 (defun erc-identd-stop (&rest ignore)
   (interactive)
   (when erc-identd-process



From MAILER-DAEMON Sun Oct 14 00:50:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQr-00062L-18
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQn-0005zU-WF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOo-0004zL-Th
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOo-0004zA-Ct
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
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@hcoop.net>) id 1IgvOo-0003vP-54
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOn-00054C-Eb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOn-0005eF-Hn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOn-0005eF-Hn@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:21 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add forgotten ChangeLog entry.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Oct 2007 04:50:26 -0000

commit ce0e184682cecf334ab01a71bddb4a7b7a38ea96
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jul 30 02:44:49 2006 +0000

    Add forgotten ChangeLog entry.
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-26

diff --git a/ChangeLog b/ChangeLog
index 55d88b2..9c94148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-log-setup-logging): Don't offer to save the
+	buffer.  It will be saved automatically killed.  Thanks to Johan
+	Bockgård and Tassilo Horn for pointing this out.
+
 2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 
 	* erc.el (define-erc-module): Make find-function and find-variable



From MAILER-DAEMON Sun Oct 14 00:50:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQr-00062Z-5G
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOx-00052o-VH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004q4-LI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOd-0004pX-UT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
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@hcoop.net>) id 1IgvOd-0003rn-KI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOc-00050Z-Uj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOd-0005M9-0M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOd-0005M9-0M@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:11 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Flood-control fix.
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, 14 Oct 2007 04:50:26 -0000

commit c67d34a0e8010c275fa82d7834fb3787e7a07706
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Mar 27 02:46:02 2006 +0000

    Flood-control fix.
    
    * erc.el (erc-send-input): If flood control is not activated, don't split
      the input line.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-148

diff --git a/ChangeLog b/ChangeLog
index ae4a3ee..a8b49e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
 	(erc-update-mode-line-buffer): Use the aforementioned option and
 	face to colorize the header-line text, if that is what the user
 	wants.
+	(erc-send-input): If flood control is not activated, don't split
+	the input line.
 
 2006-03-25  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc.el b/erc.el
index c0d21d3..223bc2e 100644
--- a/erc.el
+++ b/erc.el
@@ -4870,7 +4870,8 @@ This returns non-nil only iff we actually send anything."
 		  (erc-display-msg line)
 		  (erc-process-input-line (concat line "\n")
 					  (null erc-flood-protect) t))
-		(erc-split-line line)))
+		(or (and erc-flood-protect (erc-split-line line))
+		    (list line))))
 	     (split-string str "\n"))
 	  ;; Insert the prompt along with the command.
 	  (erc-display-command str)



From MAILER-DAEMON Sun Oct 14 00:50:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQj-0005vx-O5
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQi-0005un-KD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQh-0005u7-Sb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOs-00050p-TB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
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@hcoop.net>) id 1IgvOs-0003wm-Il
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOr-00055Y-RZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOr-0005lH-Sm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOr-0005lH-Sm@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:25 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] If the connection times out,
	try to reconnect if the user wants it.
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, 14 Oct 2007 04:50:20 -0000

commit 2e4f32343c07619bdac5858d5f809732e2ce3b41
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 13 22:36:06 2006 +0000

    If the connection times out, try to reconnect if the user wants it.
    
    * erc-backend.el (erc-server-timed-out): New variable that indicates
      whether the current connection has timed out due to failure to respond
      to a ping.
      (erc-server-send-ping): Set erc-server-timed-out to t.
      (erc-server-connect): Initialize erc-server-timed-out to nil.
      (erc-process-sentinel-1): Consult erc-server-timed-out.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-40

diff --git a/ChangeLog b/ChangeLog
index 38af6c3..c9b852a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-timed-out): New variable that
+	indicates whether the current connection has timed out due to
+	failure to respond to a ping.
+	(erc-server-send-ping): Set erc-server-timed-out to t.
+	(erc-server-connect): Initialize erc-server-timed-out to nil.
+	(erc-process-sentinel-1): Consult erc-server-timed-out.
+
 2006-08-11  Michael Olson  <mwolson@gnu.org>
 
 	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
diff --git a/erc-backend.el b/erc-backend.el
index abee916..aeb8d69 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -186,6 +186,10 @@ This variable is buffer-local.")
   "Non-nil if the user requests a quit.")
 (make-variable-buffer-local 'erc-server-quitting)
 
+(defvar erc-server-timed-out nil
+  "Non-nil if the IRC server failed to respond to a ping.")
+(make-variable-buffer-local 'erc-server-timed-out)
+
 (defvar erc-server-lines-sent nil
   "Line counter.")
 (make-variable-buffer-local 'erc-server-lines-sent)
@@ -416,6 +420,7 @@ Additionally, detect whether the IRC process has hung."
                               erc-server-last-received-time)
                erc-server-send-ping-interval)
             ;; if the process is hung, kill it
+            (setq erc-server-timed-out t)
             (delete-process erc-server-process)
           (erc-server-send (format "PING %.0f" (erc-current-time)))))
     ;; remove timer if the server buffer has been killed
@@ -456,6 +461,7 @@ We will store server variables in the current buffer."
     (message "%s...done" msg))
   ;; Misc server variables
   (setq erc-server-quitting nil)
+  (setq erc-server-timed-out nil)
   (let ((time (erc-current-time)))
     (setq erc-server-last-sent-time time)
     (setq erc-server-last-ping-time time)
@@ -532,7 +538,8 @@ action."
     (setq erc-server-last-sent-time 0)
     (setq erc-server-lines-sent 0)
     (if (and erc-server-auto-reconnect
-             (not (string-match "^deleted" event))
+             (or erc-server-timed-out
+                 (not (string-match "^deleted" event)))
              ;; open-network-stream-nowait error for connection refused
              (not (string-match "^failed with code 111" event)))
         ;; Yuck, this should perhaps funcall



From MAILER-DAEMON Sun Oct 14 00:50:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQv-00065O-1W
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQo-00060A-Rh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOo-0004uy-0o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOg-0004s7-Nr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
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@hcoop.net>) id 1IgvOg-0003t2-Fn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOf-00051g-O0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOf-0005R7-QY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOf-0005R7-QY@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:13 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add license information to README.
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, 14 Oct 2007 04:50:27 -0000

commit 1a5b21d01636a1d508b6fd7ac805e502feda78d2
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon May 15 04:44:02 2006 +0000

    Add license information to README.
    
    * README: Add License information.  Permit images to be used,
      distributed, and modified without restriction.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-158

diff --git a/ChangeLog b/ChangeLog
index ede6139..d7ea2d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-15  Michael Olson  <mwolson@gnu.org>
+
+	* README: Add License information.  Permit images to be used,
+	distributed, and modified without restriction.
+
 2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 
 	* erc-goodies.el: (erc-handle-irc-url): New function, suitable as
diff --git a/README b/README
index 5e73ca7..e06df1d 100644
--- a/README
+++ b/README
@@ -43,3 +43,15 @@ Additional documentation is kept on the Emacs Wiki, and may be added
 to by anyone.
 
 * http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
+
+License information
+-------------------
+
+ERC is available under the terms of the GNU General Public License.
+See the file `COPYING' for details.
+
+The following copyright notice applies to each of the images contained
+in the `images' directory.
+
+Copyright (C) 2006 Free Software Foundation.
+This image may be used, distributed, and modified without restriction.



From MAILER-DAEMON Sun Oct 14 00:50:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQv-000668-Fj
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQp-000613-ON
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOo-0004yM-T7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOn-0004yI-Ft
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
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@hcoop.net>) id 1IgvOn-0003v0-17
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOm-00053o-8B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOm-0005cA-AQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOm-0005cA-AQ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:20 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-match: Use inhibit-read-only.
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, 14 Oct 2007 04:50:28 -0000

commit 6b7055e3ad710a223501d0ead521615c6e13602c
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Jul 13 01:08:12 2006 +0000

    erc-match: Use inhibit-read-only.
    
    * erc-match.el (erc-log-matches): Bind inhibit-read-only rather than call
      toggle-read-only.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-22

diff --git a/ChangeLog b/ChangeLog
index 749906c..38b0520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-12  Michael Olson  <mwolson@gnu.org>
 
+	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
+	than call toggle-read-only.
+
 	* Makefile (debrelease-mwolson): Remove and consolidate with the
 	`debrelease' target.
 	(debrevision): Rename from `debrevision-mwolson'.
diff --git a/erc-match.el b/erc-match.el
index ad875ce..8d19099 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -553,10 +553,9 @@ deactivate/activate match logging in the latter. See
 		    ?m message
 		    ?u nickuserhost))))
 	(with-current-buffer (erc-log-matches-make-buffer match-buffer-name)
-	  (toggle-read-only -1)
-	  (point-max)
-	  (insert line)
-	  (toggle-read-only 1))))))
+	  (let ((inhibit-read-only t))
+	    (goto-char (point-max))
+	    (insert line)))))))
 
 (defun erc-log-matches-make-buffer (name)
   "Create or get a log-matches buffer named NAME and return it."



From MAILER-DAEMON Sun Oct 14 00:50:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQv-00065Z-4m
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQp-00060f-CO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOo-0004yA-T2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOm-0004y5-Sq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
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@hcoop.net>) id 1IgvOm-0003uo-Be
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOl-00053c-LJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOl-0005bA-OK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOl-0005bA-OK@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:19 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.1 (release
	ERC 5.1.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: Sun, 14 Oct 2007 04:50:27 -0000

commit 573606aefd8431a745ce01b1d552f8c426a54a0f
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jul 10 04:39:29 2006 +0000

    Merged from erc--rel--5.1 (release ERC 5.1.3).
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-21
       Get documentation into a state I'm happy with.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-22
       erc-log: Use defaults that yield best speed.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-23
       erc-identd: Fix compiler error.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-24
       erc-autoaway: Fix error on returning from being away.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-25
       Update NEWS.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-26
       Release ERC 5.1.3.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-20

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 7053c31..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-{arch}
-.arch-ids
-*.elc
diff --git a/ChangeLog b/ChangeLog
index 97e20ee..703452f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,44 @@
 2006-07-09  Michael Olson  <mwolson@gnu.org>
 
+	* erc.el (erc-version-string): Release ERC 5.1.3.
+
+	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
+
+	* servers.pl: Add copyright notice.
+
+	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
+	from being set automatically away and current buffer is not an ERC
+	buffer.
+
+	* erc-identd.el: Fix compiler error.
+
+	* erc.texi (Development): Use @subheading instead of @subsection.
+	(Advanced Usage): Add menu.
+	(Connecting): Fully document how to connect to an IRC server.
+	(Options, Tips and Tricks, Sample Configuration): New unwritten
+	sections.
+
+	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
+	(erc-user-full-name, erc-password): Docfixes and customization
+	interface tweaks.
+	(erc-try-new-nick-p): Rename from
+	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
+	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
+	of `erc-nick-uniquifier', in case someone wants multiple
+	characters.
+	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
+	(erc-compute-port): Docfixes.
+
+	* FOR-RELEASE: Put in future-first order.
+
 	* erc-log.el (log): Move all add-hook calls here, rather than
 	executing them immediately, and also cause them to be un-hooked
 	when the module is removed.
+	(erc-save-buffer-on-part): Move next to
+	`erc-save-queries-on-quit'.
+	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
+	(erc-log-write-after-send, erc-log-write-after-insert): Default to
+	nil.  This makes things fast, but reasonably failsafe, by default.
 
 2006-07-08  Michael Olson  <mwolson@gnu.org>
 
diff --git a/FOR-RELEASE b/FOR-RELEASE
index fdc56aa..c37607d 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -1,5 +1,33 @@
 Tasks that need to be accomplished in order for a release to happen.
 
+* 5.2 release (future)
+
+** Documentation
+
+*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
+the release of 5.2.
+
+** Source
+
+*** Make erc-backend not need to (require) any other part of ERC.
+This will hopefully increase the chance that it will be useful for
+other IRC clients, like Circe.
+
+*** Add binding for S-TAB (backtab) that moves backwards by link.
+
+* next Emacs release
+
+** Source
+
+*** Make M-x erc start a session.
+New users never think of using M-x erc-select.
+
+*** Change keybinding definitions for `erc-track-switch-buffer'.
+`C-c C-SPC' / `C-c C-@' is set as a global keybinding and is known to
+conflict with rcirc, for example.  Would setting `erc-track-mode-map'
+work?  Otherwise we could encourage people to use something like
+`C-c e SPC' or `C-c c'.
+
 * 5.1 release
 
 ** [DONE] Documentation
@@ -50,34 +78,6 @@ install-info: muse.info
 *** Remove dependency on cl package.
 (eval-when-compile (require 'cl)) is acceptable.
 
-* 5.2 release (future)
-
-** Documentation
-
-*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
-the release of 5.2.
-
-** Source
-
-*** Make erc-backend not need to (require) any other part of ERC.
-This will hopefully increase the chance that it will be useful for
-other IRC clients, like Circe.
-
-*** Add binding for S-TAB (backtab) that moves backwards by link.
-
-* next Emacs release
-
-** Source
-
-*** Make M-x erc start a session.
-New users never think of using M-x erc-select.
-
-*** Change keybinding definitions for `erc-track-switch-buffer'.
-`C-c C-SPC' / `C-c C-@' is set as a global keybinding and is known to
-conflict with rcirc, for example.  Would setting `erc-track-mode-map'
-work?  Otherwise we could encourage people to use something like
-`C-c e SPC' or `C-c c'.
-
 
 Local variables:
 mode: outline
diff --git a/Makefile b/Makefile
index 2695c91..8214633 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-VERSION=5.1.2
+VERSION=5.1.3
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.1-3
+LASTUPLOAD = 5.1.2-1
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
diff --git a/NEWS b/NEWS
index 6887a94..b735089 100644
--- a/NEWS
+++ b/NEWS
@@ -8,12 +8,10 @@ ERC NEWS                                                       -*- outline -*-
 
 **** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
-* Changes in ERC 5.1.3 (unreleased)
+* Changes in ERC 5.1.3
 
 ** Fix use of /quote command with no initial whitespace.
 
-** Changes and additions to modules
-
 ** Make it possible to customize the colorization of the header line.
 The `erc-header-line' face is used to color the header line.
 The `erc-header-line-face-method' determines the method to use when
@@ -23,6 +21,42 @@ colorizing the header line.
 candidate to use for `url-irc-function'.  This permits some
 integration of url.el and ERC.
 
+** Fix several errors that occur when server or channel buffers are killed
+prematurely.
+
+** Fix toggling of flood control.
+
+** Match the patterns in `erc-encoding-coding-alist' as regexps,
+instead of verbatim text.  Also, match case-insensitively.
+
+** The /SMV command has been removed, since we no longer have
+meaningful module-specific version information.
+
+** Fix a "(stringp nil)" error that can happen when doing /PART.
+
+** Use a better example in the `erc-part-reason-various-alist'
+documentation.
+
+** When using `erc-quit-reason-various' and `erc-part-reason-various'
+and no matches are found, default to using the ERC version string
+rather than "nil".
+
+** Add the `list' and `page' modules to the `erc-modules' customize
+interface.
+
+** Changes to the ERC manual
+
+*** Update the list of available modules.
+
+*** Revise information about releases and development.
+
+*** Provide a simpler example in the "Getting Started" chapter.
+
+*** Fully document how to connect to an IRC server in the new
+"Connecting" chapter.
+
+** Changes and additions to modules
+
 *** Autoaway (erc-autoaway.el)
 
 **** Rename the `erc-autoaway-use-emacs-idle' option to
@@ -34,6 +68,10 @@ This is now the default.
 **** If you set the AWAY status yourself, erc-autoaway will not
 interfere by un-setting AWAY prematurely.
 
+**** If you are set away while visiting a non-ERC buffer,
+erc-autoaway used to fail in bringing the user back.  This is now
+fixed.
+
 *** BBDB (erc-bbdb.el)
 
 **** Add new option `erc-bbdb-electric-p', which determines whether
@@ -49,6 +87,33 @@ to make the BBDB buffer electric.  This defaults to not electric.
 
 **** Make this work with Emacs 22.
 
+**** Provide a real ERC module named `identd'.
+
+**** Don't create an extra buffer for the identd process.
+
+*** Logging (erc-log.el)
+
+**** By default, don't insert old logs when opening an ERC buffer.
+This may be changed by customizing `erc-log-insert-log-on-open'.
+
+**** New option `erc-log-write-after-send' determines whether the
+log file will be written to after every sent message.  The default is
+not to do this.
+
+**** New option `erc-log-write-after-insert' determines whether the
+log file will be written to when new text is added to a logged ERC
+buffer.  The default is not to do this.  With this option and the
+previous option, logging should no longer slow down ERC as much.
+
+**** Default to saving buffers and queries on quit.
+This may be changed by customizing the `erc-save-buffer-on-quit' and
+`erc-save-queries-on-quit' options, respectively.
+
+**** Only perform logging when the `logging' module is added to
+`erc-modules'.  This prevents logging from being activated just by
+loading the erc-log.el file, and makes logging act like other ERC
+modules.
+
 *** Programmable completion (erc-pcomplete.el)
 
 **** Don't complete the user's current nickname.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 4eba453..4614bd7 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -194,9 +194,10 @@ talk on another net too."
 
 (defun erc-autoaway-set-back ()
   "Discard the away state globally."
-  (when (and erc-autoaway-caused-away
-	     (erc-away-p))
-    (erc-cmd-GAWAY "")))
+  (let ((server-buffer (car (erc-buffer-list #'erc-server-buffer-p))))
+    (when (and erc-autoaway-caused-away
+	       (with-current-buffer server-buffer (erc-away-p)))
+      (erc-cmd-GAWAY ""))))
 
 (defun erc-autoaway-possibly-set-away (current-time)
   "Set autoaway when `erc-auto-set-away' is true and the idletime is
diff --git a/erc-identd.el b/erc-identd.el
index 9e4a1f5..32bfa33 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -38,6 +38,8 @@
 
 ;;; Code:
 
+(require 'erc)
+
 (defvar erc-identd-process nil)
 
 ;;;###autoload (autoload 'erc-identd-mode "erc-identd")
diff --git a/erc-log.el b/erc-log.el
index 752d712..dc5ba7d 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -115,11 +115,6 @@ SERVER and PORT are the parameters used to connect BUFFERs
 		 (const erc-generate-log-file-name-with-date)
 		 (symbol)))
 
-(defcustom erc-save-buffer-on-part nil
-  "*Save the channel buffer content using `erc-save-buffer-in-logs' on PART."
-  :group 'erc-log
-  :type 'boolean)
-
 (defcustom erc-truncate-buffer-on-save nil
   "Truncate any ERC (channel, query, server) buffer when it is saved."
   :group 'erc-log
@@ -155,13 +150,23 @@ directory should not end with a trailing slash."
   :group 'erc-log
   :type 'boolean)
 
-(defcustom erc-save-queries-on-quit nil
-  "Save all query (also channel) buffers of the server on QUIT.
-See the variable `erc-save-buffer-on-part' for details."
+(defcustom erc-save-buffer-on-part t
+  "*Save the channel buffer content using `erc-save-buffer-in-logs' on PART.
+
+If you set this to nil, you may want to enable both
+`erc-log-write-after-send' and `erc-log-write-after-insert'."
+  :group 'erc-log
+  :type 'boolean)
+
+(defcustom erc-save-queries-on-quit t
+  "*Save all query (also channel) buffers of the server on QUIT.
+
+If you set this to nil, you may want to enable both
+`erc-log-write-after-send' and `erc-log-write-after-insert'."
   :group 'erc-log
   :type 'boolean)
 
-(defcustom erc-log-write-after-send t
+(defcustom erc-log-write-after-send nil
   "*If non-nil, write to log file after every message you send.
 
 If you set this to nil, you may want to enable both
@@ -169,7 +174,7 @@ If you set this to nil, you may want to enable both
   :group 'erc-log
   :type 'boolean)
 
-(defcustom erc-log-write-after-insert t
+(defcustom erc-log-write-after-insert nil
   "*If non-nil, write to log file when new text is added to a
 logged ERC buffer.
 
diff --git a/erc.el b/erc.el
index 1bc71d6..1202a1c 100644
--- a/erc.el
+++ b/erc.el
@@ -67,7 +67,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (devel)"
+(defconst erc-version-string "Version 5.1.3 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -144,57 +144,69 @@
 ;; tunable connection and authentication parameters
 
 (defcustom erc-server nil
-  "IRC server to use.
+  "IRC server to use if one is not provided.
 See function `erc-compute-server' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil) string))
+  :type '(choice (const :tag "None" nil)
+		 (string :tag "Server")))
 
 (defcustom erc-port nil
-  "IRC port to use."
+  "IRC port to use if not specified.
+
+This can be either a string or a number."
   :group 'erc
-  :type '(choice (const nil) number string))
+  :type '(choice (const :tag "None" nil)
+		 (const :tag "Port number" number)
+		 (const :tag "Port string" string)))
 
 (defcustom erc-nick nil
-  "Nickname to use.
+  "Nickname to use if one is not provided.
 
-Can be either a string, or a list of strings.
+This can be either a string, or a list of strings.
 In the latter case, if the first nick in the list is already in use,
 other nicks are tried in the list order.
 
 See function `erc-compute-nick' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil)
+  :type '(choice (const :tag "None" nil)
 		 (string :tag "Nickname")
-		 (repeat string)))
+		 (repeat (string :tag "Nickname"))))
 
 (defcustom erc-nick-uniquifier "`"
-  "The character to append to the nick if it is already in use."
+  "The string to append to the nick if it is already in use."
   :group 'erc
   :type 'string)
 
-(defcustom erc-manual-set-nick-on-bad-nick-p nil
-  "If the nickname you chose isn't available, ERC should not automatically
-attempt to set another nickname.  You can manually set another nickname with
-the /NICK command."
+(defcustom erc-try-new-nick-p t
+  "If the nickname you chose isn't available, and this option is non-nil,
+ERC should automatically attempt to connect with another nickname.
+
+You can manually set another nickname with the /NICK command."
   :group 'erc
   :type 'boolean)
 
 (defcustom erc-user-full-name nil
   "User full name.
 
+This can be either a string or a function to call.
+
 See function `erc-compute-full-name' for more details on connection
 parameters and authentication."
   :group 'erc
-  :type '(choice (const nil) string function)
+  :type '(choice (const :tag "No name" nil)
+		 (string :tag "Name")
+		 (function :tag "Get from function"))
   :set (lambda (sym val)
 	 (if (functionp val)
 	     (set sym (funcall val))
 	   (set sym val))))
 
 (defvar erc-password nil
-  "ERC password to use in authentication (not necessary).")
+  "Password to use when authenticating to an IRC server.
+It is not strictly necessary to provide this, since ERC will
+prompt you for it.")
 
 (defcustom erc-user-mode nil
   "Initial user modes to be set after a connection is established."
@@ -2077,10 +2089,12 @@ Non-interactively, it takes keyword arguments
    (full-name (erc-compute-full-name)))
 
 That is, if called with
+
    (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
+
 server and full-name will be set to those values, whereas
-erc-compute-port, erc-compute-nick and erc-compute-full-name will
-be invoked for those parameters' values"
+`erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
+be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
 
   (run-hook-with-args 'erc-before-connect server port nick)
@@ -3727,7 +3741,7 @@ E.g. \"Read error to Nick [user@some.host]: 110\" would be shortened to
   "If NICK is unavailable, tell the user the REASON.
 
 See also `erc-display-error-notice'."
-  (if (or erc-manual-set-nick-on-bad-nick-p
+  (if (or (not erc-try-new-nick-p)
 	  ;; how many default-nicks are left + one more try...
 	  (eq erc-nick-change-attempt-count
 	      (if (consp erc-nick)
@@ -3749,12 +3763,13 @@ See also `erc-display-error-notice'."
 	  (setq newnick (concat (truncate-string-to-width
 				 nick
 				 (if (and erc-server-connected nicklen)
-				     (- (string-to-number nicklen) 1)
+				     (- (string-to-number nicklen)
+					(length erc-nick-uniquifier))
 				   ;; rfc2812 max nick length = 9
 				   ;; we must assume this is the
 				   ;; server's setting if we haven't
 				   ;; established a connection yet
-				   8))
+				   (- 9 (length erc-nick-uniquifier))))
 				erc-nick-uniquifier)))
       (erc-cmd-NICK newnick)
       (erc-display-error-notice
@@ -5401,28 +5416,28 @@ Sets the buffer local variables:
 (defun erc-compute-server (&optional server)
   "Return an IRC server name.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- SERVER
-- `erc-server'
+- SERVER (the argument passwd to this function)
+- The `erc-server' option
 - The value of the IRCSERVER environment variable
-- `erc-default-server'."
+- The `erc-default-server' variable"
   (or server
       erc-server
       (getenv "IRCSERVER")
       erc-default-server))
 
 (defun erc-compute-nick (&optional nick)
-  "Return user's NICK.
+  "Return user's IRC nick.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- NICK
-- `erc-nick'
+- NICK (the argument passed to this function)
+- The `erc-nick' option
 - The value of the IRCNICK environment variable
-- via the function `user-login-name'."
+- The result from the `user-login-name' function"
   (or nick
       (if (consp erc-nick) (car erc-nick) erc-nick)
       (getenv "IRCNICK")
@@ -5430,15 +5445,15 @@ found:
 
 
 (defun erc-compute-full-name (&optional full-name)
-  "Return user's FULL-NAME.
+  "Return user's full name.
 
-Tries a number of increasingly more default methods until a non-nil value is
-found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- FULL-NAME
-- `erc-user-full-name'
+- FULL-NAME (the argument passed to this function)
+- The `erc-user-full-name' option
 - The value of the IRCNAME environment variable
-- via the function `user-full-name'."
+- The result from the `user-full-name' function"
   (or full-name
       erc-user-full-name
       (getenv "IRCNAME")
@@ -5448,12 +5463,13 @@ found:
 (defun erc-compute-port (&optional port)
   "Return a port for an IRC server.
 
-Tries a number of increasingly more default methods until a non-nil
-value is found:
+This tries a number of increasingly more default methods until a
+non-nil value is found.
 
-- PORT
-- \"ircd\"."
-  (or port erc-port "ircd"))
+- PORT (the argument passed to this function)
+- The `erc-port' option
+- The `erc-default-port' variable"
+  (or port erc-port erc-default-port))
 
 ;; time routines
 
diff --git a/erc.texi b/erc.texi
index ee2f699..cfa7743 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.1.2.
+This manual is for ERC version 5.1.3.
 
 Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
 
@@ -73,6 +73,13 @@ Obtaining ERC
 * Releases::                    Released versions of ERC.
 * Development::                 Latest unreleased development changes.
 
+Advanced Usage
+
+* Connecting::                  Ways of connecting to an IRC server.
+* Options::                     Options that are available for ERC.
+* Tips and Tricks::             Ways of enhancing your ERC experience.
+* Sample Configuration::        An example configuration file.
+
 @end detailmenu
 @end menu
 
@@ -139,7 +146,7 @@ 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.
 
-@subsection GNU Arch
+@subheading GNU Arch
 
 ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
 up-to-date involves the following steps.
@@ -190,7 +197,7 @@ If you are new to Arch and want to learn more about developing with it,
 you might find this tutorial helpful:
 @uref{http://www.mwolson.org/projects/ArchTutorial.html}.
 
-@subsection Development snapshots
+@subheading Development snapshots
 
 @cindex development snapshot
 Alternatively, the latest development snapshot may be downloaded in both
@@ -506,14 +513,175 @@ Translate morse code in messages
 @chapter Advanced Usage
 @cindex advanced topics
 
-Write me.
+@menu
+* Connecting::                  Ways of connecting to an IRC server.
+* Options::                     Options that are available for ERC.
+* Tips and Tricks::             Ways of enhancing your ERC experience.
+* Sample Configuration::        An example configuration file.
+@end menu
+
+@node Connecting, Options, Advanced Usage, Advanced Usage
+@comment  node-name,  next,  previous,  up
+@section Connecting to an IRC Server
+@cindex connecting
+
+The easiest way to connect to an IRC server is to call
+@kbd{M-x erc-select}.  If you want to assign this function to a
+keystroke, the following will help you figure out its parameters.
+
+@defun erc-select
+Select connection parameters and run ERC.
+Non-interactively, it takes the following keyword arguments.
+
+@itemize @bullet
+@item @var{server}
+@item @var{port}
+@item @var{nick}
+@item @var{password}
+@item @var{full-name}
+@end itemize
+
+That is, if called with the following arguments, @var{server} and
+@var{full-name} will be set to those values, whereas
+@code{erc-compute-port}, @code{erc-compute-nick} and
+@code{erc-compute-full-name} will be invoked for the values of the other
+parameters.
+
+@example
+(erc-select :server "irc.freenode.net" :full-name "Harry S Truman")
+@end example
+@end defun
+
+@subheading Server
+
+@defun erc-compute-server &optional server
+Return an IRC server name.
+
+This tries a number of increasingly more default methods until a non-nil
+value is found.
+
+@itemize @bullet
+@item @var{server} (the argument passed to this function)
+@item The @code{erc-server} option
+@item The value of the IRCSERVER environment variable
+@item The @code{erc-default-server} variable
+@end itemize
+
+@end defun
+
+@defopt erc-server nil
+IRC server to use if one is not provided.
+@end defopt
+
+@subheading Port
+
+@defun erc-compute-port &optional port
+Return a port for an IRC server.
+
+This tries a number of increasingly more default methods until a non-nil
+value is found.
+
+@itemize @bullet
+@item @var{port} (the argument passed to this function)
+@item The @code{erc-port} option
+@item The @code{erc-default-port} variable
+@end itemize
+
+@end defun
+
+@defopt erc-port
+IRC port to use if not specified.
 
-@c PRE5_2: (Node) Document every ERC option
+This can be either a string or a number.
+@end defopt
+
+@subheading Nick
+
+@defun erc-compute-nick &optional nick
+Return user's IRC nick.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
+@itemize
+@item @var{nick} (the argument passed to this function)
+@item The @code{erc-nick} option
+@item The value of the IRCNICK environment variable
+@item The result from the @code{user-login-name} function
+@end itemize
+
+@end defun
+
+@defopt erc-nick
+Nickname to use if one is not provided.
+
+This can be either a string, or a list of strings.
+In the latter case, if the first nick in the list is already in use,
+other nicks are tried in the list order.
+@end defopt
+
+@defopt erc-nick-uniquifier
+The string to append to the nick if it is already in use.
+@end defopt
+
+@defopt erc-try-new-nick-p
+If the nickname you chose isn't available, and this option is non-nil,
+ERC should automatically attempt to connect with another nickname.
+
+You can manually set another nickname with the /NICK command.
+@end defopt
+
+@subheading Full name
+
+@defun erc-compute-full-name &optional full-name
+Return user's full name.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
+@itemize @bullet
+@item @var{full-name} (the argument passed to this function)
+@item The @code{erc-user-full-name} option
+@item The value of the IRCNAME environment variable
+@item The result from the @code{user-full-name} function
+@end itemize
+
+@end defun
+
+@defopt erc-user-full-name
+User full name.
+
+This can be either a string or a function to call.
+@end defopt
+
+@node Options, Tips and Tricks, Connecting, Advanced Usage
+@comment  node-name,  next,  previous,  up
+@section Options
+@cindex options
+
+@c PRE5_2: (Node) Document every ERC option (module options go in
+@c previous chapter)
+
+This section has not yet been written.
+
+@node Tips and Tricks, Sample Configuration, Options, Advanced Usage
+@comment  node-name,  next,  previous,  up
+@section Tips and Tricks
+@cindex tips and tricks
 
 @c PRE5_2: (Node) Tips and tricks
 
+This section has not yet been written.
+
+@node Sample Configuration, , Tips and Tricks, Advanced Usage
+@comment  node-name,  next,  previous,  up
+@section Sample Configuration
+@cindex configuration, sample
+
 @c PRE5_2: (Node) Sample configs
 
+This section has not yet been written.
+
 
 @node Getting Help and Reporting Bugs, History, Advanced Usage, Top
 @comment  node-name,  next,  previous,  up
diff --git a/servers.pl b/servers.pl
index 99c15a5..2d3f8d2 100755
--- a/servers.pl
+++ b/servers.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+# Copyright (C) 2002 Free Software Foundation, Inc.
+
 # Convert mIRC's servers.ini to a elisp structure.
 # Get the file from http://www.mirc.co.uk/servers.ini
 



From MAILER-DAEMON Sun Oct 14 00:50:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQv-00065r-8K
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOx-00052R-VW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOX-0004ih-HS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004i0-VP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
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@hcoop.net>) id 1IgvOV-0003o1-IB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOU-0004xU-TT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOU-00057c-WB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOU-00057c-WB@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:02 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Move to end of buffer on continued
	session.
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, 14 Oct 2007 04:50:28 -0000

commit 9fc7827ab9d40e94db386be73b54b79ab0ee8a31
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Feb 15 05:09:18 2006 +0000

    Move to end of buffer on continued session.
    
    * erc.el (erc): Move to the end of the buffer when a continued session is
      detected.  Thanks to e1f and indio for the report and testing a
      potential fix.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-119

diff --git a/ChangeLog b/ChangeLog
index 9ea9e6a..71b877d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-15  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc): Move to the end of the buffer when a continued
+	session is detected.  Thanks to e1f and indio for the report and
+	testing a potential fix.
+
 2006-02-14  Michael Olson  <mwolson@gnu.org>
 
 	* debian/changelog: Prepare a new Debian package.
diff --git a/erc.el b/erc.el
index a5970d1..7aefb6e 100644
--- a/erc.el
+++ b/erc.el
@@ -1934,7 +1934,8 @@ Returns the buffer for the given server or channel."
       (goto-char (point-max))
       (insert "\n"))
     (set-marker (process-mark erc-server-process) (point))
-    (unless continued-session
+    (if continued-session
+	(goto-char (point-max))
       (set-marker erc-insert-marker (point))
       (erc-display-prompt)
       (goto-char (point-max)))



From MAILER-DAEMON Sun Oct 14 00:50:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQv-00066N-Jq
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQp-000614-Ou
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQo-00060D-Sz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052a-AG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOw-0003xt-Js
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOv-00056d-Cu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOv-0005qr-Ga
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOv-0005qr-Ga@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:29 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Deal with IRC names that could be
	regexps in /ignore, /unignore.
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, 14 Oct 2007 04:50:28 -0000

commit 8b170bebf35cf2cca3331d068670528f0e7831fa
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Sep 11 01:48:19 2006 +0000

    Deal with IRC names that could be regexps in /ignore, /unignore.
    
    2006-09-10  Eric Hanchrow  <offby1@blarg.net>
    
    	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
    	instead of a single user.
    
    2006-09-10  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-member-ignore-case): Coding style tweak.
    	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
    	find the user listed verbatim, try to match them against the list
    	using string-match.  In this case, prompt as to whether the regexp
    	should be removed.
    	(erc-ignored-user-p): Remove CL-ism.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-51

diff --git a/CREDITS b/CREDITS
index 9e8e910..d50680e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -134,6 +134,10 @@ Aravind Gottipati <aravind@freeshell.org>:
 Mark Plaksin (happy AT mcplaksin DOT org):
   * Made a last-keystroke method for erc-autoaway.el.
 
+Eric Hanchrow <offby1@blarg.net>:
+  * Implemented check of /ignore argument to see whether it was a
+    regexp or a normal string (4 lines changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index 2f878e4..da17a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
+2006-09-10  Eric Hanchrow  <offby1@blarg.net>
+
+	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
+	instead of a single user.
+
 2006-09-10  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-generate-new-buffer-name): If this is a server
 	buffer and a process exists already, create a new buffer.
 	(erc-open): If the IRC session was continued, restore the old
 	point.  Thanks to Stephan Stahl for the report.
+	(erc-member-ignore-case): Coding style tweak.
+	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
+	find the user listed verbatim, try to match them against the list
+	using string-match.  In this case, prompt as to whether the regexp
+	should be removed.
+	(erc-ignored-user-p): Remove CL-ism.
 
 	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
 	whether we are already away.
diff --git a/erc.el b/erc.el
index ff0a128..bfafba3 100644
--- a/erc.el
+++ b/erc.el
@@ -1571,7 +1571,8 @@ All strings are compared according to IRC protocol case rules, see
   (catch 'result
     (while list
       (if (string= string (erc-downcase (car list)))
-	  (throw 'result list) (setq list (cdr list))))))
+	  (throw 'result list)
+	(setq list (cdr list))))))
 
 (defmacro erc-with-buffer (spec &rest body)
   "Execute BODY in the buffer associated with SPEC.
@@ -2561,7 +2562,11 @@ therefore has to contain the command itself as well."
   "Ignore USER.  This should be a regexp matching nick!user@host.
 If no USER argument is specified, list the contents of `erc-ignore-list'."
   (if user
-      (progn
+      (let ((quoted (regexp-quote user)))
+	(when (and (not (string= user quoted))
+		   (y-or-n-p (format "Use regexp-quoted form (%s) instead? "
+				     quoted)))
+	  (setq user quoted))
 	(erc-display-line
 	 (erc-make-notice (format "Now ignoring %s" user))
 	 'active)
@@ -2578,16 +2583,22 @@ If no USER argument is specified, list the contents of `erc-ignore-list'."
 (defun erc-cmd-UNIGNORE (user)
   "Remove the user specified in USER from the ignore list."
   (let ((ignored-nick (car (erc-with-server-buffer
-			     (erc-member-ignore-case user erc-ignore-list)))))
-    (if (null ignored-nick)
+			     (erc-member-ignore-case (regexp-quote user)
+						     erc-ignore-list)))))
+    (unless ignored-nick
+      (if (setq ignored-nick (erc-ignored-user-p user))
+	  (unless (y-or-n-p (format "Remove this regexp (%s)? "
+				    ignored-nick))
+	    (setq ignored-nick nil))
 	(erc-display-line
 	 (erc-make-notice (format "%s is not currently ignored!" user))
-	 'active)
+	 'active)))
+    (when ignored-nick
       (erc-display-line
        (erc-make-notice (format "No longer ignoring %s" user))
-       'active))
-    (erc-with-server-buffer
-      (setq erc-ignore-list (delete ignored-nick erc-ignore-list))))
+       'active)
+      (erc-with-server-buffer
+	(setq erc-ignore-list (delete ignored-nick erc-ignore-list)))))
   t)
 
 (defun erc-cmd-CLEAR ()
@@ -5091,10 +5102,10 @@ The previous default target of QUERY type gets removed"
 Takes a full SPEC of a user in the form \"nick!login@host\", and
 matches against all the regexp's in `erc-ignore-list'.  If any
 match, returns that regexp."
-  (dolist (ignored (erc-with-server-buffer erc-ignore-list))
-    (if (string-match ignored spec)
-	;; We have `require'd cl, so we can return from the block named nil
-	(return ignored))))
+  (catch 'found
+    (dolist (ignored (erc-with-server-buffer erc-ignore-list))
+      (if (string-match ignored spec)
+	  (throw 'found ignored)))))
 
 (defun erc-ignored-reply-p (msg tgt proc)
   ;; FIXME: this docstring needs fixing -- Lawrence 2004-01-08



From MAILER-DAEMON Sun Oct 14 00:50:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQv-00066l-P0
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOx-00052Z-96
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOX-0004ip-Tj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004hs-Tj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
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@hcoop.net>) id 1IgvOU-0003oB-Cb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOS-0004wX-ED
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:00 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOS-000537-GD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:00 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOS-000537-GD@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:00 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:50:28 -0000

commit aaa11b32733a14487c82ec9519a26080a002a7b3
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Feb 11 17:52:28 2006 +0000

    Update from CVS
    
    2006-02-11  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-list.el: Define `list' module which sets the alias
       `erc-cmd-LIST' to `erc-list-channels' when enabled and
       `erc-list-channels-simple' when disabled.
       (erc-list-channels): Was `erc-cmd-LIST', renamed.
       (erc-list-channels-simple): New function.
    
       * erc.el (erc-modules): Added `list' to enabled modules. Changed
       `capab-identify' description.  Moved customization options left in
       source code.
    
       * erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
    
       * erc-capab.el: Put a little more detail into Usage section.
       (define-erc-module): Run `erc-capab-identify-setup' in all open
       server buffers when enabling.
       (erc-capab-identify-setup): Make PROC and PARSED optional
       arguments.
       (erc-capab-identify-add-prefix): Simplified nickname regexp.  This
       should now also match nicknames that are formatted differently
       than the default.
    
       * erc-spelling.el (define-erc-module): Make sure there's a buffer
       before calling `with-current-buffer'.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-110

diff --git a/ChangeLog b/ChangeLog
index ea74df4..d42385f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2006-02-11  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-list.el: Define `list' module which sets the alias
+	`erc-cmd-LIST' to `erc-list-channels' when enabled and
+	`erc-list-channels-simple' when disabled.
+	(erc-list-channels): Was `erc-cmd-LIST', renamed.
+	(erc-list-channels-simple): New function.
+
+	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
+	`capab-identify' description.  Moved customization options left in
+	source code.
+
+	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
+
+	* erc-capab.el: Put a little more detail into Usage section.
+	(define-erc-module): Run `erc-capab-identify-setup' in all open
+	server buffers when enabling.
+	(erc-capab-identify-setup): Make PROC and PARSED optional
+	arguments.
+	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
+	should now also match nicknames that are formatted differently
+	than the default.
+
+	* erc-spelling.el (define-erc-module): Make sure there's a buffer
+	before calling `with-current-buffer'.
+
 2006-02-10  Michael Olson  <mwolson@gnu.org>
 
 	* Makefile (debbuild): Split from debrelease.
diff --git a/erc-capab.el b/erc-capab.el
index 0f45f3d..c77f989 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -50,23 +50,27 @@
 
 ;;; Usage:
 
-;; Enable the module `capab-identify' (see the documentation for
-;; `erc-modules').  `erc-capab-identify-prefix' will now be added to the
-;; beginning of unidentified users' nicknames.  The default is an
-;; asterisk.  If the value of this variable is nil, no prefix will be
-;; inserted, but the flag sent by the server will still be stripped.
+;; Put the following in your ~/.emacs file.
+
+;; (require 'erc-capab)
+;; (erc-capab-identify-mode 1)
+
+;; `erc-capab-identify-prefix' will now be added to the beginning of
+;; unidentified users' nicknames.  The default is an asterisk, "*".  If
+;; the value of this variable is nil or you disable this module (see
+;; `erc-capab-identify-disable'), no prefix will be inserted, but the
+;; flag sent by the server will still be stripped.
 
 ;;; Todo:
 
 ;; Somebody who knows about autoload cookies could please add them where
 ;; necessary.
-;; Make sure nickname regexp works with other format-nick functions.
 
 ;;; Code:
 
 (require 'erc)
 
-(defconst erc-capab-version "$Revision: 1.3 $"
+(defconst erc-capab-version "$Revision: 1.4 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -94,7 +98,11 @@
              'erc-capab-identify-remove/set-identified-flag)
    (add-hook 'erc-server-NOTICE-functions
              'erc-capab-identify-remove/set-identified-flag)
-   (add-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix t))
+   (add-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix t)
+   (mapc (lambda (buffer)
+           (when buffer
+             (with-current-buffer buffer (erc-capab-identify-setup))))
+         (erc-buffer-list 'erc-server-buffer-p)))
   ((remove-hook 'erc-server-005-functions 'erc-capab-identify-setup)
    (remove-hook 'erc-server-290-functions 'erc-capab-identify-activate)
    ;; we don't remove the `erc-capab-identify-remove/set-identified-flag' hooks
@@ -113,11 +121,14 @@
 
 ;;; Functions:
 
-(defun erc-capab-identify-setup (proc parsed)
+(defun erc-capab-identify-setup (&optional proc parsed)
   "Set up CAPAB IDENTIFY on the current server.
 
-PROC is the current server's process.
-PARSED is the current message, a response struct."
+Optional argument PROC is the current server's process.
+Optional argument PARSED is the current message, a response struct.
+
+These arguments are sent to this function when called as a hook in
+`erc-server-005-functions'."
   (unless erc-capab-identify-sent
     (erc-capab-send-identify-messages)))
 
@@ -174,13 +185,9 @@ PARSED is an `erc-parsed' response struct."
                      (erc-get-parsed-vector (point)))))
       (when (and nickname
                  (goto-char (point-min))
-                 (re-search-forward
-                  ;; matches nick in channel, msg, notice, and action messages
-                  ;; this assumes the default action format is used
-                  (concat "\\(<\\|[^\\*]?\\* ?\\|-\\)"
-                          "\\(" (regexp-quote nickname) "\\)")
-                  nil t))
-        (goto-char (match-beginning 2))
+                 ;; assuming the first use of `nickname' is the sender's nick
+                 (re-search-forward (regexp-quote nickname) nil t))
+        (goto-char (match-beginning 0))
         (insert erc-capab-identify-prefix)))))
 
 (defun erc-capab-find-parsed ()
diff --git a/erc-list.el b/erc-list.el
index da442c9..019be8f 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -38,7 +38,7 @@
   (require 'overlay))
 (eval-when-compile (require 'cl))
 
-(defconst erc-list-version "$Revision: 1.48 $"
+(defconst erc-list-version "$Revision: 1.49 $"
   "ERC channel list revision number")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -143,12 +143,19 @@ display the channel list."
   (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-cmd-LIST (&rest channel)
+(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)."
@@ -166,6 +173,18 @@ available channel)."
     (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.
diff --git a/erc-menu.el b/erc-menu.el
index 07e1e10..d7a20ba 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -31,7 +31,7 @@
 
 (require 'easymenu)
 
-(defconst erc-menu-version "$Revision: 1.24 $"
+(defconst erc-menu-version "$Revision: 1.25 $"
   "ERC menu revision")
 
 (defvar erc-menu-definition
@@ -39,8 +39,8 @@
 	["Connect to server..." erc-select t]
 	["Disconnect from server..." erc-quit-server erc-server-connected]
 	"-"
-	["List channels..." erc-cmd-LIST
-	 (and erc-server-connected (fboundp 'erc-cmd-LIST))]
+	["List channels..." erc-list-channels
+	 (and erc-server-connected (fboundp 'erc-list-channels))]
 	["Join channel..." erc-join-channel erc-server-connected]
 	["Start a query..." erc-cmd-QUERY erc-server-connected]
 	"-"
diff --git a/erc-spelling.el b/erc-spelling.el
index f3748ad..aaa5293 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -34,7 +34,7 @@
 (require 'erc)
 (require 'flyspell)
 
-(defconst erc-spelling-version "$Revision: 1.10 $"
+(defconst erc-spelling-version "$Revision: 1.11 $"
   "ERC spelling revision.")
 
 ;;;###autoload (autoload 'erc-spelling-mode "erc-spelling" nil t)
@@ -44,11 +44,13 @@
   ;; called AFTER the server buffer is initialized.
   ((add-hook 'erc-connect-pre-hook 'erc-spelling-init)
    (mapc (lambda (buffer)
-           (with-current-buffer buffer (erc-spelling-init)))
+           (when buffer
+             (with-current-buffer buffer (erc-spelling-init))))
          (erc-buffer-list)))
   ((remove-hook 'erc-connect-pre-hook 'erc-spelling-init)
    (mapc (lambda (buffer)
-           (with-current-buffer buffer (flyspell-mode 0)))
+           (when buffer
+             (with-current-buffer buffer (flyspell-mode 0))))
          (erc-buffer-list))))
 
 (defcustom erc-spelling-dictionaries nil
diff --git a/erc.el b/erc.el
index 0a47c60..1a6d0a7 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.805 $"
+(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.806 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -1727,7 +1727,7 @@ all channel buffers on all servers."
 
 (defcustom erc-modules '(netsplit fill button match track completion readonly
 				  ring autojoin noncommands irccontrols
-				  stamp)
+				  stamp 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
@@ -1748,42 +1748,47 @@ removed from the list will be disabled."
 	 ;; this test is for the case where erc hasn't been loaded yet
 	 (when (fboundp 'erc-update-modules)
 	   (erc-update-modules)))
-  :type '(set :greedy t
-	      (const :tag "Set away status automatically" autoaway)
-	      (const :tag "Join channels automatically" autojoin)
-	      (const :tag "Integrate with Big Brother Database" bbdb)
-	      (const :tag "Buttonize URLs, nicknames, and other text" button)
-	      (const :tag "Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG"
-		     capab-identify)
-	      (const :tag "Wrap long lines" fill)
-	      (const :tag "Highlight or remove IRC control characters"
-		     irccontrols)
-	      (const :tag "Save buffers in logs" log)
-	      (const :tag "Highlight pals, fools, and other keywords" match)
-	      (const :tag "Detect netsplits" netsplit)
-	      (const :tag "Don't display non-IRC commands after evaluation"
-		     noncommands)
-	      (const :tag
-		     "Notify when the online status of certain users changes"
-		     notify)
-	      (const :tag "Complete nicknames and commands (programmable)"
-		     completion)
-	      (const :tag "Complete nicknames and commands (old)" hecomplete)
-	      (const :tag "Make displayed lines read-only" readonly)
-	      (const :tag "Replace text in messages" replace)
-	      (const :tag "Enable an input history" ring)
-	      (const :tag "Scroll to the bottom of the buffer" scrolltobottom)
-	      (const :tag "Identify to Nickserv (IRC Services) automatically"
-		     services)
-	      (const :tag "Convert smileys to pretty icons" smiley)
-	      (const :tag "Play sounds when you receive CTCP SOUND requests"
-		     sound)
-	      (const :tag "Add timestamps to messages" stamp)
-	      (const :tag "Check spelling" spelling)
-	      (const :tag "Track channel activity in the mode-line" track)
-	      (const :tag "Truncate buffers to a certain size" truncate)
-	      (const :tag "Translate morse code in messages" unmorse)
-	      (repeat :tag "Others" :inline t symbol))
+  :type
+  '(set
+    :greedy t
+    (const :tag "Set away status automatically" autoaway)
+    (const :tag "Join channels automatically" autojoin)
+    (const :tag "Integrate with Big Brother Database" bbdb)
+    (const :tag "Buttonize URLs, nicknames, and other text" button)
+    (const
+     :tag
+     "Mark unidentified users on freenode and other servers supporting CAPAB"
+     capab-identify)
+    (const :tag "Wrap long lines" fill)
+    (const :tag "Highlight or remove IRC control characters"
+	   irccontrols)
+    (const :tag "List channels in a separate buffer" list)
+    (const :tag "Save buffers in logs" log)
+    (const :tag "Highlight pals, fools, and other keywords" match)
+    (const :tag "Detect netsplits" netsplit)
+    (const :tag "Don't display non-IRC commands after evaluation"
+	   noncommands)
+    (const :tag
+	   "Notify when the online status of certain users changes"
+	   notify)
+    (const :tag "Complete nicknames and commands (programmable)"
+	   completion)
+    (const :tag "Complete nicknames and commands (old)" hecomplete)
+    (const :tag "Make displayed lines read-only" readonly)
+    (const :tag "Replace text in messages" replace)
+    (const :tag "Enable an input history" ring)
+    (const :tag "Scroll to the bottom of the buffer" scrolltobottom)
+    (const :tag "Identify to Nickserv (IRC Services) automatically"
+	   services)
+    (const :tag "Convert smileys to pretty icons" smiley)
+    (const :tag "Play sounds when you receive CTCP SOUND requests"
+	   sound)
+    (const :tag "Add timestamps to messages" stamp)
+    (const :tag "Check spelling" spelling)
+    (const :tag "Track channel activity in the mode-line" track)
+    (const :tag "Truncate buffers to a certain size" truncate)
+    (const :tag "Translate morse code in messages" unmorse)
+    (repeat :tag "Others" :inline t symbol))
   :group 'erc)
 
 (defun erc-update-modules ()



From MAILER-DAEMON Sun Oct 14 00:50:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQv-00066p-U1
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQs-00063Q-23
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQr-00062q-Fd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOp-000507-UV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
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@hcoop.net>) id 1IgvOp-0003vk-L3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOo-00054a-Sp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOo-0005gH-Uv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOo-0005gH-Uv@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:22 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Search in ~/.emacs.d/ first for
	.ercrc.el and handle MS-DOS names.
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, 14 Oct 2007 04:50:30 -0000

commit 0c41be753141b033de8f4343eeeb0e4a6eed0c42
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Aug 5 23:37:47 2006 +0000

    Search in ~/.emacs.d/ first for .ercrc.el and handle MS-DOS names.
    
    * erc.el (erc-startup-file-list): Search in ~/.emacs.d first, since that
      is a fairly standard directory.
      (erc-select-startup-file): Re-write to use convert-standard-filename,
      which will ensure that MS-DOS systems look for the _ercrc.el file.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-30

diff --git a/ChangeLog b/ChangeLog
index fb704aa..67d944d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-05  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
+	since that is a fairly standard directory.
+	(erc-select-startup-file): Re-write to use
+	convert-standard-filename, which will ensure that MS-DOS systems
+	look for the _ercrc.el file.
+
 2006-08-02  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-version-string): Release ERC 5.1.4.
diff --git a/erc.el b/erc.el
index fd9ca09..4d28ce5 100644
--- a/erc.el
+++ b/erc.el
@@ -822,7 +822,8 @@ See `erc-server-flood-margin' for other flood-related parameters.")
 ;; Script parameters
 
 (defcustom erc-startup-file-list
-  '("~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
+  '("~/.emacs.d/.ercrc.el" "~/.emacs.d/.ercrc"
+    "~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
   "List of files to try for a startup script.
 The first existent and readable one will get executed.
 
@@ -5247,13 +5248,11 @@ If FILE is found, return the path to it."
 (defun erc-select-startup-file ()
   "Select an ERC startup file.
 See also `erc-startup-file-list'."
-  (let ((l erc-startup-file-list)
-	(f nil))
-    (while (and (not f) l)
-      (if (file-readable-p (car l))
-	  (setq f (car l)))
-      (setq l (cdr l)))
-    f))
+  (catch 'found
+    (dolist (f erc-startup-file-list)
+      (setq f (convert-standard-file-name f))
+      (when (file-readable-p f)
+	(throw 'found f)))))
 
 (defun erc-find-script-file (file)
   "Search for FILE in `default-directory', and any in `erc-script-path'."



From MAILER-DAEMON Sun Oct 14 00:50:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQw-000672-2v
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQs-00063i-Ho
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOp-0004pz-N2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOd-0004pM-Oc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
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@hcoop.net>) id 1IgvOd-0003ri-A8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOc-00050T-Ku
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOc-0005Le-NT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOc-0005Le-NT@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:10 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:50:30 -0000

commit ba20b7c66ac46b16532858eae0db5e845e2005f1
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Mar 26 18:18:55 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-147

diff --git a/erc.el b/erc.el
index a400287..c0d21d3 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.811 $"
+(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.812 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:50:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQw-00067B-6Z
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQt-00064T-L7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQt-000649-3o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPi-0005JF-M6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
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@hcoop.net>) id 1IgvPi-0004Ac-7z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPh-0005PX-Fy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPh-00077Y-JI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPh-00077Y-JI@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add .gitignore file
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, 14 Oct 2007 04:50:31 -0000

commit 258ee30b8c253be8e6b52b95a216f9760d6fe38d
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Sep 10 13:45:19 2007 -0400

    Add .gitignore file
    
    Also add forgotten ChangeLog entry.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9581394
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+*.elc
+*.info
+/++xgit-log-edit
+erc-auto.el
diff --git a/ChangeLog b/ChangeLog
index b332c3c..c0a9eab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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



From MAILER-DAEMON Sun Oct 14 00:50:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQx-00068J-CJ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQu-000653-Cm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvQt-00064f-Rx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPi-0005JE-5e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
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@hcoop.net>) id 1IgvPh-0004AZ-V3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:18 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPh-0005PR-8p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPh-000773-AO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPh-000773-AO@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix dir entry in ELPA package for ERC
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, 14 Oct 2007 04:50:32 -0000

commit 0466dbd901949e8cc203aedb545bd452348d4c8c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Sep 10 13:42:39 2007 -0400

    Fix dir entry in ELPA package for ERC
    
    * 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.

diff --git a/Makefile b/Makefile
index ca4ce8a..4abef18 100644
--- a/Makefile
+++ b/Makefile
@@ -185,8 +185,7 @@ elpa: $(MANUAL).info
 	cp -r images $(ELPA)/$(SNAPDIR)
 	cp erc-pkg.el $(ELPA)/$(SNAPDIR)
 	cp $(MANUAL).info $(ELPA)/$(SNAPDIR)
-	echo '* Menu:' > $(ELPA)/$(SNAPDIR)/dir
-	echo >> $(ELPA)/$(SNAPDIR)/dir
+	cp dir-template $(ELPADIR)/$(SNAPDIR)/dir
 	install-info --section "Emacs" "Emacs" \
 	  --info-dir=$(ELPA)/$(SNAPDIR) \
 	  $(ELPA)/$(SNAPDIR)/$(MANUAL).info
diff --git a/dir-template b/dir-template
new file mode 100644
index 0000000..08346cd
--- /dev/null
+++ b/dir-template
@@ -0,0 +1,15 @@
+This is the file .../info/dir, which contains the
+topmost node of the Info hierarchy, called (dir)Top.
+The first time you invoke Info you start off looking at this node.
+
+File: dir,	Node: Top	This is the top of the INFO tree
+
+  This (the Directory node) gives a menu of major topics.
+  Typing "q" exits, "?" lists all Info commands, "d" returns here,
+  "h" gives a primer for first-timers,
+  "mEmacs<Return>" visits the Emacs manual, etc.
+
+  In Emacs, you can click mouse button 2 on a menu item or cross reference
+  to select it.
+
+* Menu:



From MAILER-DAEMON Sun Oct 14 00:50:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQy-00069M-HO
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQw-00067I-8X
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPc-0005Hk-N6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPb-0005Hf-Vd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
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@hcoop.net>) id 1IgvPb-00048c-PZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPb-0005NL-2u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPb-0006x3-5I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPb-0006x3-5I@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:11 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] /GQ: Kill query buffers after 4
	seconds if user wants it
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, 14 Oct 2007 04:50:35 -0000

commit ffab470eeadb67e3aa7cb470a24ca2c009077dee
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Aug 26 20:11:32 2007 -0400

    /GQ: Kill query buffers after 4 seconds if user wants it
    
    * erc.el (erc-cmd-GQUIT): If erc-kill-queries-on-quit is non-nil, kill
      all query buffers after 4 seconds.

diff --git a/ChangeLog b/ChangeLog
index 461a34d..f9594d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/erc.el b/erc.el
index 1628fbd..2c931d8 100644
--- a/erc.el
+++ b/erc.el
@@ -3258,7 +3258,17 @@ the message given by REASON."
 (defun erc-cmd-GQUIT (reason)
   "Disconnect from all servers at once with the same quit REASON."
   (erc-with-all-buffers-of-server nil #'erc-open-server-buffer-p
-				  (erc-cmd-QUIT reason)))
+				  (erc-cmd-QUIT reason))
+  (when erc-kill-queries-on-quit
+    ;; if the query buffers have not been killed within 4 seconds,
+    ;; kill them
+    (run-at-time
+     4 nil
+     (lambda ()
+       (dolist (buffer (erc-buffer-list (lambda (buf)
+					  (not (erc-server-buffer-p buf)))))
+	 (kill-buffer buffer)))))
+  t)
 
 (defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
 (put 'erc-cmd-GQUIT 'do-not-parse-args t)



From MAILER-DAEMON Sun Oct 14 00:50:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQy-00069Z-Lw
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQx-00068I-BA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPc-0005I0-DF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPZ-0005GG-OG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
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@hcoop.net>) id 1IgvPY-00045W-TZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPX-0005M1-Ht
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPX-0006qw-JS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPX-0006qw-JS@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix bug where reconnect was not
	happening when erc-server-reconnect-attempts was t
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, 14 Oct 2007 04:50:35 -0000

commit 7e78c9918ff40b5a17c517976fc807db4d1534e7
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 23:59:26 2007 -0400

    Fix bug where reconnect was not happening when erc-server-reconnect-attempts was t
    
    * erc-backend.el (erc-process-sentinel-1): Fix bug where reconnect was
      not happening when erc-server-reconnect-attempts was t.  Call
      erc-server-reconnect-p only once per loop iteration.

diff --git a/ChangeLog b/ChangeLog
index b0dce79..38cfe66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,9 @@
 	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.  If it is deleted during
-	a reconnect attempt, stop trying to reconnect.
+	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 per loop iteration.
 	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
 
 	* erc.el (erc-command-no-process-p): Fix bug: the return value of
diff --git a/erc-backend.el b/erc-backend.el
index 463bffa..9e5279e 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -623,14 +623,15 @@ Conditionally try to reconnect and take appropriate action."
             (set-buffer-modified-p nil)
             (kill-buffer (current-buffer))))
       ;; unexpected disconnect
-      (let ((again t))
+      (let ((again t)
+            reconnect-p)
         (while again
           (setq again nil)
+          (setq reconnect-p (erc-server-reconnect-p event))
           (erc-display-message nil 'error (current-buffer)
-                               (if (erc-server-reconnect-p event)
-                                   'disconnected
+                               (if reconnect-p 'disconnected
                                  'disconnected-noreconnect))
-          (if (erc-server-reconnect-p event)
+          (if reconnect-p
               (condition-case err
                   (progn
                     (setq erc-server-reconnecting nil)
@@ -640,9 +641,11 @@ Conditionally try to reconnect and take appropriate action."
                          (set-buffer buffer)
                          (when (integerp erc-server-reconnect-attempts)
                            (setq erc-server-reconnect-count
-                                 (1+ erc-server-reconnect-count))
-                           (sit-for erc-server-reconnect-timeout)
-                           (setq again t)))))
+                                 (1+ erc-server-reconnect-count)))
+                         ;; TODO: Make this use a one-time timer
+                         ;; instead of sit-for
+                         (sit-for erc-server-reconnect-timeout)
+                         (setq again t))))
             ;; terminate, do not reconnect
             (erc-display-message nil 'error (current-buffer)
                                  'terminated ?e event)))))))



From MAILER-DAEMON Sun Oct 14 00:50:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvQz-0006Ai-RF
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQy-00068z-5C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPc-0005HP-Mo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPb-0005HM-Ks
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
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@hcoop.net>) id 1IgvPb-00048S-9C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPa-0005N7-FJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPa-0006w2-IF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPa-0006w2-IF@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:10 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] ChangeLog: Add entry for jbms'
	erc-reuse-frames patch
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, 14 Oct 2007 04:50:36 -0000

commit 3cda769c8372eefd524eaf1810af627ae11043d0
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Aug 17 23:54:24 2007 -0400

    ChangeLog: Add entry for jbms' erc-reuse-frames patch
    
    * ChangeLog: Add entry for jbms' erc-reuse-frames patch.

diff --git a/ChangeLog b/ChangeLog
index e06fd56..461a34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,11 @@
 	(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



From MAILER-DAEMON Sun Oct 14 00:50:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR2-0006Cb-76
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQy-00069r-Qx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPc-0005HY-4W
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPb-0005HB-9o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
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@hcoop.net>) id 1IgvPa-00048N-Ts
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPa-0005N1-6v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPa-0006vX-9I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPa-0006vX-9I@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:10 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-reuse-frames: new variable
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, 14 Oct 2007 04:50:37 -0000

commit 0e90a8e09d6c9fa48c3eb6acd6471218a6eab009
Author: Jeremy Maitin-Shepard <jbms@cmu.edu>
Date:   Tue Aug 14 16:23:57 2007 -0400

    erc-reuse-frames: new variable
    
    Adds an erc-reuse-frames variable that acts just as the documentation
    for it specifies.  Without this change, if erc-join-buffer is set to
    `frame', duplicate frames will be created on every reconnect, which is
    equivalent to setting `erc-reuse-frames' to nil.

diff --git a/erc.el b/erc.el
index cee601f..1628fbd 100644
--- a/erc.el
+++ b/erc.el
@@ -1492,6 +1492,14 @@ This only has effect when `erc-join-buffer' is set to `frame'."
   :group 'erc-buffers
   :type 'boolean)
 
+(defcustom erc-reuse-frames t
+  "*Determines whether new frames are always created.
+Non-nil means that a new frame is not created to display an ERC
+buffer if there is already a window displaying it.  This only has
+effect when `erc-join-buffer' is set to `frame'."
+  :group 'erc-buffers
+  :type 'boolean)
+
 (defun erc-channel-p (channel)
   "Return non-nil if CHANNEL seems to be an IRC channel name."
   (cond ((stringp channel)
@@ -1891,14 +1899,16 @@ removed from the list will be disabled."
 	((eq erc-join-buffer 'bury)
 	 nil)
 	((eq erc-join-buffer 'frame)
-	 (funcall '(lambda (frame)
+	 (when (or (not erc-reuse-frames)
+		   (not (get-buffer-window buffer t)))
+	   ((lambda (frame)
 		     (raise-frame frame)
 		     (select-frame frame))
 		  (make-frame (or erc-frame-alist
 				  default-frame-alist)))
 	 (switch-to-buffer buffer)
 	 (when erc-frame-dedicated-flag
-	   (set-window-dedicated-p (selected-window) t)))
+	     (set-window-dedicated-p (selected-window) t))))
 	(t
 	 (if (active-minibuffer-window)
 	     (display-buffer buffer)



From MAILER-DAEMON Sun Oct 14 00:50:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR2-0006Cs-CG
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQz-0006AH-AW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPc-0005Hv-DE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPZ-0005GL-Tf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
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@hcoop.net>) id 1IgvPZ-00047i-Mw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPY-0005MX-OR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPY-0006t2-QQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPY-0006t2-QQ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:08 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Handle some edge cases when
	erc-server-process is 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: Sun, 14 Oct 2007 04:50:37 -0000

commit d0691caef77d6a2f2e04fe5a69879b5c4a4967db
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 01:31:44 2007 -0400

    Handle some edge cases when erc-server-process is nil
    
    * erc-backend.el (erc-server-reconnect): Fix logic inversion.
    
    * erc.el (erc-send-current-line, erc-display-command, erc-display-msg):
      Handle case where erc-server-process is nil, so that /reconnect works.

diff --git a/ChangeLog b/ChangeLog
index 05aa739..40ee342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
 	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>
 
diff --git a/erc-backend.el b/erc-backend.el
index 73f534a..0df2776 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -553,8 +553,8 @@ Make sure you are in an ERC buffer when running this."
   (let ((buffer (erc-server-buffer)))
     (unless (buffer-live-p buffer)
       (if (eq major-mode 'erc-mode)
-          (error "Reconnect must be run from an ERC buffer")
-        (setq buffer (current-buffer))))
+          (setq buffer (current-buffer))
+        (error "Reconnect must be run from an ERC buffer")))
     (with-current-buffer buffer
       (erc-update-mode-line)
       (erc-set-active-buffer (current-buffer))
diff --git a/erc.el b/erc.el
index 5d29ace..cee601f 100644
--- a/erc.el
+++ b/erc.el
@@ -4999,7 +4999,8 @@ Specifically, return the position of `erc-insert-marker'."
 		(save-restriction
 		  (widen)
 		  (goto-char (point-max))
-		  (set-marker (process-mark erc-server-process) (point))
+		  (when (processp erc-server-process)
+		    (set-marker (process-mark erc-server-process) (point)))
 		  (set-marker erc-insert-marker (point))
 		  (let ((buffer-modified (buffer-modified-p)))
 		    (erc-display-prompt)
@@ -5067,7 +5068,8 @@ This returns non-nil only iff we actually send anything."
 	(erc-put-text-property beg (point)
 			       'face 'erc-command-indicator-face)
 	(insert "\n"))
-      (set-marker (process-mark erc-server-process) (point))
+      (when (processp erc-server-process)
+	(set-marker (process-mark erc-server-process) (point)))
       (set-marker erc-insert-marker (point))
       (save-excursion
 	(save-restriction
@@ -5086,7 +5088,8 @@ current position."
 	(erc-put-text-property beg (point)
 			       'face 'erc-input-face))
       (insert "\n")
-      (set-marker (process-mark erc-server-process) (point))
+      (when (processp erc-server-process)
+	(set-marker (process-mark erc-server-process) (point)))
       (set-marker erc-insert-marker (point))
       (save-excursion
 	(save-restriction



From MAILER-DAEMON Sun Oct 14 00:50:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR2-0006DM-O4
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR0-0006B9-6A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPc-0005Hh-2l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPb-0005Hd-T7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
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@hcoop.net>) id 1IgvPb-00048Y-Kf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPa-0005ND-Q0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPa-0006wX-RL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPa-0006wX-RL@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:10 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-process-sentinel: Update mode
	line in more places
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, 14 Oct 2007 04:50:38 -0000

commit 18b157ee2779760f01507f67f7419f738dd5f20b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Aug 19 23:02:37 2007 -0400

    erc-process-sentinel: Update mode line in more places
    
    * erc-backend.el (erc-process-sentinel-2, erc-process-sentinel-1)
      (erc-process-sentinel): Update mode line in more places.  Unmark buffer
      as modified in more places.

diff --git a/erc-backend.el b/erc-backend.el
index 0df2776..4e25049 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -612,7 +612,8 @@ EVENT is the message received from the closed connection process."
 
 (defun erc-process-sentinel-2 (event buffer)
   "Called when `erc-process-sentinel-1' has detected an unexpected disconnect."
-  (when (buffer-live-p buffer)
+  (if (not (buffer-live-p buffer))
+      (erc-update-mode-line)
     (with-current-buffer buffer
       (let ((reconnect-p (erc-server-reconnect-p event)))
         (erc-display-message nil 'error (current-buffer)
@@ -620,8 +621,12 @@ EVENT is the message received from the closed connection process."
                                'disconnected-noreconnect))
         (if (not reconnect-p)
             ;; terminate, do not reconnect
-            (erc-display-message nil 'error (current-buffer)
-                                 'terminated ?e event)
+            (progn
+              (erc-display-message nil 'error (current-buffer)
+                                   'terminated ?e event)
+              ;; Update mode line indicators
+              (erc-update-mode-line)
+              (set-buffer-modified-p nil))
           ;; reconnect
           (condition-case err
               (progn
@@ -652,8 +657,11 @@ Conditionally try to reconnect and take appropriate action."
         ;; normal quit
         (progn
           (erc-display-message nil 'error (current-buffer) 'finished)
+          ;; Update mode line indicators
+          (erc-update-mode-line)
+          ;; Kill server buffer if user wants it
+          (set-buffer-modified-p nil)
           (when erc-kill-server-buffer-on-quit
-            (set-buffer-modified-p nil)
             (kill-buffer (current-buffer))))
       ;; unexpected disconnect
       (erc-process-sentinel-2 event buffer))))
@@ -683,12 +691,7 @@ Conditionally try to reconnect and take appropriate action."
         (delete-region (point) (point-max))
         ;; Decide what to do with the buffer
         ;; Restart if disconnected
-        (erc-process-sentinel-1 event buf)
-        ;; Make sure we don't write to the buffer if it has been
-        ;; killed
-        (when (buffer-live-p buf)
-          (erc-update-mode-line)
-          (set-buffer-modified-p nil))))))
+        (erc-process-sentinel-1 event buf)))))
 
 ;;;; Sending messages
 



From MAILER-DAEMON Sun Oct 14 00:50:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR2-0006D5-GV
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQz-0006Ag-R9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004oR-RO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOc-0004o7-E5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
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@hcoop.net>) id 1IgvOb-0003rG-S3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOb-0004zz-62
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOb-0005J9-8B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOb-0005J9-8B@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:09 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix /quote command for case when no
	leading whitespace exists.
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, 14 Oct 2007 04:50:38 -0000

commit 642d0912f735232daa57dd1680403710b7f17f6f
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 25 06:18:04 2006 +0000

    Fix /quote command for case when no leading whitespace exists.
    
    * erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati that fixes
      the case where there is no leading whitespace.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-142

diff --git a/CREDITS b/CREDITS
index 0d915bf..5172ffc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -127,6 +127,10 @@ Simon Josefsson  (jas AT extundo DOT com):
 Nelson Ferreira <nelson.ferreira@ieee.org>:
   * Made BBDB buffers not electric by default (6 lines changed).
 
+Aravind Gottipati <aravind@freeshell.org>:
+  * Made /quote work with lines that don't have leading whitespace (1
+    line changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index 7f0d0e6..28a013c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-25  Michael Olson  <mwolson@gnu.org>
 
+	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
+	that fixes the case where there is no leading whitespace.
+
 	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 	erc-identd-process is set properly.
 	(erc-identd-start, erc-identd-stop): Add autoload cookies.
diff --git a/erc.el b/erc.el
index de9f0cf..dcdb57a 100644
--- a/erc.el
+++ b/erc.el
@@ -3003,7 +3003,7 @@ Otherwise leave the channel indicated by LINE."
 All the text given as argument is sent to the sever as unmodified,
 just as you provided it.  Use this command with care!"
   (cond
-   ((string-match "^\\s-\\(.+\\)$" line)
+   ((string-match "^\\s-*\\(.+\\)$" line)
     (erc-server-send (match-string 1 line)))
    (t nil)))
 (put 'erc-cmd-QUOTE 'do-not-parse-args t)



From MAILER-DAEMON Sun Oct 14 00:50:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR3-0006El-TB
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR1-0006CH-OY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPa-0005Ez-3C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Ei-BV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPW-00045n-RP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPV-0005Kp-E7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPV-0006nR-GZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPV-0006nR-GZ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:05 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make /reconnect work even when the
	server process is not alive
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, 14 Oct 2007 04:50:40 -0000

commit cd3dcf85e1a9ba1337db501d96a57d567baff8c4
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Jul 13 02:14:41 2007 +0000

    Make /reconnect work even when the server process is not alive
    
    2007-07-13  Michael Olson  <mwolson@gnu.org>
    
    	* 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-157

diff --git a/ChangeLog b/ChangeLog
index 330c05f..379d66b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-13  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
 2007-07-10  Michael Olson  <mwolson@gnu.org>
 
 	* Relicense all FSF-assigned code to GPLv3.
diff --git a/erc.el b/erc.el
index 5f8efab..9fcf119 100644
--- a/erc.el
+++ b/erc.el
@@ -2480,6 +2480,13 @@ See also `erc-server-send'."
 	(match-string 1 arglist)
       arglist)))
 
+(defun erc-command-no-process-p (str)
+  "Return non-nil if STR is an ERC command that can be run when the process
+is not alive, nil otherwise."
+  (let ((fun (erc-extract-command-from-line str)))
+    (and fun
+	 (get fun 'process-not-needed))))
+
 (defun erc-command-name (cmd)
   "For CMD being the function name of a ERC command, something like
 erc-cmd-FOO, this returns a string /FOO."
@@ -2589,6 +2596,7 @@ VALUE is computed by evaluating the rest of LINE in Lisp."
 (defalias 'erc-cmd-VAR 'erc-cmd-SET)
 (defalias 'erc-cmd-VARIABLE 'erc-cmd-SET)
 (put 'erc-cmd-SET 'do-not-parse-args t)
+(put 'erc-cmd-SET 'process-not-needed t)
 
 (defun erc-cmd-default (line)
   "Fallback command.
@@ -2647,6 +2655,7 @@ If no USER argument is specified, list the contents of `erc-ignore-list'."
   "Clear the window content."
   (recenter 0)
   t)
+(put 'erc-cmd-CLEAR 'process-not-needed t)
 
 (defun erc-cmd-OPS ()
   "Show the ops in the current channel."
@@ -2680,6 +2689,7 @@ If no USER argument is specified, list the contents of `erc-ignore-list'."
       (erc-display-message
        nil 'notice 'active 'country-unknown ?d tld))
   t))
+(put 'erc-cmd-COUNTRY 'process-not-needed t)
 
 (defun erc-cmd-AWAY (line)
   "Mark the user as being away, the reason being indicated by LINE.
@@ -2760,6 +2770,7 @@ For a list of user commands (/join /part, ...):
     t))
 
 (defalias 'erc-cmd-H 'erc-cmd-HELP)
+(put 'erc-cmd-HELP 'process-not-needed t)
 
 (defun erc-cmd-JOIN (channel &optional key)
   "Join the channel given in CHANNEL, optionally with KEY.
@@ -2997,6 +3008,7 @@ the matching is case-sensitive."
   (occur line)
   t)
 (put 'erc-cmd-LASTLOG 'do-not-parse-args t)
+(put 'erc-cmd-LASTLOG 'process-not-needed t)
 
 (defun erc-send-message (line &optional force)
   "Send LINE to the current channel or user and display it.
@@ -3219,6 +3231,7 @@ the message given by REASON."
 (defalias 'erc-cmd-EXIT 'erc-cmd-QUIT)
 (defalias 'erc-cmd-SIGNOFF 'erc-cmd-QUIT)
 (put 'erc-cmd-QUIT 'do-not-parse-args t)
+(put 'erc-cmd-QUIT 'process-not-needed t)
 
 (defun erc-cmd-GQUIT (reason)
   "Disconnect from all servers at once with the same quit REASON."
@@ -3227,6 +3240,7 @@ the message given by REASON."
 
 (defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
 (put 'erc-cmd-GQUIT 'do-not-parse-args t)
+(put 'erc-cmd-GQUIT 'process-not-needed t)
 
 (defun erc-cmd-RECONNECT ()
   "Try to reconnect to the current IRC server."
@@ -3242,6 +3256,7 @@ the message given by REASON."
 	(erc-server-reconnect))
       (setq erc-server-reconnecting nil)))
   t)
+(put 'erc-cmd-RECONNECT 'process-not-needed t)
 
 (defun erc-cmd-SERVER (server)
   "Connect to SERVER, leaving existing connection intact."
@@ -3252,6 +3267,7 @@ the message given by REASON."
      (message "Cannot find host %s." server)
      (beep)))
   t)
+(put 'erc-cmd-SERVER 'process-not-needed t)
 
 (eval-when-compile
   (defvar motif-version-string)
@@ -4948,39 +4964,40 @@ Specifically, return the position of `erc-insert-marker'."
   (interactive)
   (save-restriction
     (widen)
-    (cond
-     ((< (point) (erc-beg-of-input-line))
-      (message "Point is not in the input area")
-      (beep))
-     ((not (erc-server-buffer-live-p))
-      (message "ERC: No process running")
-      (beep))
-     (t
-      (erc-set-active-buffer (current-buffer))
+    (if (< (point) (erc-beg-of-input-line))
+	(progn
+	  (message "Point is not in the input area")
+	  (beep))
       (let ((inhibit-read-only t)
 	    (str (erc-user-input))
 	    (old-buf (current-buffer)))
-
-	;; Kill the input and the prompt
-	(delete-region (erc-beg-of-input-line)
-		       (erc-end-of-input-line))
-
-	(unwind-protect
-	    (erc-send-input str)
-	  ;; Fix the buffer if the command didn't kill it
-	  (when (buffer-live-p old-buf)
-	    (with-current-buffer old-buf
-	      (save-restriction
-		(widen)
-		(goto-char (point-max))
-		(set-marker (process-mark erc-server-process) (point))
-		(set-marker erc-insert-marker (point))
-		(let ((buffer-modified (buffer-modified-p)))
-		  (erc-display-prompt)
-		  (set-buffer-modified-p buffer-modified))))))
-
-	;; Only when last hook has been run...
-	(run-hook-with-args 'erc-send-completed-hook str))))))
+	(if (and (not (erc-server-buffer-live-p))
+		 (not (erc-command-no-process-p str)))
+	    (progn
+	      (message "ERC: No process running")
+	      (beep))
+	  (erc-set-active-buffer (current-buffer))
+
+	  ;; Kill the input and the prompt
+	  (delete-region (erc-beg-of-input-line)
+			 (erc-end-of-input-line))
+
+	  (unwind-protect
+	      (erc-send-input str)
+	    ;; Fix the buffer if the command didn't kill it
+	    (when (buffer-live-p old-buf)
+	      (with-current-buffer old-buf
+		(save-restriction
+		  (widen)
+		  (goto-char (point-max))
+		  (set-marker (process-mark erc-server-process) (point))
+		  (set-marker erc-insert-marker (point))
+		  (let ((buffer-modified (buffer-modified-p)))
+		    (erc-display-prompt)
+		    (set-buffer-modified-p buffer-modified))))))
+
+	  ;; Only when last hook has been run...
+	  (run-hook-with-args 'erc-send-completed-hook str))))))
 
 (defun erc-user-input ()
   "Return the input of the user in the current buffer."



From MAILER-DAEMON Sun Oct 14 00:50:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR4-0006Er-36
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR2-0006CZ-2T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPa-0005GT-BU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPZ-0005GA-Is
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
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@hcoop.net>) id 1IgvPY-00045q-RJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPX-0005Lt-8N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPX-0006qR-BF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPX-0006qR-BF@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Be more careful about the current
	buffer in erc-process-sentinel-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: Sun, 14 Oct 2007 04:50:40 -0000

commit 590370e8ff611b30868ba0e73127425729275abf
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 23:34:18 2007 -0400

    Be more careful about the current buffer in erc-process-sentinel-1
    
    * erc-backend.el (erc-process-sentinel-1): Take server buffer as an
      argument, so that we can make sure that it is current.  If it is
      deleted during a reconnect attempt, stop trying to reconnect.
      (erc-process-sentinel): Pass buffer to erc-process-sentinel-1.

diff --git a/ChangeLog b/ChangeLog
index 50b8dd4..b0dce79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 	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.  If it is deleted during
+	a reconnect attempt, stop trying to reconnect.
+	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
 
 	* 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
diff --git a/erc-backend.el b/erc-backend.el
index 75bef89..463bffa 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -610,39 +610,42 @@ EVENT is the message received from the closed connection process."
            ;; open-network-stream-nowait error for connection refused
            (not (string-match "^failed with code 111" event)))))
 
-(defun erc-process-sentinel-1 (event)
+(defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.
 Determine whether user has quit or whether erc has been terminated.
 Conditionally try to reconnect and take appropriate action."
-  (if erc-server-quitting
-      ;; normal quit
-      (progn
-        (erc-display-message nil 'error (current-buffer) 'finished)
-        (when erc-kill-server-buffer-on-quit
-          (set-buffer-modified-p nil)
-          (kill-buffer (current-buffer))))
-    ;; unexpected disconnect
-    (let ((again t))
-      (while again
-        (setq again nil)
-        (erc-display-message nil 'error (current-buffer)
-                             (if (erc-server-reconnect-p event)
-                                 'disconnected
-                               'disconnected-noreconnect))
-        (if (erc-server-reconnect-p event)
-            (condition-case err
-                (progn
-                  (setq erc-server-reconnecting nil)
-                  (erc-server-reconnect)
-                  (setq erc-server-reconnect-count 0))
-              (error (when (integerp erc-server-reconnect-attempts)
-                       (setq erc-server-reconnect-count
-                             (1+ erc-server-reconnect-count))
-                       (sit-for erc-server-reconnect-timeout)
-                       (setq again t))))
-          ;; terminate, do not reconnect
+  (with-current-buffer buffer
+    (if erc-server-quitting
+        ;; normal quit
+        (progn
+          (erc-display-message nil 'error (current-buffer) 'finished)
+          (when erc-kill-server-buffer-on-quit
+            (set-buffer-modified-p nil)
+            (kill-buffer (current-buffer))))
+      ;; unexpected disconnect
+      (let ((again t))
+        (while again
+          (setq again nil)
           (erc-display-message nil 'error (current-buffer)
-                               'terminated ?e event))))))
+                               (if (erc-server-reconnect-p event)
+                                   'disconnected
+                                 'disconnected-noreconnect))
+          (if (erc-server-reconnect-p event)
+              (condition-case err
+                  (progn
+                    (setq erc-server-reconnecting nil)
+                    (erc-server-reconnect)
+                    (setq erc-server-reconnect-count 0))
+                (error (when (buffer-live-p buffer)
+                         (set-buffer buffer)
+                         (when (integerp erc-server-reconnect-attempts)
+                           (setq erc-server-reconnect-count
+                                 (1+ erc-server-reconnect-count))
+                           (sit-for erc-server-reconnect-timeout)
+                           (setq again t)))))
+            ;; terminate, do not reconnect
+            (erc-display-message nil 'error (current-buffer)
+                                 'terminated ?e event)))))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."
@@ -669,7 +672,7 @@ Conditionally try to reconnect and take appropriate action."
         (delete-region (point) (point-max))
         ;; Decide what to do with the buffer
         ;; Restart if disconnected
-        (erc-process-sentinel-1 event)
+        (erc-process-sentinel-1 event buf)
         ;; Make sure we don't write to the buffer if it has been
         ;; killed
         (when (buffer-live-p buf)



From MAILER-DAEMON Sun Oct 14 00:50:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR4-0006FB-8n
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR2-0006DB-JJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPa-0005GY-B2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPZ-0005GC-J7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
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@hcoop.net>) id 1IgvPZ-00047a-5l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPX-0005M7-RR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPX-0006rR-Sx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPX-0006rR-Sx@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Split erc-process-sentinel-2 from
	erc-process-sentinel-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: Sun, 14 Oct 2007 04:50:41 -0000

commit a3dcacd0b817d6ca18d3b96ae04515535ca71e0c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 00:34:31 2007 -0400

    Split erc-process-sentinel-2 from erc-process-sentinel-1
    
    * erc-backend.el (erc-process-sentinel-2): New function split from
      erc-process-sentinel-1.

diff --git a/ChangeLog b/ChangeLog
index 38cfe66..1ad7eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
 	reconnect was not happening when erc-server-reconnect-attempts was
 	t.  Call erc-server-reconnect-p only once per loop iteration.
 	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
+	(erc-process-sentinel-2): New function split from
+	erc-process-sentinel-1.
 
 	* 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
diff --git a/erc-backend.el b/erc-backend.el
index 9e5279e..1f2fc0c 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -610,6 +610,36 @@ EVENT is the message received from the closed connection process."
            ;; open-network-stream-nowait error for connection refused
            (not (string-match "^failed with code 111" event)))))
 
+(defun erc-process-sentinel-2 (event buffer)
+  "Called when `erc-process-sentinel-1' has detected an unexpected disconnect."
+  (with-current-buffer buffer
+    (let ((again t)
+          reconnect-p)
+      (while again
+        (setq again nil)
+        (setq reconnect-p (erc-server-reconnect-p event))
+        (erc-display-message nil 'error (current-buffer)
+                             (if reconnect-p 'disconnected
+                               'disconnected-noreconnect))
+        (if reconnect-p
+            (condition-case err
+                (progn
+                  (setq erc-server-reconnecting nil)
+                  (erc-server-reconnect)
+                  (setq erc-server-reconnect-count 0))
+              (error (when (buffer-live-p buffer)
+                       (set-buffer buffer)
+                       (when (integerp erc-server-reconnect-attempts)
+                         (setq erc-server-reconnect-count
+                               (1+ erc-server-reconnect-count)))
+                       ;; TODO: Make this use a one-time timer
+                       ;; instead of sit-for
+                       (sit-for erc-server-reconnect-timeout)
+                       (setq again t))))
+          ;; terminate, do not reconnect
+          (erc-display-message nil 'error (current-buffer)
+                               'terminated ?e event))))))
+
 (defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.
 Determine whether user has quit or whether erc has been terminated.
@@ -623,32 +653,7 @@ Conditionally try to reconnect and take appropriate action."
             (set-buffer-modified-p nil)
             (kill-buffer (current-buffer))))
       ;; unexpected disconnect
-      (let ((again t)
-            reconnect-p)
-        (while again
-          (setq again nil)
-          (setq reconnect-p (erc-server-reconnect-p event))
-          (erc-display-message nil 'error (current-buffer)
-                               (if reconnect-p 'disconnected
-                                 'disconnected-noreconnect))
-          (if reconnect-p
-              (condition-case err
-                  (progn
-                    (setq erc-server-reconnecting nil)
-                    (erc-server-reconnect)
-                    (setq erc-server-reconnect-count 0))
-                (error (when (buffer-live-p buffer)
-                         (set-buffer buffer)
-                         (when (integerp erc-server-reconnect-attempts)
-                           (setq erc-server-reconnect-count
-                                 (1+ erc-server-reconnect-count)))
-                         ;; TODO: Make this use a one-time timer
-                         ;; instead of sit-for
-                         (sit-for erc-server-reconnect-timeout)
-                         (setq again t))))
-            ;; terminate, do not reconnect
-            (erc-display-message nil 'error (current-buffer)
-                                 'terminated ?e event)))))))
+      (erc-process-sentinel-2 event buffer))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."



From MAILER-DAEMON Sun Oct 14 00:50:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvOz-00053O-2M
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOX-0004jV-IW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOV-0004hW-IC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004h5-9L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003o1-Cj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOS-0004wR-0p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:00 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOS-00052c-3A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:00 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOS-00052c-3A@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:00 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:48:30 -0000

commit ae7af6667d21435aa00b79cae7e21220ce9f92e9
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Feb 10 22:07:11 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-109

diff --git a/erc.el b/erc.el
index 44bb402..0a47c60 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.804 $"
+(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.805 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:50:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR6-0006GW-I4
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR4-0006FY-Lw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvR3-0006Ee-Qj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP6-00053m-5o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
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@hcoop.net>) id 1IgvP5-0003zP-E5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP4-00059R-FL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:38 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP4-00064P-I4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:38 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP4-00064P-I4@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:38 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-menu: Turn this into a 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, 14 Oct 2007 04:50:43 -0000

commit 075c79c4fb39e1091776ca504c1112ed8df5ce99
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jan 7 03:49:14 2007 +0000

    erc-menu: Turn this into a module
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-78

diff --git a/ChangeLog b/ChangeLog
index 61b05c0..51ba380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2006-12-28  Michael Olson  <mwolson@gnu.org>
 
 	* erc-list.el: Change header to mention that this is part of ERC,
diff --git a/erc-menu.el b/erc-menu.el
index a2dc7a1..466ed23 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -28,7 +28,7 @@
 
 ;;; Code:
 
-;(require 'erc)
+(require 'erc)
 (require 'easymenu)
 
 (defvar erc-menu-definition
@@ -98,16 +98,46 @@
 	["Show ERC version" erc-version t])
   "ERC menu definition.")
 
-;; `erc-mode-map' must be defined before doing this
-(eval-after-load "erc"
-  '(progn
-     (easy-menu-define erc-menu erc-mode-map "ERC menu" erc-menu-definition)
-     (easy-menu-add erc-menu erc-mode-map)
+(defvar erc-menu-defined nil
+  "Internal variable used to keep track of whether we've defined the
+ERC menu yet.")
 
-     ;; for some reason the menu isn't automatically added to the menu bar
-     (when (featurep 'xemacs)
-       (add-hook 'erc-mode-hook
-		 (lambda () (easy-menu-add erc-menu erc-mode-map))))))
+;;;###autoload (autoload 'erc-menu-mode "erc-menu" nil t)
+(define-erc-module menu nil
+  "Enable a menu in ERC buffers."
+  ((unless erc-menu-defined
+     ;; make sure the menu only gets defined once, since Emacs 22
+     ;; activates it immediately
+     (easy-menu-define erc-menu erc-mode-map "ERC menu" erc-menu-definition)
+     (setq erc-menu-defined t))
+   (if (featurep 'xemacs)
+       (progn
+	 ;; the menu isn't automatically added to the menu bar in
+	 ;; XEmacs
+	 (add-hook 'erc-mode-hook 'erc-menu-add)
+	 (dolist (buffer (erc-buffer-list))
+	   (with-current-buffer buffer (erc-menu-add))))
+     (erc-menu-add)))
+  ((if (featurep 'xemacs)
+       (progn
+	 (remove-hook 'erc-mode-hook 'erc-menu-add)
+	 (dolist (buffer (erc-buffer-list))
+	   (with-current-buffer buffer (erc-menu-remove))))
+     (erc-menu-remove)
+     ;; `easy-menu-remove' is a no-op in Emacs 22
+     (message "You might have to restart Emacs to remove the ERC menu"))))
+
+;; silence byte-compiler warning
+(eval-when-compile
+  (defvar erc-menu nil))
+
+(defun erc-menu-add ()
+  "Add the ERC menu to the current buffer."
+  (easy-menu-add erc-menu erc-mode-map))
+
+(defun erc-menu-remove ()
+  "Remove the ERC menu from the current buffer."
+  (easy-menu-remove erc-menu))
 
 (provide 'erc-menu)
 
diff --git a/erc.el b/erc.el
index cd665e8..dd784c6 100644
--- a/erc.el
+++ b/erc.el
@@ -74,7 +74,6 @@
 (require 'pp)
 (require 'thingatpt)
 (require 'erc-compat)
-(require 'erc-menu)
 
 (defvar erc-official-location
   "http://emacswiki.org/cgi-bin/wiki/ERC (mailing list: erc-discuss@gnu.org)"
@@ -1784,7 +1783,7 @@ buffer rather than a server buffer.")
 
 (defcustom erc-modules '(netsplit fill button match track completion readonly
 				  ring autojoin noncommands irccontrols
-				  stamp list)
+				  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
@@ -1826,6 +1825,7 @@ removed from the list will be disabled."
     (const :tag "List channels in a separate buffer" list)
     (const :tag "Save buffers in logs" log)
     (const :tag "Highlight pals, fools, and other keywords" match)
+    (const :tag "Display a menu in ERC buffers" menu)
     (const :tag "Detect netsplits" netsplit)
     (const :tag "Don't display non-IRC commands after evaluation"
 	   noncommands)



From MAILER-DAEMON Sun Oct 14 00:50:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR6-0006Gj-Nt
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR5-0006G7-Fc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvR4-0006Fe-T7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP6-00053o-V1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
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@hcoop.net>) id 1IgvP6-000401-6a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP5-00059p-DB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP5-00065u-F1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP5-00065u-F1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:39 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Made lag time in header and
	mode-line optional.
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, 14 Oct 2007 04:50:43 -0000

commit 0c2f243b284120db9583d25ec54b72524d76721e
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Wed Jan 10 23:00:49 2007 +0000

    Made lag time in header and mode-line optional.
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-81

diff --git a/ChangeLog b/ChangeLog
index 4d6fe93..6dd5c87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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.
diff --git a/erc.el b/erc.el
index eea5064..a4fbbf2 100644
--- a/erc.el
+++ b/erc.el
@@ -5697,6 +5697,7 @@ of `mode-line-buffer-identification'.
 
 The following characters are replaced:
 %a: String indicating away status or \"\" if you are not away
+%l: The estimated lag time to the server
 %m: The modes of the channel
 %n: The current nick name
 %o: The topic of the channel
@@ -5708,9 +5709,9 @@ The following characters are replaced:
   :group 'erc-mode-line-and-header
   :type 'string)
 
-(defcustom erc-header-line-format "[IRC] %n on %t %m %o"
+(defcustom erc-header-line-format "%n on %t (%m,%l) %o"
   "A string to be formatted and shown in the header-line in `erc-mode'.
-Only used in Emacs 21.
+Only used starting in Emacs 21.
 
 See `erc-mode-line-format' for which characters are can be used."
   :group 'erc-mode-line-and-header
@@ -5798,31 +5799,33 @@ if `erc-away' is non-nil."
       "")))
 
 (defun erc-format-channel-modes ()
-  "Return the current channel's modes and the estimated lag."
-  (let ((lag (erc-with-server-buffer erc-server-lag)))
-    (concat (apply 'concat
-		   "(+" erc-channel-modes)
-	    (cond ((and erc-channel-user-limit erc-channel-key)
-		   (if erc-show-channel-key-p
-		       (format "lk %.0f %s" erc-channel-user-limit
-			       erc-channel-key)
-		     (format "kl %.0f" erc-channel-user-limit)))
-		  (erc-channel-user-limit
-		   ;; Emacs has no bignums
-		   (format "l %.0f" erc-channel-user-limit))
-		  (erc-channel-key
-		   (if erc-show-channel-key-p
-		       (format "k %s" erc-channel-key)
-		     "k"))
-		  (t ""))
-	    (if lag (format ",lag:%.0f" lag) "")
-	    ")")))
+  "Return the current channel's modes."
+  (concat (apply 'concat
+		 "+" erc-channel-modes)
+	  (cond ((and erc-channel-user-limit erc-channel-key)
+		 (if erc-show-channel-key-p
+		     (format "lk %.0f %s" erc-channel-user-limit
+			     erc-channel-key)
+		   (format "kl %.0f" erc-channel-user-limit)))
+		(erc-channel-user-limit
+		 ;; Emacs has no bignums
+		 (format "l %.0f" erc-channel-user-limit))
+		(erc-channel-key
+		 (if erc-show-channel-key-p
+		     (format "k %s" erc-channel-key)
+		   "k"))
+		(t nil))))
+
+(defun erc-format-lag-time ()
+  "Return the estimated lag time to server, `erc-server-lag'."
+  (format "lag:%.0f" (erc-with-server-buffer erc-server-lag)))
 
 (defun erc-update-mode-line-buffer (buffer)
   "Update the mode line in a single ERC buffer BUFFER."
   (with-current-buffer buffer
     (let ((spec (format-spec-make
 		 ?a (erc-format-away-status)
+		 ?l (erc-format-lag-time)
 		 ?m (erc-format-channel-modes)
 		 ?n (or (erc-current-nick) "")
 		 ?o (erc-controls-strip erc-channel-topic)



From MAILER-DAEMON Sun Oct 14 00:50:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvR9-0006Io-WB
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPz-0005Yu-VB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPw-0005WB-86
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPv-0005VL-Nv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
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@hcoop.net>) id 1IgvPv-0004F4-EK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPu-0005Tu-LX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPu-0007UD-OM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPu-0007UD-OM@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:30 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] C-u C-c C-j prompts for channel key.
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, 14 Oct 2007 04:50:46 -0000

commit ea0904af187c052913068e4ace41f6c75911f6bc
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Fri Oct 12 17:32:58 2007 +0200

    C-u C-c C-j prompts for channel key.
    
    * erc.el (erc-join-channel): Prompt for channel key if C-u or
    another prefix-arg was typed.
    
    * NEWS: Noted this change.

diff --git a/ChangeLog b/ChangeLog
index 285c045..c8a7c99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/NEWS b/NEWS
index 483c8b3..991bfe1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ It requires the tls.el library.
 ** The function `erc-ssl' will now always use ssl.el, even in the version
 of ERC that comes with Emacs.
 
+** Type `C-u' before `C-c C-j' to prompt for a channel key
+`erc-join-channel' now accepts a prefix-argument to prompt for the key
+when channels are protected by keywords.
+
 ** Changes and additions to modules
 
 *** Channel tracking (erc-track.el)
diff --git a/erc.el b/erc.el
index 6957e3d..18efee6 100644
--- a/erc.el
+++ b/erc.el
@@ -3676,7 +3676,7 @@ If `point' is at the beginning of a channel name, use that as default."
 		   (set-buffer (process-buffer erc-server-process))
 		   erc-channel-list)))
       (completing-read "Join channel: " table nil nil nil nil chnl))
-    (when erc-prompt-for-channel-key
+    (when (or current-prefix-arg erc-prompt-for-channel-key)
       (read-from-minibuffer "Channel key (RET for none): " nil))))
   (erc-cmd-JOIN channel (when (>= (length key) 1) key)))
 



From MAILER-DAEMON Sun Oct 14 00:50:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRB-0006JU-9J
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR9-0006IQ-CW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvR8-0006I0-Nz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOz-00053P-35
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
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@hcoop.net>) id 1IgvOy-0003yh-SZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOy-00057Y-7Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOy-0005ut-9r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOy-0005ut-9r@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:32 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Save buffers to logs before
	exiting 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: Sun, 14 Oct 2007 04:50:47 -0000

commit c9e946d857d70da25bbfa35bc38945ede3b80931
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Nov 12 05:34:58 2006 +0000

    erc-log: Save buffers to logs before exiting Emacs
    
    2006-11-12  Michael Olson  <mwolson@gnu.org>
    
    	* erc-log.el: Save all log buffers when Emacs exits, in case
    	someone ignores the warning about open processes.  Remove the
    	advice code in the commentary.
    	(erc-save-query-buffers): Docfix.
    	(erc-log-save-all-buffers): New function that saves all ERC
    	buffers to logs.
    	(erc-current-logfile): Fix bug in filename selection, where the
    	current buffer was erroneously being preferred over the given
    	buffer.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-59

diff --git a/ChangeLog b/ChangeLog
index b79043d..e665922 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-12  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el: Save all log buffers when Emacs exits, in case
+	someone ignores the warning about open processes.  Remove the
+	advice code in the commentary.
+	(erc-save-query-buffers): Docfix.
+	(erc-log-save-all-buffers): New function that saves all ERC
+	buffers to logs.
+	(erc-current-logfile): Fix bug in filename selection, where the
+	current buffer was erroneously being preferred over the given
+	buffer.
+
 2006-11-08  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-string-to-port): Avoid error when a numerical port
diff --git a/erc-log.el b/erc-log.el
index 0124219..e548645 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -43,14 +43,6 @@
 ;;
 ;; (require 'erc-log)
 ;;
-;; You may optionally want the following code, to save all ERC buffers
-;; without confirmation when exiting emacs:
-;;
-;; (defadvice save-buffers-kill-emacs (before save-logs (&rest args) activate)
-;;  (save-some-buffers t (lambda ()
-;;                         (when (and (eq major-mode 'erc-mode)
-;;                                    (not (null buffer-file-name))) t))))
-;;
 ;; If you only want to save logs for some buffers, customise the
 ;; variable `erc-enable-logging'.
 
@@ -213,6 +205,7 @@ also be a predicate function. To only log when you are not set away, use:
      (add-hook 'erc-send-post-hook 'erc-save-buffer-in-logs))
    (add-hook 'erc-kill-buffer-hook 'erc-save-buffer-in-logs)
    (add-hook 'erc-kill-channel-hook 'erc-save-buffer-in-logs)
+   (add-hook 'kill-emacs-hook 'erc-log-save-all-buffers)
    (add-hook 'erc-quit-hook 'erc-conditional-save-queries)
    (add-hook 'erc-part-hook 'erc-conditional-save-buffer)
    ;; append, so that 'erc-initialize-log-marker runs first
@@ -224,6 +217,7 @@ also be a predicate function. To only log when you are not set away, use:
    (remove-hook 'erc-send-post-hook 'erc-save-buffer-in-logs)
    (remove-hook 'erc-kill-buffer-hook 'erc-save-buffer-in-logs)
    (remove-hook 'erc-kill-channel-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'kill-emacs-hook 'erc-log-save-all-buffers)
    (remove-hook 'erc-quit-hook 'erc-conditional-save-queries)
    (remove-hook 'erc-part-hook 'erc-conditional-save-buffer)
    (remove-hook 'erc-connect-pre-hook 'erc-log-setup-logging)
@@ -270,7 +264,7 @@ Returns nil iff `erc-server-buffer-p' returns t."
       (not (erc-server-buffer-p)))))
 
 (defun erc-save-query-buffers (process)
-  "Save all buffers process."
+  "Save all buffers of the given PROCESS."
   (erc-with-all-buffers-of-server process
 				  nil
 				  (erc-save-buffer-in-logs)))
@@ -285,6 +279,13 @@ Returns nil iff `erc-server-buffer-p' returns t."
   (when erc-save-queries-on-quit
     (erc-save-query-buffers process)))
 
+;; Make sure that logs get saved, even if someone overrides the active
+;; process prompt for a quick exit from Emacs
+(defun erc-log-save-all-buffers ()
+  (dolist (buffer (erc-buffer-filter #'(lambda ()
+					 (not (erc-server-buffer-p)))))
+    (erc-save-buffer-in-logs buffer)))
+
 ;;;###autoload
 (defun erc-logging-enabled (&optional buffer)
   "Return non-nil if logging is enabled for BUFFER.
@@ -316,7 +317,7 @@ The result is converted to lowercase, as IRC is case-insensitive"
    (erc-log-standardize-name
     (funcall erc-generate-log-file-name-function
 	     (or buffer (current-buffer))
-	     (or (erc-default-target) (buffer-name buffer))
+	     (or (buffer-name buffer) (erc-default-target))
 	     (erc-current-nick)
 	     erc-session-server erc-session-port))
    erc-log-channels-directory))



From MAILER-DAEMON Sun Oct 14 00:50:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRC-0006Kw-F8
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPz-0005Yy-UD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPu-0005UR-Vh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPt-0005TP-Pq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
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@hcoop.net>) id 1IgvPt-0004Eb-KB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPs-0005TK-Tb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPs-0007RA-Vs
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPs-0007RA-Vs@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:28 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Minor ChangeLog consistency tweak
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, 14 Oct 2007 04:50:49 -0000

commit 9dd9f1ceb2e7803bfc70b24435105c2846e60320
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Sep 18 23:17:13 2007 -0400

    Minor ChangeLog consistency tweak

diff --git a/ChangeLog b/ChangeLog
index 9b310b8..f2ea5f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@
 	* 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>
+2007-09-11  Exal de Jesus Garcia Carrillo  <exal@gnu.org>
 
 	* erc-sound.el: Fix typo in setting up instructions.
 



From MAILER-DAEMON Sun Oct 14 00:50:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRD-0006MU-Mv
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRC-0006Ki-7H
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRB-0006K1-Ln
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP6-00053n-6B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
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@hcoop.net>) id 1IgvP5-0003zF-Dz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP4-00059X-Q2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:38 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP4-00064u-SI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:38 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP4-00064u-SI@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:38 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] New option: erc-system-name
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, 14 Oct 2007 04:50:50 -0000

commit 2ca553a033aeb36764148398018e84718367df2a
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Jan 9 07:00:17 2007 +0000

    New option: erc-system-name
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-79

diff --git a/ChangeLog b/ChangeLog
index 51ba380..ade1625 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/erc.el b/erc.el
index dd784c6..69fdc83 100644
--- a/erc.el
+++ b/erc.el
@@ -790,6 +790,13 @@ set if some hacker is trying to flood you away."
   :group 'erc
   :type 'string)
 
+(defcustom erc-system-name nil
+  "Use this as the name of your system.
+If nil, ERC will call `system-name' to get this information."
+  :group 'erc
+  :type '(choice (const :tag "Default system name" nil)
+		 string))
+
 (defcustom erc-ignore-list nil
   "*List of regexps matching user identifiers to ignore.
 
@@ -5441,7 +5448,7 @@ user input."
   (erc-log (format "login: nick: %s, user: %s %s %s :%s"
 		   (erc-current-nick)
 		   (user-login-name)
-		   (system-name)
+		   (or erc-system-name (system-name))
 		   erc-session-server
 		   erc-session-user-full-name))
   (if erc-session-password



From MAILER-DAEMON Sun Oct 14 00:50:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRH-0006Qb-RM
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRF-0006Oc-UM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005EA-78
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005Do-Tk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPS-00045q-OG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPP-0005Hl-Aj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPP-0006cw-Cj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPP-0006cw-Cj@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:59 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Allow log files to be
	placed in different directories
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, 14 Oct 2007 04:50:54 -0000

commit cd6850136d8cf656b05bcff333e5f6533d32d87e
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 15 03:51:03 2007 +0000

    erc-log: Allow log files to be placed in different directories
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-140

diff --git a/ChangeLog b/ChangeLog
index cb0fd66..157824b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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
diff --git a/erc-log.el b/erc-log.el
index 9801192..e3df528 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -99,15 +99,19 @@ The function must take five arguments: BUFFER, TARGET, NICK, SERVER and PORT.
 BUFFER is the buffer to be saved,
 TARGET is the name of the channel, or the target of the query,
 NICK is the current nick,
-SERVER and PORT are the parameters used to connect BUFFERs
-`erc-server-process'."
+SERVER and PORT are the parameters that were used to connect to BUFFERs
+`erc-server-process'.
+
+If you want to write logs into different directories, make a
+custom function which returns the directory part and set
+`erc-log-channels-directory' to its name."
   :group 'erc-log
   :type '(choice (const :tag "Long style" erc-generate-log-file-name-long)
 		 (const :tag "Long, but with network name rather than server"
 			erc-generate-log-file-name-network)
 		 (const :tag "Short" erc-generate-log-file-name-short)
 		 (const :tag "With date" erc-generate-log-file-name-with-date)
-		 (symbol :tag "Other function")))
+		 (function :tag "Other function")))
 
 (defcustom erc-truncate-buffer-on-save nil
   "Truncate any ERC (channel, query, server) buffer when it is saved."
@@ -134,10 +138,16 @@ Log files are stored in `erc-log-channels-directory'."
   "The directory to place log files for channels.
 Leave blank to disable logging.  If not nil, all the channel
 buffers are logged in separate files in that directory.  The
-directory should not end with a trailing slash."
+directory should not end with a trailing slash.
+
+If this is the name of a function, the function will be called
+with the buffer, target, nick, server, and port arguments.  See
+`erc-generate-log-file-name-function' for a description of these
+arguments."
   :group 'erc-log
   :type '(choice directory
-		 (const nil)))
+		 (function "Function")
+		 (const :tag "Disable logging" nil)))
 
 (defcustom erc-log-insert-log-on-open nil
   "*Insert log file contents into the buffer if a log file exists."
@@ -316,14 +326,19 @@ filename is downcased."
 If BUFFER is nil, the value of `current-buffer' is used.
 This is determined by `erc-generate-log-file-name-function'.
 The result is converted to lowercase, as IRC is case-insensitive"
-  (expand-file-name
-   (erc-log-standardize-name
-    (funcall erc-generate-log-file-name-function
-	     (or buffer (current-buffer))
-	     (or (buffer-name buffer) (erc-default-target))
-	     (erc-current-nick)
-	     erc-session-server erc-session-port))
-   erc-log-channels-directory))
+  (unless buffer (setq buffer (current-buffer)))
+  (let ((target (or (buffer-name buffer) (erc-default-target)))
+	(nick (erc-current-nick))
+	(server erc-session-server)
+	(port erc-session-port))
+    (expand-file-name
+     (erc-log-standardize-name
+      (funcall erc-generate-log-file-name-function
+	       buffer target nick server port))
+     (if (functionp erc-log-channels-directory)
+	 (funcall erc-log-channels-directory
+		  buffer target nick server port)
+       erc-log-channels-directory))))
 
 (defun erc-generate-log-file-name-with-date (buffer &rest ignore)
   "This function computes a short log file name.



From MAILER-DAEMON Sun Oct 14 00:50:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRI-0006Qo-0p
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRG-0006P6-9q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005EZ-Ba
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005E3-0o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPW-00045k-UG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPW-0005L1-0m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPW-0006oR-2w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPW-0006oR-2w@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Relicense erc-list.el to GPLv3
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, 14 Oct 2007 04:50:54 -0000

commit b7582b87c8d9e699025d30da2b9dedcd1563c7da
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jul 29 19:02:26 2007 +0000

    Relicense erc-list.el to GPLv3
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-159

diff --git a/ChangeLog b/ChangeLog
index 7480e79..79e5f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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):
diff --git a/erc-list.el b/erc-list.el
index 5f1ed05..9cd16ed 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,



From MAILER-DAEMON Sun Oct 14 00:50:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRB-0006JL-4u
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPz-0005Yw-OX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPw-0005Uj-AC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPu-0005U4-Ky
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
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@hcoop.net>) id 1IgvPu-0004Eo-FQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPt-0005Tc-P9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPt-0007Sg-R4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPt-0007Sg-R4@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:29 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] erc-log: Fix bug with XEmacs and both
	viewing a log and writing to it
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, 14 Oct 2007 04:50:47 -0000

commit 34e36a2be6750a904f0e22be3620ec75296ec8de
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 30 13:33:30 2007 -0400

    erc-log: Fix bug with XEmacs and both viewing a log and writing to it
    
    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.

diff --git a/CREDITS b/CREDITS
index 37ba59a..d14a9a6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -167,6 +167,9 @@ Ivan Kanis <apple AT kanis DOT eu>:
 Exal de Jesus Garcia Carrillo  <exal AT gmx DOT de>:
   * Fixed some typos in the documentation.
 
+Aidan Kehoe  <kehoea AT parhasard DOT net>:
+  * Fixed a bug with log buffers in XEmacs in erc-log.el (1 line changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index fec7357..a63508b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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@gmx.de>  (tiny change)
 
 	* erc.texi (Special-Features): Fix small typo.
diff --git a/erc-log.el b/erc-log.el
index 1733b3d..7ea3c63 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -415,7 +415,8 @@ You can save every individual message by putting this function on
   (or buffer (setq buffer (current-buffer)))
   (when (erc-logging-enabled buffer)
     (let ((file (erc-current-logfile buffer))
-	  (coding-system erc-log-file-coding-system))
+	  (coding-system erc-log-file-coding-system)
+	  (inhibit-clash-detection t))	; needed for XEmacs
       (save-excursion
 	(with-current-buffer buffer
 	  (save-restriction



From MAILER-DAEMON Sun Oct 14 00:50:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRJ-0006Rr-8p
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRH-0006Pq-24
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005Dk-8v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005DG-GE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPW-00045m-OM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPV-0005Kv-OE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPV-0006nw-Q7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPV-0006nw-Q7@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:05 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Display message or trigger error
	depending on debug-on-error
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, 14 Oct 2007 04:50:55 -0000

commit ddcd521e176efb3ea9fb18a8b8dc121cec7757f6
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Jul 13 02:33:55 2007 +0000

    Display message or trigger error depending on debug-on-error
    
    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-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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-158

diff --git a/ChangeLog b/ChangeLog
index 379d66b..7480e79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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.
@@ -10,6 +15,9 @@
 	(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>
 
diff --git a/erc-goodies.el b/erc-goodies.el
index 064c742..c92c33d 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -281,10 +281,8 @@ The value `erc-interpret-controls-p' must also be t for this to work."
   "Fetches the right face for background color N (0-15)."
   (if (stringp n) (setq n (string-to-number n)))
   (if (not (numberp n))
-      (progn
-        (message "erc-get-bg-color-face: n is NaN: %S" n)
-        (beep)
-        'default)
+      (prog1 'default
+        (erc-error "erc-get-bg-color-face: n is NaN: %S" n))
     (when (> n 16)
       (erc-log (format "   Wrong color: %s" n))
       (setq n (mod n 16)))
@@ -297,10 +295,8 @@ The value `erc-interpret-controls-p' must also be t for this to work."
   "Fetches the right face for foreground color N (0-15)."
   (if (stringp n) (setq n (string-to-number n)))
   (if (not (numberp n))
-      (progn
-        (message "erc-get-fg-color-face: n is NaN: %S" n)
-        (beep)
-        'default)
+      (prog1 'default
+        (erc-error "erc-get-fg-color-face: n is NaN: %S" n))
     (when (> n 16)
       (erc-log (format "   Wrong color: %s" n))
       (setq n (mod n 16)))
diff --git a/erc-sound.el b/erc-sound.el
index 4d3d792..d02887a 100644
--- a/erc-sound.el
+++ b/erc-sound.el
@@ -125,7 +125,7 @@ See also `play-sound-file'."
     (if (and (not filepath) erc-default-sound)
 	(setq filepath erc-default-sound))
     (cond ((and filepath (file-exists-p filepath))
-           (play-sound-file filepath))
+	   (play-sound-file filepath))
 	  (t (beep)))
     (erc-log (format "Playing sound file %S" filepath))))
 
@@ -142,5 +142,11 @@ See also `play-sound-file'."
 
 (provide 'erc-sound)
 
-;; arch-tag: 53657d1d-007f-4a20-91c1-588e71cf0cee
 ;;; erc-sound.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: 53657d1d-007f-4a20-91c1-588e71cf0cee
diff --git a/erc.el b/erc.el
index 9fcf119..324a820 100644
--- a/erc.el
+++ b/erc.el
@@ -2189,6 +2189,17 @@ BUFFER.  HOST and PORT specify the connection target."
 		 nil))
     (open-tls-stream name buffer host port)))
 
+;;; Displaying error messages
+
+(defun erc-error (&rest args)
+  "Pass ARGS to `format', and display the result as an error message.
+If `debug-on-error' is set to non-nil, then throw a real error with this
+message instead, to make debugging easier."
+  (if debug-on-error
+      (apply #'error args)
+    (apply #'message args)
+    (beep)))
+
 ;;; Debugging the protocol
 
 (defvar erc-debug-irc-protocol nil
@@ -3264,8 +3275,7 @@ the message given by REASON."
   (condition-case nil
       (erc :server server :nick (erc-current-nick))
     (error
-     (message "Cannot find host %s." server)
-     (beep)))
+     (erc-error "Cannot find host %s." server)))
   t)
 (put 'erc-cmd-SERVER 'process-not-needed t)
 
@@ -4965,17 +4975,13 @@ Specifically, return the position of `erc-insert-marker'."
   (save-restriction
     (widen)
     (if (< (point) (erc-beg-of-input-line))
-	(progn
-	  (message "Point is not in the input area")
-	  (beep))
+	(erc-error "Point is not in the input area")
       (let ((inhibit-read-only t)
 	    (str (erc-user-input))
 	    (old-buf (current-buffer)))
 	(if (and (not (erc-server-buffer-live-p))
 		 (not (erc-command-no-process-p str)))
-	    (progn
-	      (message "ERC: No process running")
-	      (beep))
+	    (erc-error "ERC: No process running")
 	  (erc-set-active-buffer (current-buffer))
 
 	  ;; Kill the input and the prompt



From MAILER-DAEMON Sun Oct 14 00:50:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRJ-0006SC-JN
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRH-0006QG-Hj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005Ee-BA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005DH-GG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPT-00045n-74
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPR-0005Ih-J3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPR-0006gw-Ku
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPR-0006gw-Ku@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.2
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, 14 Oct 2007 04:50:55 -0000

commit f336373d97d8ad8439c3d5111672879151dd17ea
Merge: 94c171a... 3d13c20...
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon May 21 01:05:22 2007 +0000

    Merged from erc--rel--5.2
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.2--patch-19
       Make an ELPA package for ERC
    
     * erc@sv.gnu.org/erc--rel--5.2--patch-20
       Makefile: Improve Debian package building
    
     * erc@sv.gnu.org/erc--rel--5.2--patch-21
       erc-nicklist: Use locate-library to find images dir
    
     * erc@sv.gnu.org/erc--rel--5.2--patch-22
       Include erc-nicklist.el and images in extras tarball
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-144

diff --cc ChangeLog
index efe62c4,ef243df..514a73b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,41 -1,27 +1,65 @@@
+ 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.



From MAILER-DAEMON Sun Oct 14 00:51:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRN-0006Uz-LE
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRI-0006Qg-0t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005F3-NO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005E5-3x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPV-00045e-Tc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPS-0005JK-GJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPS-0006iQ-I2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPS-0006iQ-I2@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:02 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix bug in
	erc-toggle-debug-irc-protocol
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, 14 Oct 2007 04:50:56 -0000

commit 634d4fd5b3894ab5b8aaf8e9c119ee7af30150f3
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jun 3 21:29:53 2007 +0000

    Fix bug in erc-toggle-debug-irc-protocol
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-147

diff --git a/ChangeLog b/ChangeLog
index ebe438a..ea0786e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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
diff --git a/erc-compat.el b/erc-compat.el
index dc36820..58afcb0 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -154,11 +154,21 @@ See `erc-encoding-coding-alist'."
 
 ;; But note Emacs view-mode: (view-mode &optional ARG)
 
-(defalias 'erc-view-mode-enter
-  (if (and (fboundp 'view-mode)
-	   (not (fboundp 'view-mode-enter)))
-      'view-mode
-    'view-mode-enter))
+(defun erc-view-mode-enter (&optional return-to exit-action)
+  "Enter View mode.
+See either `view-mode-enter' (if using Emacs)
+or `view-mode' (if using XEmacs)
+to determine what the arguments accomplish.
+
+If we cannot find a suitable way of passing the arguments, we
+default to just entering View mode."
+  (cond ((fboundp 'view-mode-enter)
+	 (view-mode-enter return-to exit-action))
+	((featurep 'xemacs)
+	 (condition-case nil
+	     (view-mode return-to exit-action)
+	   (view-mode 1)))
+	(t nil)))
 
 ;; if we're in emacs21 CVS, we use help-function-arglist which is more
 ;; sophisticated and can handle subrs, etc
diff --git a/erc.el b/erc.el
index fce4b9a..08cda2e 100644
--- a/erc.el
+++ b/erc.el
@@ -2230,7 +2230,7 @@ If ARG is non-nil, show the *erc-protocol* buffer."
   (interactive "P")
   (let* ((buf (get-buffer-create "*erc-protocol*")))
     (with-current-buffer buf
-      (erc-view-mode-enter 1)
+      (erc-view-mode-enter)
       (when (null (current-local-map))
 	(let ((inhibit-read-only t))
 	  (insert (erc-make-notice "This buffer displays all IRC protocol traffic exchanged with each server.\n"))



From MAILER-DAEMON Sun Oct 14 00:51:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRO-0006VG-1q
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRJ-0006Ri-16
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRI-0006Qj-1c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOt-000514-OC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
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@hcoop.net>) id 1IgvOt-0003x9-Ae
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOs-00055k-JU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOs-0005mL-L2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOs-0005mL-L2@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:26 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Don't attempt to reconnect if user
	is banned from 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: Sun, 14 Oct 2007 04:50:57 -0000

commit 84e1cb87d7ee5eb3e58b616294c20aea9e842b07
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Mon Aug 14 16:43:32 2006 +0000

    Don't attempt to reconnect if user is banned from server.
    
    * erc-backend.el (erc-server-banned): New variable.
    (erc-server-connect): Set `erc-server-banned' to nil.
    (erc-process-sentinel-1): Use `erc-server-reconnect-p'.
    (erc-server-reconnect-p): New function.  Return non-nil if the
    user wants automatic reconnects and if the user has not been
    banned from the server.  This should fix a bug where ERC gets into
    a loop trying to reconnect with no way to stop it when the user is
    denied access to the server due to a server ban.  It might also
    help when Tor users are blocked from freenode if freenode servers
    send the 465 message before disconnecting.
    (465): Handle "banned from server" error notices.
    
    * ChangeLog: Added changes.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-42

diff --git a/ChangeLog b/ChangeLog
index c9b852a..83edaed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-08-14  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (erc-server-banned): New variable.
+	(erc-server-connect): Set `erc-server-banned' to nil.
+	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
+	(erc-server-reconnect-p): New function.  Return non-nil if the
+	user wants automatic reconnects and if the user has not been
+	banned from the server.  This should fix a bug where ERC gets into
+	a loop trying to reconnect with no way to stop it when the user is
+	denied access to the server due to a server ban.  It might also
+	help when Tor users are blocked from freenode if freenode servers
+	send the 465 message before disconnecting.
+	(465): Handle "banned from server" error notices.
+
 2006-08-13  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-server-timed-out): New variable that
diff --git a/erc-backend.el b/erc-backend.el
index a4a038b..3ce2600 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -190,6 +190,10 @@ This variable is buffer-local.")
   "Non-nil if the IRC server failed to respond to a ping.")
 (make-variable-buffer-local 'erc-server-timed-out)
 
+(defvar erc-server-banned nil
+  "Non-nil if the user is denied access because of a server ban.")
+(make-variable-buffer-local 'erc-server-banned)
+
 (defvar erc-server-lines-sent nil
   "Line counter.")
 (make-variable-buffer-local 'erc-server-lines-sent)
@@ -463,6 +467,7 @@ We will store server variables in the current buffer."
   ;; Misc server variables
   (setq erc-server-quitting nil)
   (setq erc-server-timed-out nil)
+  (setq erc-server-banned nil)
   (let ((time (erc-current-time)))
     (setq erc-server-last-sent-time time)
     (setq erc-server-last-ping-time time)
@@ -531,14 +536,14 @@ action."
           (kill-buffer (current-buffer))))
     ;; unexpected disconnect
     (erc-display-message nil 'error (current-buffer)
-                         (if erc-server-auto-reconnect
+                         (if (erc-server-reconnect-p)
                              'disconnected
                            'disconnected-noreconnect))
     (erc-update-mode-line)
     (erc-set-active-buffer (current-buffer))
     (setq erc-server-last-sent-time 0)
     (setq erc-server-lines-sent 0)
-    (if (and erc-server-auto-reconnect
+    (if (and (erc-server-reconnect-p)
              (or erc-server-timed-out
                  (not (string-match "^deleted" event)))
              ;; open-network-stream-nowait error for connection refused
@@ -551,6 +556,10 @@ action."
       (erc-display-message nil 'error (current-buffer)
                            'terminated ?e event))))
 
+(defun erc-server-reconnect-p ()
+  "Return non-nil if ERC should attempt to reconnect automatically."
+  (and erc-server-auto-reconnect (not erc-server-banned)))
+
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."
   (with-current-buffer (process-buffer cproc)
@@ -1736,6 +1745,14 @@ See `erc-display-server-message'." nil
                        ?c (second (erc-response.command-args parsed))
                        ?m (erc-response.contents parsed)))
 
+(define-erc-response-handler (465)
+  "You are banned from this server." nil
+  (setq erc-server-banned t)
+  ;; show the server's message, as a reason might be provided
+  (erc-display-error-notice
+   parsed
+   (erc-response.contents parsed)))
+
 (define-erc-response-handler (474)
   "Banned from channel errors" nil
   (erc-display-message parsed '(notice error) nil
@@ -1769,7 +1786,7 @@ See `erc-display-server-message'." nil
     (erc-display-message parsed '(error notice) 'active 's482
                          ?c channel ?m message)))
 
-(define-erc-response-handler (431 445 446 451 462 463 464 465 481 483 484 485
+(define-erc-response-handler (431 445 446 451 462 463 464 481 483 484 485
                                   491 501 502)
   ;; 431 - No nickname given
   ;; 445 - SUMMON has been disabled
@@ -1778,7 +1795,6 @@ See `erc-display-server-message'." nil
   ;; 462 - Unauthorized command (already registered)
   ;; 463 - Your host isn't among the privileged
   ;; 464 - Password incorrect
-  ;; 465 - You are banned from this server
   ;; 481 - Need IRCop privileges
   ;; 483 - You can't kill a server!
   ;; 484 - Your connection is restricted!



From MAILER-DAEMON Sun Oct 14 00:51:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRN-0006V7-VF
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRI-0006RX-Nx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005EO-EZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Dr-1O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPT-00045S-B0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPR-0005IY-8j
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPR-0006gR-BN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPR-0006gR-BN@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Include erc-nicklist.el and images
	in extras tarball
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, 14 Oct 2007 04:50:57 -0000

commit 3d13c20b2cdb89aac014e46119bb1b2c8119b671
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon May 21 00:52:38 2007 +0000

    Include erc-nicklist.el and images in extras tarball
    
    2007-05-21  Michael Olson  <mwolson@gnu.org>
    
    	* Makefile (EXTRAS): Add erc-nicklist.el, since it is not
            release-quality.
    	(extras): Copy images directory.
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-22

diff --git a/ChangeLog b/ChangeLog
index 8c304d3..ef243df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
 	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
diff --git a/Makefile b/Makefile
index 1f1d354..ca4ce8a 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-speak.el \
-		 README.extras COPYING
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-nicklist.el \
+		erc-speak.el README.extras COPYING
 
 ALLSOURCE = $(wildcard *.el)
 SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED) erc-pkg.el, $(ALLSOURCE))
@@ -139,6 +139,11 @@ extras:
 	-rm -Rf ../$(SNAPDIR)-extras
 	mkdir ../$(SNAPDIR)-extras && chmod 0755 ../$(SNAPDIR)-extras
 	cp $(EXTRAS) ../$(SNAPDIR)-extras
+	cp -r images ../$(SNAPDIR)-extras
+	test -d ../$(SNAPDIR)-extras/images/CVS && \
+	  rm -R ../$(SNAPDIR)-extras/images/CVS || :
+	test -d ../$(SNAPDIR)-extras/images/.arch-ids && \
+	  rm -R ../$(SNAPDIR)-extras/images/.arch-ids || :
 	(cd .. && tar czf erc-$(VERSION)-extras.tar.gz $(SNAPDIR)-extras/*; \
 	  zip -r erc-$(VERSION)-extras.zip $(SNAPDIR)-extras)
 



From MAILER-DAEMON Sun Oct 14 00:51:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRO-0006VO-52
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRJ-0006SF-Jp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005ET-C0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005E2-0m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPV-00045S-KP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPS-0005JS-Oo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPS-0006iv-R6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPS-0006iv-R6@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:02 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Fix bug when
	erc-log-channels-directory is a function
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, 14 Oct 2007 04:50:58 -0000

commit fd07e85027b187c4bf1472d93db56b610315d1d3
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jun 10 19:25:27 2007 +0000

    erc-log: Fix bug when erc-log-channels-directory is a function
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-148

diff --git a/ChangeLog b/ChangeLog
index ea0786e..0f6f03f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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-03  Michael Olson  <mwolson@gnu.org>
 
 	* erc-compat.el (erc-view-mode-enter): Make this its own function,
diff --git a/erc-log.el b/erc-log.el
index e3df528..c86ba60 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -307,7 +307,8 @@ Logging is enabled if `erc-log-channels-directory' is non-nil, the directory
 is writeable (it will be created as necessary) and
 `erc-enable-logging' returns a non-nil value."
   (and erc-log-channels-directory
-       (erc-directory-writable-p erc-log-channels-directory)
+       (or (functionp erc-log-channels-directory)
+	   (erc-directory-writable-p erc-log-channels-directory))
        (if (functionp erc-enable-logging)
 	   (funcall erc-enable-logging (or buffer (current-buffer)))
 	 erc-enable-logging)))



From MAILER-DAEMON Sun Oct 14 00:51:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRO-0006Vs-Hm
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRL-0006Tm-FX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPe-0005ID-3k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPc-0005IA-Bk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
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@hcoop.net>) id 1IgvPc-00048k-5g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPb-0005NT-FW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPb-0006xY-Gl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPb-0006xY-Gl@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:11 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make erc-default-port an integer
	rather than a string
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, 14 Oct 2007 04:50:59 -0000

commit ed82eb9ce65da6f605efc36d97f561983ea40204
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 2 21:33:12 2007 -0400

    Make erc-default-port an integer rather than a string
    
    * erc.el (erc-default-port): Make this an integer value rather than a
      string.  Thanks to Luca Capello for the report.

diff --git a/ChangeLog b/ChangeLog
index f9594d8..f62931f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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,
diff --git a/erc.el b/erc.el
index 2c931d8..325e2d9 100644
--- a/erc.el
+++ b/erc.el
@@ -1461,7 +1461,7 @@ Turning on `erc-mode' runs the hook `erc-mode-hook'."
 (defconst erc-default-server "irc.freenode.net"
   "IRC server to use if it cannot be detected otherwise.")
 
-(defconst erc-default-port "6667"
+(defconst erc-default-port 6667
   "IRC port to use if it cannot be detected otherwise.")
 
 (defcustom erc-join-buffer 'buffer



From MAILER-DAEMON Sun Oct 14 00:51:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRO-0006Vh-CY
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRL-0006TS-0u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPe-0005Gm-49
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPZ-0005GH-OR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
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@hcoop.net>) id 1IgvPZ-00047c-7k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPY-0005MA-3Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPY-0006ry-6w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPY-0006ry-6w@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:08 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Use better algorithm for enforcing a
	timeout between reconnect attempts
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, 14 Oct 2007 04:50:59 -0000

commit 4bb22757c7656407b0c076d481a88c59cf2cd443
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 00:54:32 2007 -0400

    Use better algorithm for enforcing a timeout between reconnect attempts
    
    * erc-backend.el (erc-process-sentinel-2): 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 integer.

diff --git a/ChangeLog b/ChangeLog
index 1ad7eb7..b957b34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,13 +6,19 @@
 	/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.  If it 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 per loop iteration.
+	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.
+	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 integer.
 
 	* 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
diff --git a/erc-backend.el b/erc-backend.el
index 1f2fc0c..f4c87e2 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -612,33 +612,36 @@ EVENT is the message received from the closed connection process."
 
 (defun erc-process-sentinel-2 (event buffer)
   "Called when `erc-process-sentinel-1' has detected an unexpected disconnect."
-  (with-current-buffer buffer
-    (let ((again t)
-          reconnect-p)
-      (while again
-        (setq again nil)
-        (setq reconnect-p (erc-server-reconnect-p event))
+  (when (buffer-live-p buffer)
+    (with-current-buffer buffer
+      (let ((reconnect-p (erc-server-reconnect-p event)))
         (erc-display-message nil 'error (current-buffer)
                              (if reconnect-p 'disconnected
                                'disconnected-noreconnect))
-        (if reconnect-p
-            (condition-case err
-                (progn
-                  (setq erc-server-reconnecting nil)
-                  (erc-server-reconnect)
-                  (setq erc-server-reconnect-count 0))
-              (error (when (buffer-live-p buffer)
-                       (set-buffer buffer)
-                       (when (integerp erc-server-reconnect-attempts)
+        (if (not reconnect-p)
+            ;; terminate, do not reconnect
+            (erc-display-message nil 'error (current-buffer)
+                                 'terminated ?e event)
+          ;; reconnect
+          (condition-case err
+              (progn
+                (setq erc-server-reconnecting nil)
+                (erc-server-reconnect)
+                (setq erc-server-reconnect-count 0))
+            (error (when (buffer-live-p buffer)
+                     (set-buffer buffer)
+                     (if (integerp erc-server-reconnect-attempts)
                          (setq erc-server-reconnect-count
-                               (1+ erc-server-reconnect-count)))
-                       ;; TODO: Make this use a one-time timer
-                       ;; instead of sit-for
-                       (sit-for erc-server-reconnect-timeout)
-                       (setq again t))))
-          ;; terminate, do not reconnect
-          (erc-display-message nil 'error (current-buffer)
-                               'terminated ?e event))))))
+                               (1+ erc-server-reconnect-count))
+                       (message "%s ... %s"
+                                "Reconnecting until we succeed"
+                                "kill the server buffer to stop"))
+                     (if (integerp erc-server-reconnect-timeout)
+                         (run-at-time erc-server-reconnect-timeout nil
+                                      #'erc-process-sentinel-2
+                                      event buffer)
+                       (error (concat "`erc-server-reconnect-timeout`"
+                                      " must be an integer")))))))))))
 
 (defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.



From MAILER-DAEMON Sun Oct 14 00:51:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRQ-0006XZ-Ia
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRM-0006UR-KL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRL-0006U4-UK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPe-0005Ig-KG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
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@hcoop.net>) id 1IgvPd-000490-Cg
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPc-0005Nl-CP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPc-0006z3-FE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPc-0006z3-FE@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:12 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Sync from Emacs trunk
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, 14 Oct 2007 04:51:00 -0000

commit 962ea2227ac72788ec37258aeee910f1f6d3467c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:08:16 2007 -0400

    Sync from Emacs trunk

diff --git a/ChangeLog b/ChangeLog
index 4576992..1d8c1c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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-07-30  Michael Olson  <mwolson@gnu.org>
 
 	* erc-nicklist.el: Remove from the Emacs source tree.  This file
diff --git a/erc-log.el b/erc-log.el
index e0f5669..856f1dc 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -280,7 +280,7 @@ The current buffer is given by BUFFER."
 
 (defun erc-log-all-but-server-buffers (buffer)
   "Returns t if logging should be enabled in BUFFER.
-Returns nil iff `erc-server-buffer-p' returns t."
+Returns nil if `erc-server-buffer-p' returns t."
   (save-excursion
     (save-window-excursion
       (set-buffer buffer)
diff --git a/erc.el b/erc.el
index fc7ad12..8cfafd7 100644
--- a/erc.el
+++ b/erc.el
@@ -4006,7 +4006,7 @@ and always returns t."
 (defun erc-echo-notice-in-target-buffer (s parsed buffer sender)
   "Echos a private notice in BUFFER, if BUFFER is non-nil.  This
 function is designed to be added to either `erc-echo-notice-hook'
-or `erc-echo-notice-always-hook', and returns non-nil iff BUFFER
+or `erc-echo-notice-always-hook', and returns non-nil if BUFFER
 is non-nil."
   (if buffer
       (progn (erc-display-message parsed nil buffer s) t)
@@ -4030,7 +4030,7 @@ designed to be added to either `erc-echo-notice-hook' or
   "Echos a private notice in the active buffer if the active
 buffer is not the server buffer.  This function is designed to be
 added to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff the active
+`erc-echo-notice-always-hook', and returns non-nil if the active
 buffer is not the server buffer."
   (if (not (eq (erc-server-buffer) (erc-active-buffer)))
       (progn (erc-display-message parsed nil 'active s) t)
@@ -4047,7 +4047,7 @@ designed to be added to either `erc-echo-notice-hook' or
   "Echos a private notice in all of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
 sender is a member.
 
 See also: `erc-echo-notice-in-first-user-buffer',
@@ -4061,7 +4061,7 @@ See also: `erc-echo-notice-in-first-user-buffer',
   "Echos a private notice in BUFFER and in all of the buffers for
 which SENDER is a member.  This function is designed to be added
 to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff there is
+`erc-echo-notice-always-hook', and returns non-nil if there is
 at least one buffer for which the sender is a member or the
 default target.
 
@@ -4077,7 +4077,7 @@ See also: `erc-echo-notice-in-user-buffers',
   "Echos a private notice in one of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
 sender is a member.
 
 See also: `erc-echo-notice-in-user-buffers',
@@ -5015,7 +5015,7 @@ Specifically, return the position of `erc-insert-marker'."
 (defun erc-send-input (input)
   "Treat INPUT as typed in by the user. It is assumed that the input
 and the prompt is already deleted.
-This returns non-nil only iff we actually send anything."
+This returns non-nil only if we actually send anything."
   ;; Handle different kinds of inputs
   (cond
    ;; Ignore empty input
diff --git a/erc.texi b/erc.texi
index 6b78347..e4f1f85 100644
--- a/erc.texi
+++ b/erc.texi
@@ -1,6 +1,6 @@
 \input texinfo
 @c %**start of header
-@setfilename ../info/erc
+@setfilename ../../info/erc
 @settitle ERC Manual
 @c %**end of header
 



From MAILER-DAEMON Sun Oct 14 00:51:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRT-0006a3-2b
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPS-0005Bh-Af
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00058b-Ut
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPL-00058T-QU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
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@hcoop.net>) id 1IgvPL-00044c-Jl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPK-0005GI-Rx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPK-0006Vw-VK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPK-0006Vw-VK@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:54 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Release ERC 5.2
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, 14 Oct 2007 04:51:05 -0000

commit 20700cd09e7c3520bfe3704aebe4051713b5a3e3
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 01:33:49 2007 +0000

    Release ERC 5.2
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-132

diff --git a/ChangeLog b/ChangeLog
index 6fcf18c..d0d3536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 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.
+	essentially public domain.  Update version to 5.2.
 	(Obtaining ERC): Mention extras tarball.
 	(Releases): Mention local GNU mirror.
 	(Sample Configuration): Remove notice.
diff --git a/erc.el b/erc.el
index 660abd2..83b23b4 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.2 (devel)"
+(defconst erc-version-string "Version 5.2"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
diff --git a/erc.texi b/erc.texi
index ae4ac8e..9a03e07 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.2 (pre-release).
+This manual is for ERC version 5.2.
 
 Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
 



From MAILER-DAEMON Sun Oct 14 00:51:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRS-0006Ze-Pj
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRQ-0006XK-Bs
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRP-0006Wl-EG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOt-00050r-8I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
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@hcoop.net>) id 1IgvOs-0003x4-Ub
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOs-00055e-8u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOs-0005lo-6F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOs-0005lo-6F@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:26 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix bug in last patch.
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, 14 Oct 2007 04:51:04 -0000

commit ad1e95220d64a2d75aabadb4db042d98a57b43f1
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 13 22:46:46 2006 +0000

    Fix bug in last patch.
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-41

diff --git a/erc-backend.el b/erc-backend.el
index aeb8d69..a4a038b 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -419,9 +419,10 @@ Additionally, detect whether the IRC process has hung."
         (if (> (erc-time-diff (erc-current-time)
                               erc-server-last-received-time)
                erc-server-send-ping-interval)
-            ;; if the process is hung, kill it
-            (setq erc-server-timed-out t)
-            (delete-process erc-server-process)
+            (progn
+              ;; if the process is hung, kill it
+              (setq erc-server-timed-out t)
+              (delete-process erc-server-process))
           (erc-server-send (format "PING %.0f" (erc-current-time)))))
     ;; remove timer if the server buffer has been killed
     (let ((timer (assq buf erc-server-ping-timer-alist)))



From MAILER-DAEMON Sun Oct 14 00:51:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRV-0006cD-8h
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPS-0005Be-83
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00056f-0T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055i-9k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPI-00043D-6N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPD-0005DI-Uf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPE-0006Ju-0n
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPE-0006Ju-0n@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:48 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update FOR-RELEASE
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, 14 Oct 2007 04:51:05 -0000

commit 5b36a92bc3b658413a82ca7affa17d608aca52ee
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 02:32:17 2007 +0000

    Update FOR-RELEASE
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-109

diff --git a/ChangeLog b/ChangeLog
index 8c78d99..74a724b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2007-02-15  Michael Olson  <mwolson@gnu.org>
 
 	* CREDITS: Update.
diff --git a/FOR-RELEASE b/FOR-RELEASE
index 76a4f9a..3047da7 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -1,6 +1,14 @@
 Tasks that need to be accomplished in order for a release to happen.
 
-* 5.2 release (future)
+* 5.3 release (future)
+
+** Source
+
+*** Make erc-backend not need to (require) any other part of ERC.
+This will hopefully increase the chance that it will be useful for
+other IRC clients, like Circe.
+
+* 5.2 release
 
 ** Documentation
 
@@ -9,13 +17,9 @@ the release of 5.2.
 
 ** Source
 
-*** Make erc-backend not need to (require) any other part of ERC.
-This will hopefully increase the chance that it will be useful for
-other IRC clients, like Circe.
-
 *** Add binding for S-TAB (backtab) that moves backwards by link.
 
-* next Emacs release
+* Emacs 22 release
 
 ** Source
 



From MAILER-DAEMON Sun Oct 14 00:51:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRV-0006cO-E7
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRR-0006Yc-PL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRQ-0006Xc-Px
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOt-000519-U6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
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@hcoop.net>) id 1IgvOt-0003xE-Ly
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOs-00055q-T9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOs-0005mq-UQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:26 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOs-0005mq-UQ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:26 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Name the menu "ERC", not "IRC".
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, 14 Oct 2007 04:51:06 -0000

commit b067bff547c318f2338212f39ce61d2c123ca4c6
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Mon Aug 14 21:49:03 2006 +0000

    Name the menu "ERC", not "IRC".
    
    * erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
      (erc-menu-definition): Name the menu "ERC" instead of "IRC" to
      avoid confusion with rcirc and other clients.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-43

diff --git a/ChangeLog b/ChangeLog
index 83edaed..89b8f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 
+	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
+	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
+	avoid confusion with rcirc and other clients.
+
 	* erc-backend.el (erc-server-banned): New variable.
 	(erc-server-connect): Set `erc-server-banned' to nil.
 	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
diff --git a/erc-menu.el b/erc-menu.el
index 36c28b7..a398e35 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -1,10 +1,9 @@
 ;; erc-menu.el -- Menu-bar definitions for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, menu
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMenu
 
 ;; This file is part of GNU Emacs.
 
@@ -32,7 +31,7 @@
 (require 'easymenu)
 
 (defvar erc-menu-definition
-  (list "IRC"
+  (list "ERC"
 	["Connect to server..." erc-select t]
 	["Disconnect from server..." erc-quit-server erc-server-connected]
 	"-"



From MAILER-DAEMON Sun Oct 14 00:51:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRV-0006cy-Lk
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPS-0005Ba-8P
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00056M-Ak
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055n-Jf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPI-00042h-GT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPH-0005Ez-Ng
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPH-0006QR-Pf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPH-0006QR-Pf@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:51 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-track: Assimilate two modules
	into one
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, 14 Oct 2007 04:51:06 -0000

commit e0d7ef316cd19bd21e74e56c76301cd28f81ef30
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 30 01:14:06 2007 +0000

    erc-track: Assimilate two modules into one
    
    2007-03-30  Michael Olson  <mwolson@gnu.org>
    
    	* erc-autoaway.el (erc-autoaway-idle-method): Use `if' rather than
    	`cond' and `set' rather than `set-default'.
    
    	* erc-track.el (track): Assimilate track-when-active module, since
    	there's no need to have two modules in one file -- an option will
    	do.  Remove track-modified-channels alias.
    	(erc-track-when-inactive): New option which determines whether to
    	track visible buffers when inactive.  The default is not to do so.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-121

diff --git a/ChangeLog b/ChangeLog
index 862463e..11ee037 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-30  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el (erc-autoaway-idle-method): Use `if' rather than
+	`cond' and `set' rather than `set-default'.
+
+	* erc-track.el (track): Assimilate track-when-active module, since
+	there's no need to have two modules in one file -- an option will
+	do.  Remove track-modified-channels alias.
+	(erc-track-when-inactive): New option which determines whether to
+	track visible buffers when inactive.  The default is not to do so.
+
 2007-03-17  Michael Olson  <mwolson@gnu.org>
 
 	* erc.texi (Development): Mention ErcDevelopment page on
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 9c0450d..91a1150 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -154,11 +154,12 @@ definitions of being idle."
 		 (const :tag "Emacs idle time" emacs)
 		 (const :tag "Last IRC action" irc))
   :set (lambda (sym val)
-	 (cond (erc-autoaway-mode
-		(erc-autoaway-disable)
-		(set-default sym val)
-		(erc-autoaway-enable))
-	       (t (set-default sym val)))))
+	 (if erc-autoaway-mode
+	     (progn
+	       (erc-autoaway-disable)
+	       (set sym val)
+	       (erc-autoaway-enable))
+	   (set sym val))))
 
 (defcustom erc-auto-set-away t
   "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.
diff --git a/erc-track.el b/erc-track.el
index 188e8ee..994d767 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -492,42 +492,61 @@ START is the minimum length of the name used."
 ;;; Module
 
 ;;;###autoload (autoload 'erc-track-mode "erc-track" nil t)
-(define-erc-module track track-modified-channels
+(define-erc-module track nil
   "This mode tracks ERC channel buffers with activity."
-  ((erc-track-add-to-mode-line erc-track-position-in-mode-line)
-   (setq erc-modified-channels-object (erc-modified-channels-object nil))
-   (erc-update-mode-line)
-   (if (featurep 'xemacs)
-       (defadvice switch-to-buffer (after erc-update (&rest args) activate)
-	 (erc-modified-channels-update))
-     (add-hook 'window-configuration-change-hook 'erc-modified-channels-update))
-   (add-hook 'erc-insert-post-hook 'erc-track-modified-channels)
-   (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))
-  ((erc-track-remove-from-mode-line)
-   (if (featurep 'xemacs)
-       (ad-disable-advice 'switch-to-buffer 'after 'erc-update)
-     (remove-hook 'window-configuration-change-hook
-		  'erc-modified-channels-update))
-   (remove-hook 'erc-disconnected-hook 'erc-modified-channels-update)
-   (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels)))
-
-;;;###autoload (autoload 'erc-track-when-inactive-mode "erc-track" nil t)
-(define-erc-module track-when-inactive nil
-  "This mode enables channel tracking even for visible buffers,
-if you are inactivity."
-  ((if (featurep 'xemacs)
-       (defadvice switch-to-buffer (after erc-update-when-inactive (&rest args) activate)
-	 (erc-user-is-active))
-     (add-hook 'window-configuration-change-hook 'erc-user-is-active))
-   (add-hook 'erc-send-completed-hook 'erc-user-is-active)
-   (add-hook 'erc-server-001-functions 'erc-user-is-active))
-  ((erc-track-remove-from-mode-line)
-   (if (featurep 'xemacs)
-       (ad-disable-advice 'switch-to-buffer 'after 'erc-update-when-inactive)
-     (remove-hook 'window-configuration-change-hook 'erc-user-is-active))
-   (remove-hook 'erc-send-completed-hook 'erc-user-is-active)
-   (remove-hook 'erc-server-001-functions 'erc-user-is-active)
-   (remove-hook 'erc-timer-hook 'erc-user-is-active)))
+  ;; Enable:
+  ((when (boundp 'erc-track-when-inactive)
+     (if erc-track-when-inactive
+	 (progn
+	   (if (featurep 'xemacs)
+	       (defadvice switch-to-buffer (after erc-update-when-inactive
+						  (&rest args) activate)
+		 (erc-user-is-active))
+	     (add-hook 'window-configuration-change-hook 'erc-user-is-active))
+	   (add-hook 'erc-send-completed-hook 'erc-user-is-active)
+	   (add-hook 'erc-server-001-functions 'erc-user-is-active))
+       (erc-track-add-to-mode-line erc-track-position-in-mode-line)
+       (setq erc-modified-channels-object (erc-modified-channels-object nil))
+       (erc-update-mode-line)
+       (if (featurep 'xemacs)
+	   (defadvice switch-to-buffer (after erc-update (&rest args) activate)
+	     (erc-modified-channels-update))
+	 (add-hook 'window-configuration-change-hook
+		   'erc-modified-channels-update))
+       (add-hook 'erc-insert-post-hook 'erc-track-modified-channels)
+       (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))))
+  ;; Disable:
+  ((when (boundp 'erc-track-when-inactive)
+     (erc-track-remove-from-mode-line)
+     (if erc-track-when-inactive
+	 (progn
+	   (if (featurep 'xemacs)
+	       (ad-disable-advice 'switch-to-buffer 'after
+				  'erc-update-when-inactive)
+	     (remove-hook 'window-configuration-change-hook
+			  'erc-user-is-active))
+	   (remove-hook 'erc-send-completed-hook 'erc-user-is-active)
+	   (remove-hook 'erc-server-001-functions 'erc-user-is-active)
+	   (remove-hook 'erc-timer-hook 'erc-user-is-active))
+       (if (featurep 'xemacs)
+	   (ad-disable-advice 'switch-to-buffer 'after 'erc-update)
+	 (remove-hook 'window-configuration-change-hook
+		      'erc-modified-channels-update))
+       (remove-hook 'erc-disconnected-hook 'erc-modified-channels-update)
+       (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels)))))
+
+(defcustom erc-track-when-inactive nil
+  "Enable channel tracking even for visible buffers, if you are
+inactive."
+  :group 'erc-track
+  :type 'boolean
+  :set (lambda (sym val)
+	 (if erc-track-mode
+	     (progn
+	       (erc-track-disable)
+	       (set sym val)
+	       (erc-track-enable))
+	   (set sym val))))
 
 ;;; Visibility
 



From MAILER-DAEMON Sun Oct 14 00:51:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRV-0006cg-I1
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPS-0005Bi-DJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-000571-28
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-000566-QH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPI-00042j-Oy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPG-0005Ed-R0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPG-0006Ow-SW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPG-0006Ow-SW@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:50 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] capab-identify: Added a prefix face.
	Renamed two internal functions.
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, 14 Oct 2007 04:51:06 -0000

commit 771131c78b26610410374991dfd56cf9b6865fba
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Sat Mar 10 16:51:18 2007 +0000

    capab-identify: Added a prefix face.  Renamed two internal functions.
    
    * 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-add-prefix): Use
    `erc-capab-identify-get-unidentified-nickname'.  Use
    `erc-capab-identify-unidentified' as the face.
    (erc-capab-identify-get-unidentified-nickname): Renamed from
    `erc-capab-get-unidentified-nickname'.
    
    * erc-backend.el (290): Moved here from erc-capab.el.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-118

diff --git a/ChangeLog b/ChangeLog
index 98f1bb1..8faa2b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-2007-03-05  Diane Murray  <disumu@x3y2z1.net>
+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
diff --git a/erc-backend.el b/erc-backend.el
index e2b7914..08cb738 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1513,6 +1513,9 @@ A server may send more than one 005 message."
 See `erc-display-server-message'." nil
   (erc-display-server-message proc parsed))
 
+(define-erc-response-handler (290)
+  "Handle dancer-ircd CAPAB messages." nil nil)
+
 (define-erc-response-handler (301)
   "AWAY notice." nil
   (erc-display-message parsed 'notice 'active 's301
diff --git a/erc-capab.el b/erc-capab.el
index 268c4bf..b7ccade 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -56,8 +56,10 @@
 ;; (erc-capab-identify-mode 1)
 
 ;; `erc-capab-identify-prefix' will now be added to the beginning of
-;; unidentified users' nicknames.  The default is an asterisk, "*".  If
-;; the value of this variable is nil or you disable this module (see
+;; unidentified users' nicknames.  The default is an asterisk, "*".
+;; You can customize the prefix and the face used to display it,
+;; `erc-capab-identify-unidentified'.  If the value of
+;; `erc-capab-identify-prefix' is nil or you disable this module (see
 ;; `erc-capab-identify-disable'), no prefix will be inserted, but the
 ;; flag sent by the server will still be stripped.
 
@@ -73,14 +75,19 @@
   :group 'erc)
 
 (defcustom erc-capab-identify-prefix "*"
-  "The prefix used for unidentified users."
+  "The prefix used for unidentified users.
+
+If you change this from the default \"*\", be sure to use a
+character not found in IRC nicknames to avoid confusion."
   :group 'erc-capab
   :type '(choice string (const nil)))
 
-;;; Define module:
+(defface erc-capab-identify-unidentified '((t)) ; same as `erc-default-face'
+  "Face to use for `erc-capab-identify-prefix'."
+  :group 'erc-capab
+  :group 'erc-faces)
 
-(define-erc-response-handler (290)
-  "Handle dancer-ircd CAPAB messages." nil nil)
+;;; Define module:
 
 ;;;###autoload (autoload 'erc-capab-identify-mode "erc-capab" nil t)
 (define-erc-module capab-identify nil
@@ -124,9 +131,9 @@ Optional argument PARSED is the current message, a response struct.
 These arguments are sent to this function when called as a hook in
 `erc-server-005-functions'."
   (unless erc-capab-identify-sent
-    (erc-capab-send-identify-messages)))
+    (erc-capab-identify-send-messages)))
 
-(defun erc-capab-send-identify-messages ()
+(defun erc-capab-identify-send-messages ()
   "Send CAPAB IDENTIFY messages if the server supports it."
   (when (and (stringp erc-server-version)
              (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
@@ -175,7 +182,7 @@ PARSED is an `erc-parsed' response struct."
   (when (and erc-capab-identify-prefix
              (erc-with-server-buffer erc-capab-identify-activated))
     (goto-char (or (erc-find-parsed-property) (point-min)))
-    (let ((nickname (erc-capab-get-unidentified-nickname
+    (let ((nickname (erc-capab-identify-get-unidentified-nickname
                      (erc-get-parsed-vector (point)))))
       (when (and nickname
                  (goto-char (point-min))
@@ -183,10 +190,9 @@ PARSED is an `erc-parsed' response struct."
                  (re-search-forward (regexp-quote nickname) nil t))
         (goto-char (match-beginning 0))
         (insert (erc-propertize erc-capab-identify-prefix
-                                'face (get-char-property (- (point) 1)
-                                                         'face)))))))
+                                'face 'erc-capab-identify-unidentified))))))
 
-(defun erc-capab-get-unidentified-nickname (parsed)
+(defun erc-capab-identify-get-unidentified-nickname (parsed)
   "Return the nickname of the user if unidentified.
 PARSED is an `erc-parsed' response struct."
   (when (and (erc-response-p parsed)



From MAILER-DAEMON Sun Oct 14 00:51:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRY-0006fa-Ps
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPS-0005BM-6h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPJ-00055r-Qn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055b-5m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPH-00042T-Ra
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPF-0005Dy-Tj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:49 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPF-0006NR-W0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPF-0006NR-W0@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:49 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Gratuitous back-merge
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, 14 Oct 2007 04:51:08 -0000

commit 5c97ebaea76bde88da8b43b9899f66e5f81bd836
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 05:18:15 2007 +0000

    Gratuitous back-merge
    
    
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-12

diff --git a/FOR-RELEASE b/FOR-RELEASE
index 77db6b5..8d8c486 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -21,7 +21,7 @@ the release of 5.2.
 
 *** [DONE] Add binding for S-TAB (backtab) that moves backwards by link.
 
-*** Merge filename changes from the 5.2 release branch into the
+*** [DONE] Merge filename changes from the 5.2 release branch into the
 erc--main--0 branch.
 
 * Emacs 22 release



From MAILER-DAEMON Sun Oct 14 00:51:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRZ-0006fk-0M
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRT-0006b4-PG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRS-0006Zj-UA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPS-0005Bb-1h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
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@hcoop.net>) id 1IgvPQ-00045n-OR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPP-0005Hf-0T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPP-0006cR-4A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPP-0006cR-4A@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:59 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-backend: Avoid gotcha in
	define-erc-response-handler
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, 14 Oct 2007 04:51:08 -0000

commit 197ed9155ce6822ab949e4b3a4060a8d03e1ba02
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Apr 12 04:33:35 2007 +0000

    erc-backend: Avoid gotcha in define-erc-response-handler
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-139

diff --git a/ChangeLog b/ChangeLog
index 218c0f2..cb0fd66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/erc-backend.el b/erc-backend.el
index 08cb738..7798d27 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1054,8 +1054,11 @@ Would expand to:
       \"Some non-generic variable documentation.
 
   Hook called upon receiving a WHOIS server response.
+
   Each function is called with two arguments, the process associated
-  with the response and the parsed response.
+  with the response and the parsed response.  If the function returns
+  non-nil, stop processing the hook.  Otherwise, continue.
+
   See also `erc-server-311'.\")
 
     (defalias 'erc-server-WI 'erc-server-311)
@@ -1064,7 +1067,9 @@ Would expand to:
 
   Hook called upon receiving a WI server response.
   Each function is called with two arguments, the process associated
-  with the response and the parsed response.
+  with the response and the parsed response.  If the function returns
+  non-nil, stop processing the hook.  Otherwise, continue.
+
   See also `erc-server-311'.\"))
 
 \(fn (NAME &rest ALIASES) &optional EXTRA-FN-DOC EXTRA-VAR-DOC &rest FN-BODY)"
@@ -1078,7 +1083,9 @@ Would expand to:
          (fn-name (intern (format "erc-server-%s" name)))
          (hook-doc (format "%sHook called upon receiving a %%s server response.
 Each function is called with two arguments, the process associated
-with the response and the parsed response.
+with the response and the parsed response.  If the function returns
+non-nil, stop processing the hook.  Otherwise, continue.
+
 See also `%s'."
                            (if extra-var-doc
                                (concat extra-var-doc "\n\n")



From MAILER-DAEMON Sun Oct 14 00:51:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRZ-0006gH-CH
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRV-0006ch-Lg
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRT-0006bR-Ur
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPD-00054K-UK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
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@hcoop.net>) id 1IgvPD-00042H-2M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPC-0005Ca-55
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPC-0006Gu-73
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPC-0006Gu-73@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:46 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fixed menu separator between
	"Current channel" and "Pals...".
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, 14 Oct 2007 04:51:10 -0000

commit f45f658f5f90aded4c1c3c479eab9abbb9123f1a
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Wed Feb 7 18:39:08 2007 +0000

    Fixed menu separator between "Current channel" and "Pals...".
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-103

diff --git a/ChangeLog b/ChangeLog
index 880b2f8..26def0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/erc-menu.el b/erc-menu.el
index 64cf36c..888da70 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -76,8 +76,8 @@
 		(erc-channel-user-op-p (erc-current-nick))]
 	       ["Set a key..." erc-set-channel-key
 		(erc-channel-user-op-p (erc-current-nick))])
-	 ["Leave this channel..." erc-part-from-channel erc-channel-users]
-	 "-")
+	 ["Leave this channel..." erc-part-from-channel erc-channel-users])
+	"-"
 	(list "Pals, fools and other keywords"
 	      ["Add pal..." erc-add-pal]
 	      ["Delete pal..." erc-delete-pal]



From MAILER-DAEMON Sun Oct 14 00:51:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRZ-0006fz-5P
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPS-0005Bg-9q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00058L-Hj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPL-00058B-DP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
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@hcoop.net>) id 1IgvPL-00044U-2h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPK-0005G6-AW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPK-0006Uv-Bz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPK-0006Uv-Bz@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:54 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] NEWS: Mention renamed files
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, 14 Oct 2007 04:51:08 -0000

commit 15f411f1f7eb8e04cc2b4846000cd2233b7d9f7b
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 00:59:03 2007 +0000

    NEWS: Mention renamed files
    
    2007-04-01  Michael Olson  <mwolson@gnu.org>
    
    	* erc-auto.in, erc-chess.el, erc-speak.el, erc-viper.el: Update
    	copyright notices.
    
    	* NEWS: Note which files have been
    	renamed.  Note that erc-list is enabled by default, except in
    	Emacs 22.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-130

diff --git a/ChangeLog b/ChangeLog
index 46b1156..6eead5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-04-01  Michael Olson  <mwolson@gnu.org>
 
+	* erc-auto.in, erc-chess.el, erc-speak.el, erc-viper.el: Update
+	copyright notices.
+
 	* erc.texi: Make Emacs Lisp source code in this document
 	essentially public domain.
 	(Obtaining ERC): Mention extras tarball.
@@ -21,7 +24,9 @@
 	(upload-extras): New rule to upload the extras tarball.  It's
 	yucky to replicate upload, but oh well.
 
-	* NEWS: Mention extras tarball.
+	* 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.
diff --git a/NEWS b/NEWS
index 6cb6dc2..bce99d5 100644
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,15 @@ extras files may be found at:
  o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
  o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
 
+** Renamed files
+
+Several files were renamed so as to make them distinct to users of the
+MS-DOS operating system.
+
+ o erc-autojoin.el -> erc-join.el
+ o erc-complete.el -> erc-hecomplete.el
+ o erc-nickserv.el -> erc-services.el
+
 ** Header line changes
 
 *** Remove "[IRC]" from the header line.
@@ -216,6 +225,10 @@ Specifies the port to use if none is given as an argument to
 **** New function: `erc-identd-quickstart'
 Ignores any arguments and calls `erc-identd-start'.
 
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
 *** Logging (erc-log.el)
 
 **** Make sure filenames are safe to use before writing to them.
diff --git a/erc-auto.in b/erc-auto.in
index adf4909..8ba706b 100644
--- a/erc-auto.in
+++ b/erc-auto.in
@@ -1,6 +1,6 @@
 ;;; -*-emacs-lisp-*-
 
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2007 Free Software Foundation, Inc.
 
 (defvar generated-autoload-file)
 (defvar command-line-args-left)
diff --git a/erc-chess.el b/erc-chess.el
index fc61bdc..876b55e 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: games, comm
diff --git a/erc-speak.el b/erc-speak.el
index 8080a52..306580b 100644
--- a/erc-speak.el
+++ b/erc-speak.el
@@ -1,6 +1,6 @@
 ;;; erc-speak.el --- Speech-enable the ERC chat client
 
-;; Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-viper.el b/erc-viper.el
index 4318bbe..da83f44 100644
--- a/erc-viper.el
+++ b/erc-viper.el
@@ -1,6 +1,6 @@
 ;;; erc-viper.el --- Viper compatibility hacks for ERC
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 
 ;; Author: Edward O'Connor <ted@oconnor.cx>
 ;; Keywords: emulation



From MAILER-DAEMON Sun Oct 14 00:51:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRZ-0006gl-Mg
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRX-0006em-QG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRW-0006dU-35
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPQ-0005B7-Qa
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
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@hcoop.net>) id 1IgvPQ-00045M-CH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPN-0005Gs-3E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPN-0006Yw-4i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPN-0006Yw-4i@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:57 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] manual: Make header conform with
	Emacs 22
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, 14 Oct 2007 04:51:12 -0000

commit 5e5c91047567e13ce38cf9ae830e6d69b9930dd4
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 03:18:17 2007 +0000

    manual: Make header conform with Emacs 22
    
    * erc.texi: Backmerge header stuff with Emacs 22.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-135

diff --git a/erc.texi b/erc.texi
index 9a03e07..bfd5894 100644
--- a/erc.texi
+++ b/erc.texi
@@ -1,7 +1,7 @@
-\input texinfo @c -*-texinfo-*-
+\input texinfo
 @c %**start of header
 @setfilename erc.info
-@settitle ERC
+@settitle ERC Manual
 @c %**end of header
 
 @dircategory Emacs



From MAILER-DAEMON Sun Oct 14 00:51:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRZ-0006gr-Qa
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPQ-0005Ak-86
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPH-00054i-J1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPG-00054P-Rb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
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@hcoop.net>) id 1IgvPG-00042Z-4s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPD-0005DC-M7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPD-0006JP-Nq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPD-0006JP-Nq@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:47 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add "tiny change" cruft to 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: Sun, 14 Oct 2007 04:51:12 -0000

commit b3b73708b7604ead2b3c5a1f2c54e55a18afa3fa
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 15 14:31:05 2007 +0000

    Add "tiny change" cruft to ChangeLog
    
    I'm not particularly fond of this notation, but its what Emacs uses, so I
    figure it's best to keep in sync with them.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-108

diff --git a/ChangeLog b/ChangeLog
index eeb2d27..8c78d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -203,7 +203,7 @@
 	(erc-nickserv-identify-on-connect)
 	(erc-nickserv-identify-on-nick-change): Handle 'both method.
 
-2006-12-28  Leo  <sdl.web@gmail.com>
+2006-12-28  Leo  <sdl.web@gmail.com>  (tiny change)
 
 	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
 	hitting C-g does not leave iswitchb-mode on.
@@ -236,7 +236,7 @@
 	* erc.el (erc-open): Restore old point correctly, or at least get
 	closer to doing so than before.
 
-2006-12-13  Leo  <sdl.web@gmail.com>
+2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
 
 	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
 	isn't active already, instead of leaving it on.
@@ -273,7 +273,7 @@
 	(erc-update-current-channel-member, erc-load-script):
 	(erc-mode-line-away-status-format): Doc fixes.
 
-2006-11-20  Andrea Russo  <rastandy@inventati.org>
+2006-11-20  Andrea Russo  <rastandy@inventati.org>  (tiny change)
 
 	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
 	before calling `erc-display-prompt'.
@@ -343,7 +343,7 @@
 	`erc-show-my-nick' is non-nil.
 	(erc-compute-server): Doc fix.
 
-2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
+2006-10-01  John J Foerch  <jjfoerch@earthlink.net>  (tiny change)
 
 	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
 	from the erc-timestamp field.
@@ -353,7 +353,7 @@
 	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
 	parenthesis.  Thanks to Stephan Stahl for the report.
 
-2006-09-10  Eric Hanchrow  <offby1@blarg.net>
+2006-09-10  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
 
 	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
 	instead of a single user.



From MAILER-DAEMON Sun Oct 14 00:51:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRZ-0006gQ-GC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRW-0006e3-MC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRU-0006c2-NN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPS-0005Bj-GU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
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@hcoop.net>) id 1IgvPR-00045m-7G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPO-0005HZ-P0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPO-0006bu-RY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPO-0006bu-RY@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:58 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fixed customization mismatch in
	erc-nicklist-voiced-position.
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, 14 Oct 2007 04:51:11 -0000

commit c28a5ebd2eef0c147eb4134798e3607e601b13b3
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Sun Apr 8 19:03:20 2007 +0000

    Fixed customization mismatch in erc-nicklist-voiced-position.
    
    * erc-nicklist.el (erc-nicklist-voiced-position): Fixed
    customization mismatch.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-138

diff --git a/ChangeLog b/ChangeLog
index 177f205..218c0f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/erc-nicklist.el b/erc-nicklist.el
index f37b8ea..2fd7660 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -104,8 +104,8 @@ Icons are displayed if `erc-nicklist-use-icons' is non-nil."
 The value can be `top', `bottom' or nil (don't sort)."
   :group 'erc-nicklist
   :type  '(choice
-	   (const :tag "Top" 'top)
-	   (const :tag "Bottom" 'bottom)
+	   (const :tag "Top" top)
+	   (const :tag "Bottom" bottom)
 	   (const :tag "Mixed" nil)))
 
 (defcustom erc-nicklist-window-size 20.0



From MAILER-DAEMON Sun Oct 14 00:51:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRb-0006hh-0F
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQ0-0005Z1-6n
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPv-0005V5-Fo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPu-0005UP-Uv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
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@hcoop.net>) id 1IgvPu-0004Eq-O3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPu-0005Ti-1b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPu-0007TD-4q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPu-0007TD-4q@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:30 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] .
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, 14 Oct 2007 04:51:13 -0000

commit 52e4c9dc4ee4b0bf94e07bd7eace5ee7e3547c38
Author: Exal de Jesus Garcia Carrillo <exal@alice.nipl.net>
Date:   Fri Oct 5 16:15:19 2007 -0500

    .

diff --git a/CREDITS b/CREDITS
index d14a9a6..8964364 100644
--- a/CREDITS
+++ b/CREDITS
@@ -164,7 +164,7 @@ Vivek Dasmohapatra <vivek AT etla DOT org>:
 Ivan Kanis <apple AT kanis DOT eu>:
   * Fixed window ordering bug in erc-goodies.el (1 line changed).
 
-Exal de Jesus Garcia Carrillo  <exal AT gmx DOT de>:
+Exal de Jesus Garcia Carrillo  <exal AT gnu DOT org>:
   * Fixed some typos in the documentation.
 
 Aidan Kehoe  <kehoea AT parhasard DOT net>:
diff --git a/ChangeLog b/ChangeLog
index a63508b..b686f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
 	* 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@gmx.de>  (tiny change)
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
 
 	* erc.texi (Special-Features): Fix small typo.
 



From MAILER-DAEMON Sun Oct 14 00:51:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRc-0006j6-F7
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRZ-0006gw-Rv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRX-0006eU-HO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPS-0005Bc-3s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
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@hcoop.net>) id 1IgvPQ-00045S-Qk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPN-0005Gy-CL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPN-0006ZR-EL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPN-0006ZR-EL@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:57 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--main--0
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, 14 Oct 2007 04:51:14 -0000

commit fecafdad2c21f6b850aeac416d11e91a3837324f
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 03:31:24 2007 +0000

    Merged from erc--main--0
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--main--0--patch-135
       manual: Make header conform with Emacs 22
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-16

diff --git a/erc.texi b/erc.texi
index 9a03e07..bfd5894 100644
--- a/erc.texi
+++ b/erc.texi
@@ -1,7 +1,7 @@
-\input texinfo @c -*-texinfo-*-
+\input texinfo
 @c %**start of header
 @setfilename erc.info
-@settitle ERC
+@settitle ERC Manual
 @c %**end of header
 
 @dircategory Emacs



From MAILER-DAEMON Sun Oct 14 00:51:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRc-0006jI-LE
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPQ-0005B2-NF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00056k-Va
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055Z-5k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPH-00042l-LI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPF-0005Dg-3D
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:49 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPF-0006Lw-6F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:49 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPF-0006Lw-6F@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:49 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Really mark the backtab task as done
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, 14 Oct 2007 04:51:15 -0000

commit 8275264e79bc29b6616518e443a0bc95132e23e9
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 03:56:45 2007 +0000

    Really mark the backtab task as done
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-113

diff --git a/FOR-RELEASE b/FOR-RELEASE
index 96b2426..77db6b5 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -19,7 +19,7 @@ the release of 5.2.
 
 ** Source
 
-*** Add binding for S-TAB (backtab) that moves backwards by link.
+*** [DONE] Add binding for S-TAB (backtab) that moves backwards by link.
 
 *** Merge filename changes from the 5.2 release branch into the
 erc--main--0 branch.



From MAILER-DAEMON Sun Oct 14 00:51:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRd-0006jp-1v
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRb-0006hl-2O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRY-0006fV-QO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPQ-0005B5-Ob
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
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@hcoop.net>) id 1IgvPQ-00045e-9S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPN-0005HA-UJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPO-0006aP-0H
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPO-0006aP-0H@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:58 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--main--0
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, 14 Oct 2007 04:51:15 -0000

commit 3c20fa903ac656892c91b35003294bdaf755228a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 17:22:36 2007 +0000

    Merged from erc--main--0
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--main--0--patch-136
       Makefile: Add DISTRIBUTOR variable
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-17

diff --git a/ChangeLog b/ChangeLog
index 8822140..8e0fd37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
 	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.
 
 	* NEWS: Mention extras tarball.  Note which files have been
 	renamed.  Note that erc-list is enabled by default, except in
diff --git a/Makefile b/Makefile
index 93b9914..a504329 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,9 @@ PREFIX   = /usr/local
 ELISPDIR = $(PREFIX)/share/emacs/site-lisp/erc
 INFODIR  = $(PREFIX)/info
 
+# Used to differentiate building packages for Debian and Ubuntu
+DISTRIBUTOR = debian
+
 # XEmacs users will probably want the following settings.
 #EMACS    = xemacs
 #SITEFLAG = -no-site-file
@@ -104,7 +107,7 @@ debbuild:
 	  debsign)
 
 debrelease: debprepare
-	-rm -f ../../dist/erc_*
+	-rm -f ../../dist/$(DISTRIBUTOR)/erc_*
 	-rm -f ../erc_$(VERSION)*
 	(cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
 	cp -R debian ../$(SNAPDIR)
@@ -117,10 +120,10 @@ debrelease: debprepare
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
 	$(MAKE) debbuild
-	cp ../erc_$(VERSION)* ../../dist
+	cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
 debrevision:
-	-rm -f ../../dist/erc_*
+	-rm -f ../../dist/$(DISTRIBUTOR)/erc_*
 	-rm -f ../erc_$(VERSION)-*
 	-rm -fr ../erc-$(VERSION)
 	$(MAKE) debprepare
@@ -134,7 +137,7 @@ debrevision:
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
 	$(MAKE) debbuild
-	cp ../erc_$(VERSION)* ../../dist
+	cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
 release: autoloads distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)



From MAILER-DAEMON Sun Oct 14 00:51:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRd-0006k6-9F
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPQ-0005Ac-22
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00055y-1h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055j-96
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPH-00042Z-NX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPF-0005Ds-Km
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:49 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPF-0006Mu-Nk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:49 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPF-0006Mu-Nk@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:49 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Mark merge from 5.2 branch as done
	in FOR-RELEASE
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, 14 Oct 2007 04:51:15 -0000

commit f1923f6206746f9379a66085cdc76a6a25525193
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 05:17:23 2007 +0000

    Mark merge from 5.2 branch as done in FOR-RELEASE
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-115

diff --git a/FOR-RELEASE b/FOR-RELEASE
index 77db6b5..8d8c486 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -21,7 +21,7 @@ the release of 5.2.
 
 *** [DONE] Add binding for S-TAB (backtab) that moves backwards by link.
 
-*** Merge filename changes from the 5.2 release branch into the
+*** [DONE] Merge filename changes from the 5.2 release branch into the
 erc--main--0 branch.
 
 * Emacs 22 release



From MAILER-DAEMON Sun Oct 14 00:51:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRd-0006kS-HC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPQ-0005B8-RR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00056o-16
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055m-Bc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPH-00042J-Oh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPF-0005Dm-DF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:49 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPF-0006MR-Er
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:49 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPF-0006MR-Er@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:49 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Caught up with erc--rel--5.2
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, 14 Oct 2007 04:51:16 -0000

commit bf8fef736a3106ed7982f966ed37790781a2a305
Merge: 8275264... 94c4908...
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 05:15:58 2007 +0000

    Caught up with erc--rel--5.2
    
    All that was out-of-date was the version number in the manual.  Not bad.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-114

diff --cc ChangeLog
index ce56964,ce56964..a180af1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -12,6 -12,6 +12,8 @@@
  	(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.



From MAILER-DAEMON Sun Oct 14 00:51:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPx-0005Xx-MF
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPn-0005NN-Vk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPm-0005LQ-2h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPl-0005LE-Di
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
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@hcoop.net>) id 1IgvPl-0004Bl-4N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPk-0005QV-E6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPk-0007Cb-FQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPk-0007Cb-FQ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:20 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Try to fix bug with /reconnect and a
	killed server buffer
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, 14 Oct 2007 04:49:26 -0000

commit 75373f6d2bfb8a2245d4848a402bc6e42f6784ea
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 21:54:48 2007 -0400

    Try to fix bug with /reconnect and a killed server buffer
    
    * 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.el (erc-cmd-RECONNECT): Use simpler logic, and use buffer-live-p
      rather than bufferp.

diff --git a/ChangeLog b/ChangeLog
index 4c602d6..50b8dd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
 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.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.
 
 2007-08-12  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc-backend.el b/erc-backend.el
index d0ec812..75bef89 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -550,11 +550,12 @@ We will store server variables in the buffer given by BUFFER."
 (defun erc-server-reconnect ()
 "Reestablish the current IRC connection.
 Make sure you are in an ERC buffer when running this."
-  (let ((server (erc-server-buffer)))
-    (unless (and server
-                 (buffer-live-p server))
-      (error "Couldn't switch to server buffer"))
-    (with-current-buffer server
+  (let ((buffer (erc-server-buffer)))
+    (unless (buffer-live-p buffer)
+      (if (eq major-mode 'erc-mode)
+          (error "Reconnect must be run from an ERC buffer")
+        (setq buffer (current-buffer))))
+    (with-current-buffer buffer
       (erc-update-mode-line)
       (erc-set-active-buffer (current-buffer))
       (setq erc-server-last-sent-time 0)
diff --git a/erc.el b/erc.el
index fd709ed..5d29ace 100644
--- a/erc.el
+++ b/erc.el
@@ -3256,9 +3256,11 @@ the message given by REASON."
 
 (defun erc-cmd-RECONNECT ()
   "Try to reconnect to the current IRC server."
-  (let ((buffer (or (erc-server-buffer) (current-buffer)))
+  (let ((buffer (erc-server-buffer))
 	(process nil))
-    (with-current-buffer (if (bufferp buffer) buffer (current-buffer))
+    (unless (buffer-live-p buffer)
+      (setq buffer (current-buffer)))
+    (with-current-buffer buffer
       (setq erc-server-quitting nil)
       (setq erc-server-reconnecting t)
       (setq erc-server-reconnect-count 0)



From MAILER-DAEMON Sun Oct 14 00:51:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRf-0006mj-NZ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRc-0006ie-1C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRa-0006hT-LD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052T-2N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOw-0003xm-4I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOv-00056H-1s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOv-0005qM-31
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOv-0005qM-31@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:29 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix a couple of small 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: Sun, 14 Oct 2007 04:51:16 -0000

commit f14d999a20de4f4ec6235659cea7562f441fa169
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Sep 11 01:09:29 2006 +0000

    Fix a couple of small bugs.
    
    2006-09-10  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-generate-new-buffer-name): If this is a server
    	buffer and a process exists already, create a new buffer.
    	(erc-open): If the IRC session was continued, restore the old
    	point.  Thanks to Stephan Stahl for the report.
    
    	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
    	whether we are already away.
    
    	* erc-menu.el: Fix potential compiler warning.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-50

diff --git a/ChangeLog b/ChangeLog
index c9f7924..2f878e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-10  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-generate-new-buffer-name): If this is a server
+	buffer and a process exists already, create a new buffer.
+	(erc-open): If the IRC session was continued, restore the old
+	point.  Thanks to Stephan Stahl for the report.
+
+	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
+	whether we are already away.
+
+	* erc-menu.el: Fix potential compiler warning.
+
 2006-09-07  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el: Updated Commentary and URL.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 983f4e4..71d219d 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -246,6 +246,7 @@ exceeds `erc-autoaway-idle-seconds'."
   ;; this function is called from `erc-timer-hook', which is called
   ;; whenever the server sends something to the client.
   (when (and erc-auto-set-away
+	     (not erc-autoaway-caused-away)
 	     (erc-autoaway-some-open-server-buffer))
     (let ((idle-time (erc-time-diff erc-autoaway-last-sent-time
 				    current-time)))
diff --git a/erc-menu.el b/erc-menu.el
index 2556edf..a2dc7a1 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -28,6 +28,7 @@
 
 ;;; Code:
 
+;(require 'erc)
 (require 'easymenu)
 
 (defvar erc-menu-definition
diff --git a/erc.el b/erc.el
index 0cc6561..ff0a128 100644
--- a/erc.el
+++ b/erc.el
@@ -1550,7 +1550,7 @@ symbol, it may have these values:
 	     (or target
 		 (with-current-buffer (get-buffer buf-name)
 		   (and (erc-server-buffer-p)
-			(not erc-server-connected))))
+			(not (erc-server-process-alive)))))
 	     (with-current-buffer (get-buffer buf-name)
 	       (and (string= erc-session-server server)
 		    (erc-port-equal erc-session-port port))))
@@ -1906,6 +1906,7 @@ Returns the buffer for the given server or channel."
 	(connected-p (unless connect erc-server-connected))
 	(buffer (erc-get-buffer-create server port channel))
 	(old-buffer (current-buffer))
+	(old-point (point))
 	continued-session)
     (erc-update-modules)
     (set-buffer buffer)
@@ -1971,7 +1972,7 @@ Returns the buffer for the given server or channel."
       (goto-char (point-max))
       (insert "\n"))
     (if continued-session
-	(goto-char (point-max))
+	(goto-char old-point)
       (set-marker erc-insert-marker (point))
       (erc-display-prompt)
       (goto-char (point-max)))



From MAILER-DAEMON Sun Oct 14 00:51:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRf-0006my-T7
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPP-0005AZ-Us
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPH-00054e-Ig
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPG-00054O-Ra
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
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@hcoop.net>) id 1IgvPF-00042T-O6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPD-0005Ct-3q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPD-0006IP-4m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPD-0006IP-4m@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:47 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Separate ping timeout and ping
	interval
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, 14 Oct 2007 04:51:17 -0000

commit 322f045ddba8b0a34300ab524e52d7f53eccfee6
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 15 01:20:18 2007 +0000

    Separate ping timeout and ping interval
    
    * CREDITS: Update.
    
    * erc-backend.el (erc-server-send-ping-interval): Change to use a default
      of 30 seconds.
      (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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-106

diff --git a/CREDITS b/CREDITS
index 0e6856b..bf10c21 100644
--- a/CREDITS
+++ b/CREDITS
@@ -158,6 +158,9 @@ Leo <sdl.web AT gmail.com>:
   * Fixed the erc-iswitchb function to only temporarily enable
     iswitchb mode if it isn't active already (4 lines changed).
 
+Vivek Dasmohapatra <vivek AT etla DOT org>:
+  * Fixed issue with reconnecting to a not-yet-dead server connection.
+
 
 ----
 
diff --git a/ChangeLog b/ChangeLog
index 2affa96..0cd504a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 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.
+	(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.
+
 	* 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.
diff --git a/erc-backend.el b/erc-backend.el
index 713f713..eaea8c2 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -411,12 +411,21 @@ protection algorithm."
 
 ;; Ping handling
 
-(defcustom erc-server-send-ping-interval 90
+(defcustom erc-server-send-ping-interval 30
   "*Interval of sending pings to the server, in seconds.
 If this is set to nil, pinging the server is disabled."
   :group 'erc-server
   :type '(choice (const nil) (integer :tag "Seconds")))
 
+(defcustom erc-server-send-ping-timeout 120
+  "*If the time between ping and response is greater than this, reconnect.
+The time is in seconds.
+
+This must be greater than or equal to the value for
+`erc-server-send-ping-interval'."
+  :group 'erc-server
+  :type '(choice (const nil) (integer :tag "Seconds")))
+
 (defvar erc-server-ping-handler nil
   "This variable holds the periodic ping timer.")
 (make-variable-buffer-local 'erc-server-ping-handler)
@@ -455,7 +464,7 @@ Additionally, detect whether the IRC process has hung."
       (with-current-buffer buf
         (if (> (erc-time-diff (erc-current-time)
                               erc-server-last-received-time)
-               erc-server-send-ping-interval)
+               erc-server-send-ping-timeout)
             (progn
               ;; if the process is hung, kill it
               (setq erc-server-timed-out t)



From MAILER-DAEMON Sun Oct 14 00:51:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRg-0006nV-2n
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRe-0006l8-0E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRc-0006io-9y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052K-2L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOv-0003xj-U9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOv-000568-1c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOt-0005oM-Uk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOt-0005oM-Uk@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:27 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Handle near-simultaneous IRC server
	connections better.
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, 14 Oct 2007 04:51:18 -0000

commit 620e3f3dd9262bb06a46cc420fb7512bff85f0c5
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 20 06:52:21 2006 +0000

    Handle near-simultaneous IRC server connections better.
    
    * erc-identd.el (erc-identd): New customization group.
      (erc-identd-port): New option that specifies the port to use if
      none is given as an argument to erc-identd-start.
      (identd): Place erc-identd-quickstart in erc-connect-pre-hook
      instead of erc-identd-start so that we deal with the different
      meaning of the first argument.
      (erc-identd-start): Use erc-identd-port.
      (erc-identd-quickstart): New function that ignores any arguments
      and calls erc-identd-start.
    
    * erc.el (erc): Set up the prompt before connecting rather than after.
      Run erc-connect-pre-hook with the buffer as an argument, instead of no
      arguments.
      (erc-initialize-log-marker): Accept a `buffer' argument.
      (erc-connect-pre-hook): Docfix.
      (erc-connection-established): Make sure this runs in the correct
      buffer.
      (erc-set-initial-user-mode): Accept a `buffer' argument.
    
    * erc-spelling.el (erc-spelling-init): Use erc-with-server-buffer.
      Accept `buffer' argument.
      (spelling): Call erc-spelling-init with the `buffer' argument.
    
    * erc-log.el (log): Pass `buffer' argument to erc-log-setup-logging
      instead of setting the current buffer.  Ditto for
      erc-log-disable-logging.
      (erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
      argument.
    
    * erc-backend.el (erc-server-connect)
      (erc-server-setup-periodical-ping): Accept `buffer' argument.
    
    * erc-autoaway.el (erc-autoaway-last-sent-time)
      (erc-autoaway-caused-away): Move higher in file to fix byte-compile
      warning.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-46

diff --git a/ChangeLog b/ChangeLog
index 8647850..1b876a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2006-08-20  Michael Olson  <mwolson@gnu.org>
 
+	* erc-identd.el (erc-identd): New customization group.
+	(erc-identd-port): New option that specifies the port to use if
+	none is given as an argument to erc-identd-start.
+	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
+	instead of erc-identd-start so that we deal with the different
+	meaning of the first argument.
+	(erc-identd-start): Use erc-identd-port.
+	(erc-identd-quickstart): New function that ignores any arguments
+	and calls erc-identd-start.
+
 	* erc.el (erc-with-server-buffer): New macro that switches to the
 	current ERC server buffer and runs some code.  If no server buffer
 	is available, return nil.  This is a useful way to access
@@ -21,7 +31,9 @@
 	though it isn't really needed here.
 	(erc-away): Mention erc-away-time.
 	(erc): Don't propagate the erc-away setting, since it makes more
-	sense to access it from the server buffer.
+	sense to access it from the server buffer.  Set up the prompt
+	before connecting rather than after.  Run erc-connect-pre-hook
+	with the buffer as an argument, instead of no arguments.
 	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
 	erc-server-buffer-p so that only open connections are set away.
 	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
@@ -32,10 +44,17 @@
 	(erc-away-time): Rename from erc-away-p, since this is no longer a
 	boolean-style predicate.
 	(erc-format-away-status): Use it.
+	(erc-initialize-log-marker): Accept a `buffer' argument.
+	(erc-connect-pre-hook): Docfix.
+	(erc-connection-established): Make sure this runs in the correct
+	buffer.
+	(erc-set-initial-user-mode): Accept a `buffer' argument.
 
 	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
 
-	* erc-spelling.el (erc-spelling-init): Use erc-with-server-buffer.
+	* erc-spelling.el (erc-spelling-init): Use
+	erc-with-server-buffer.  Accept `buffer' argument.
+	(spelling): Call erc-spelling-init with the `buffer' argument.
 
 	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
 
@@ -54,6 +73,10 @@
 	erc-away-time.
 
 	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
+	Pass `buffer' argument to erc-log-setup-logging instead of setting
+	the current buffer.  Ditto for erc-log-disable-logging.
+	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
+	argument.
 
 	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
 
@@ -78,6 +101,8 @@
 	not given.
 	(erc-server-send): Simplify slightly.
 	(erc-call-hooks): Use erc-with-server-buffer.
+	(erc-server-connect, erc-server-setup-periodical-ping): Accept
+	`buffer' argument.
 
 	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
 	higher to avoid an automatic load snafu.
@@ -103,6 +128,8 @@
 	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
 	(erc-autoaway-set-away): Accept a `notest' argument which is used
 	to avoid testing the same thing twice.
+	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
+	higher in file to fix byte-compile warning.
 
 2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 
diff --git a/erc-autoaway.el b/erc-autoaway.el
index af6f84b..fe8a667 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -40,6 +40,13 @@ yourself back when you type something."
   "The Emacs idletimer.
 This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
 
+(defvar erc-autoaway-last-sent-time (erc-current-time)
+  "The last time the user sent something.")
+
+(defvar erc-autoaway-caused-away nil
+  "Indicates whether this module was responsible for setting the
+user's away status.")
+
 (eval-when-compile (defvar erc-autoaway-idle-seconds))
 
 (defun erc-autoaway-reestablish-idletimer ()
@@ -195,13 +202,6 @@ in seconds."
   :group 'erc-autoaway
   :type 'string)
 
-(defvar erc-autoaway-last-sent-time (erc-current-time)
-  "The last time the user sent something.")
-
-(defvar erc-autoaway-caused-away nil
-  "Indicates whether this module was responsible for setting the
-user's away status.")
-
 (defun erc-autoaway-reset-idle-user (&rest stuff)
   "Reset the stored user idle time.
 This is one global variable since a user talking on one net can
diff --git a/erc-backend.el b/erc-backend.el
index bedddea..e9e0596 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -437,17 +437,19 @@ Additionally, detect whether the IRC process has hung."
         (erc-cancel-timer (cdr timer))
         (setcdr timer nil)))))
 
-(defun erc-server-setup-periodical-ping (&rest ignore)
-  "Set up a timer to periodically ping the current server."
-  (and erc-server-ping-handler (erc-cancel-timer erc-server-ping-handler))
-  (when erc-server-send-ping-interval
-    (setq erc-server-ping-handler (run-with-timer
-                                   4 erc-server-send-ping-interval
-                                   #'erc-server-send-ping
-                                   (current-buffer)))
-    (setq erc-server-ping-timer-alist (cons (cons (current-buffer)
-                                                  erc-server-ping-handler)
-                                            erc-server-ping-timer-alist))))
+(defun erc-server-setup-periodical-ping (buffer)
+  "Set up a timer to periodically ping the current server.
+The current buffer is given by BUFFER."
+  (with-current-buffer buffer
+    (and erc-server-ping-handler (erc-cancel-timer erc-server-ping-handler))
+    (when erc-server-send-ping-interval
+      (setq erc-server-ping-handler (run-with-timer
+                                     4 erc-server-send-ping-interval
+                                     #'erc-server-send-ping
+                                     buffer))
+      (setq erc-server-ping-timer-alist (cons (cons buffer
+                                                    erc-server-ping-handler)
+                                              erc-server-ping-timer-alist)))))
 
 (defun erc-server-process-alive ()
   "Return non-nil when `erc-server-process' is open or running."
@@ -457,43 +459,45 @@ Additionally, detect whether the IRC process has hung."
 
 ;;;; Connecting to a server
 
-(defun erc-server-connect (server port)
-  "Perform the connection and login.
-We will store server variables in the current buffer."
+(defun erc-server-connect (server port buffer)
+  "Perform the connection and login using the specified SERVER and PORT.
+We will store server variables in the buffer given by BUFFER."
   (let ((msg (erc-format-message 'connect ?S server ?p port)))
     (message "%s" msg)
-    (setq erc-server-process
-          (funcall erc-server-connect-function
-                   (format "erc-%s-%s" server port)
-                   (current-buffer) server port))
-    (message "%s...done" msg))
-  ;; Misc server variables
-  (setq erc-server-quitting nil)
-  (setq erc-server-timed-out nil)
-  (setq erc-server-banned nil)
-  (let ((time (erc-current-time)))
-    (setq erc-server-last-sent-time time)
-    (setq erc-server-last-ping-time time)
-    (setq erc-server-last-received-time time))
-  (setq erc-server-lines-sent 0)
-  ;; last peers (sender and receiver)
-  (setq erc-server-last-peers '(nil . nil))
-  ;; process handlers
-  (set-process-sentinel erc-server-process 'erc-process-sentinel)
-  (set-process-filter erc-server-process 'erc-server-filter-function)
-  ;; we do our own encoding and decoding
-  (when (fboundp 'set-process-coding-system)
-    (set-process-coding-system erc-server-process 'raw-text))
-  (set-marker (process-mark erc-server-process) (point))
+    (let ((process (funcall erc-server-connect-function
+                            (format "erc-%s-%s" server port)
+                            nil server port)))
+      (message "%s...done" msg)
+      ;; Misc server variables
+      (with-current-buffer buffer
+        (setq erc-server-process process)
+        (setq erc-server-quitting nil)
+        (setq erc-server-timed-out nil)
+        (setq erc-server-banned nil)
+        (let ((time (erc-current-time)))
+          (setq erc-server-last-sent-time time)
+          (setq erc-server-last-ping-time time)
+          (setq erc-server-last-received-time time))
+        (setq erc-server-lines-sent 0)
+        ;; last peers (sender and receiver)
+        (setq erc-server-last-peers '(nil . nil)))
+      ;; we do our own encoding and decoding
+      (when (fboundp 'set-process-coding-system)
+        (set-process-coding-system process 'raw-text))
+      ;; process handlers
+      (set-process-sentinel process 'erc-process-sentinel)
+      (set-process-filter process 'erc-server-filter-function)
+      (set-process-buffer process buffer)))
   (erc-log "\n\n\n********************************************\n")
-  (message (erc-format-message 'login ?n (erc-current-nick)))
+  (message (erc-format-message
+            'login ?n
+            (with-current-buffer buffer (erc-current-nick))))
   ;; wait with script loading until we receive a confirmation (first
   ;; MOTD line)
   (if (eq erc-server-connect-function 'open-network-stream-nowait)
       ;; it's a bit unclear otherwise that it's attempting to establish a
       ;; connection
-      (erc-display-message nil nil (current-buffer)
-                           "Opening connection..\n")
+      (erc-display-message nil nil buffer "Opening connection..\n")
     (erc-login)))
 
 (defun erc-server-filter-function (process string)
diff --git a/erc-identd.el b/erc-identd.el
index 32bfa33..3bac6fa 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -42,12 +42,26 @@
 
 (defvar erc-identd-process nil)
 
+(defgroup erc-identd nil
+  "Run a local identd server."
+  :group 'erc)
+
+(defcustom erc-identd-port 8113
+  "Port to run the identd server on if not specified in the argument for
+`erc-identd-start'.
+
+This can be either a string or a number."
+  :group 'erc-identd
+  :type '(choice (const :tag "None" nil)
+		 (integer :tag "Port number")
+		 (string :tag "Port string")))
+
 ;;;###autoload (autoload 'erc-identd-mode "erc-identd")
 (define-erc-module identd nil
   "This mode launches an identd server on port 8113."
-  ((add-hook 'erc-connect-pre-hook 'erc-identd-start)
+  ((add-hook 'erc-connect-pre-hook 'erc-identd-quickstart)
    (add-hook 'erc-disconnected-hook 'erc-identd-stop))
-  ((remove-hook 'erc-connect-pre-hook 'erc-identd-start)
+  ((remove-hook 'erc-connect-pre-hook 'erc-identd-quickstart)
    (remove-hook 'erc-disconnected-hook 'erc-identd-stop)))
 
 (defun erc-identd-filter (proc string)
@@ -71,12 +85,11 @@ run from inetd.  The idea is to provide a simple identd server
 when you need one, without having to install one globally on your
 system."
   (interactive (list (read-string "Serve identd requests on port: " "8113")))
-  (if (null port)
-      (setq port 8113)
-    (if (stringp port)
-	(setq port (string-to-number port))))
-  (if erc-identd-process
-      (delete-process erc-identd-process))
+  (unless port (setq port erc-identd-port))
+  (when (stringp port)
+    (setq port (string-to-number port)))
+  (when erc-identd-process
+    (delete-process erc-identd-process))
   (setq erc-identd-process
 	(if (fboundp 'make-network-process)
 	    (make-network-process :name "identd"
@@ -89,6 +102,11 @@ system."
 		"identd" (generate-new-buffer " *erc-identd*")
 		port nil 'erc-identd-filter)))))
 
+(defun erc-identd-quickstart (&rest ignored)
+  "Start the identd server with the default port.
+The default port is specified by `erc-identd-port'."
+  (erc-identd-start))
+
 ;;;###autoload
 (defun erc-identd-stop (&rest ignore)
   (interactive)
diff --git a/erc-log.el b/erc-log.el
index e1b47c8..0124219 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -218,7 +218,7 @@ also be a predicate function. To only log when you are not set away, use:
    ;; append, so that 'erc-initialize-log-marker runs first
    (add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append)
    (dolist (buffer (erc-buffer-list))
-     (with-current-buffer buffer (erc-log-setup-logging))))
+     (erc-log-setup-logging buffer)))
   ;; disable
   ((remove-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs)
    (remove-hook 'erc-send-post-hook 'erc-save-buffer-in-logs)
@@ -228,35 +228,38 @@ also be a predicate function. To only log when you are not set away, use:
    (remove-hook 'erc-part-hook 'erc-conditional-save-buffer)
    (remove-hook 'erc-connect-pre-hook 'erc-log-setup-logging)
    (dolist (buffer (erc-buffer-list))
-     (with-current-buffer buffer (erc-log-disable-logging)))))
+     (erc-log-disable-logging buffer))))
 
 (define-key erc-mode-map "\C-c\C-l" 'erc-save-buffer-in-logs)
 
 ;;; functionality referenced from erc.el
-(defun erc-log-setup-logging ()
+(defun erc-log-setup-logging (buffer)
   "Setup the buffer-local logging variables in the current buffer.
-This function is destined to be run from `erc-connect-pre-hook'."
-  (when (erc-logging-enabled)
-    (auto-save-mode -1)
-    (setq buffer-file-name nil)
-    (cond ((boundp 'write-file-functions)
-	   (set (make-local-variable 'write-file-functions)
-		'(erc-save-buffer-in-logs)))
-	  ((boundp 'local-write-file-hooks)
-	   (setq local-write-file-hooks '(erc-save-buffer-in-logs)))
-	  (t
-	   (set (make-local-variable 'write-file-hooks)
-		'(erc-save-buffer-in-logs))))
-    (when erc-log-insert-log-on-open
-      (ignore-errors (insert-file-contents (erc-current-logfile))
-		     (move-marker erc-last-saved-position
-				  (1- (point-max)))))))
-
-(defun erc-log-disable-logging ()
-  "Disable logging in the current buffer."
-  (when (erc-logging-enabled)
-    (setq buffer-offer-save nil
-	  erc-enable-logging nil)))
+This function is destined to be run from `erc-connect-pre-hook'.
+The current buffer is given by BUFFER."
+  (when (erc-logging-enabled buffer)
+    (with-current-buffer buffer
+      (auto-save-mode -1)
+      (setq buffer-file-name nil)
+      (cond ((boundp 'write-file-functions)
+	     (set (make-local-variable 'write-file-functions)
+		  '(erc-save-buffer-in-logs)))
+	    ((boundp 'local-write-file-hooks)
+	     (setq local-write-file-hooks '(erc-save-buffer-in-logs)))
+	    (t
+	     (set (make-local-variable 'write-file-hooks)
+		  '(erc-save-buffer-in-logs))))
+      (when erc-log-insert-log-on-open
+	(ignore-errors (insert-file-contents (erc-current-logfile))
+		       (move-marker erc-last-saved-position
+				    (1- (point-max))))))))
+
+(defun erc-log-disable-logging (buffer)
+  "Disable logging in BUFFER."
+  (when (erc-logging-enabled buffer)
+    (with-current-buffer buffer
+      (setq buffer-offer-save nil
+	    erc-enable-logging nil))))
 
 (defun erc-log-all-but-server-buffers (buffer)
   "Returns t if logging should be enabled in BUFFER.
diff --git a/erc-spelling.el b/erc-spelling.el
index d2e61e8..a7a8535 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -41,12 +41,10 @@
   ;; called AFTER the server buffer is initialized.
   ((add-hook 'erc-connect-pre-hook 'erc-spelling-init)
    (dolist (buffer (erc-buffer-list))
-     (when (buffer-live-p buffer)
-       (with-current-buffer buffer (erc-spelling-init)))))
+     (erc-spelling-init buffer)))
   ((remove-hook 'erc-connect-pre-hook 'erc-spelling-init)
    (dolist (buffer (erc-buffer-list))
-     (when (buffer-live-p buffer)
-       (with-current-buffer buffer (flyspell-mode 0))))))
+     (with-current-buffer buffer (flyspell-mode 0)))))
 
 (defcustom erc-spelling-dictionaries nil
   "An alist mapping buffer names to dictionaries.
@@ -60,20 +58,22 @@ name here."
                                (string :tag "Dictionary"))))
   :group 'erc-spelling)
 
-(defun erc-spelling-init ()
-  "Enable flyspell mode in an ERC buffer."
-  (let ((name (downcase (buffer-name)))
-        (dicts erc-spelling-dictionaries))
-    (when dicts
-      (while (and dicts
-                  (not (string= name (downcase (caar dicts)))))
-        (setq dicts (cdr dicts)))
-      (setq ispell-local-dictionary
-            (if dicts
-                (cadr (car dicts))
-              (erc-with-server-buffer ispell-local-dictionary)))))
-  (setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify)
-  (flyspell-mode 1))
+(defun erc-spelling-init (buffer)
+  "Enable flyspell mode in an ERC buffer.
+The current buffer is given by BUFFER."
+  (with-current-buffer buffer
+    (let ((name (downcase (buffer-name)))
+          (dicts erc-spelling-dictionaries))
+      (when dicts
+        (while (and dicts
+                    (not (string= name (downcase (caar dicts)))))
+          (setq dicts (cdr dicts)))
+        (setq ispell-local-dictionary
+              (if dicts
+                  (cadr (car dicts))
+                (erc-with-server-buffer ispell-local-dictionary)))))
+    (setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify)
+    (flyspell-mode 1)))
 
 (defun erc-spelling-unhighlight-word (word)
   "Unhighlight the given WORD.
diff --git a/erc.el b/erc.el
index a7952f4..d1fe2d3 100644
--- a/erc.el
+++ b/erc.el
@@ -326,7 +326,7 @@ Each function should accept two arguments, NEW-NICK and OLD-NICK."
 
 (defcustom erc-connect-pre-hook '(erc-initialize-log-marker)
   "Hook called just before `erc' calls `erc-connect'.
-Functions are run in the buffer-to-be."
+Functions are passed a buffer as the first argument."
   :group 'erc-hooks
   :type 'hook)
 
@@ -1968,25 +1968,25 @@ Returns the buffer for the given server or channel."
     (setq erc-dbuf
 	  (when erc-log-p
 	    (get-buffer-create (concat "*ERC-DEBUG: " server "*"))))
-    (erc-determine-parameters server port nick full-name)
-
-    ;; Saving log file on exit
-    (run-hooks 'erc-connect-pre-hook)
-
-    (when connect
-      (erc-server-connect erc-session-server erc-session-port))
-    (erc-update-mode-line)
-    (set-marker erc-insert-marker (point))
+    ;; set up prompt
     (unless continued-session
       (goto-char (point-max))
       (insert "\n"))
-    (set-marker (process-mark erc-server-process) (point))
     (if continued-session
 	(goto-char (point-max))
       (set-marker erc-insert-marker (point))
       (erc-display-prompt)
       (goto-char (point-max)))
 
+    (erc-determine-parameters server port nick full-name)
+
+    ;; Saving log file on exit
+    (run-hook-with-args 'erc-connect-pre-hook buffer)
+
+    (when connect
+      (erc-server-connect erc-session-server erc-session-port buffer))
+    (erc-update-mode-line)
+
     ;; Now display the buffer in a window as per user wishes.
     (unless (eq buffer old-buffer)
       (when erc-log-p
@@ -1997,11 +1997,13 @@ Returns the buffer for the given server or channel."
 
     buffer))
 
-(defun erc-initialize-log-marker ()
-  "Initialize the `erc-last-saved-position' marker to a sensible position."
+(defun erc-initialize-log-marker (buffer)
+  "Initialize the `erc-last-saved-position' marker to a sensible position.
+BUFFER is the current buffer."
+  (with-current-buffer buffer
     (setq erc-last-saved-position (make-marker))
     (move-marker erc-last-saved-position
-		 (1- (marker-position erc-insert-marker))))
+		 (1- (marker-position erc-insert-marker)))))
 
 ;; interactive startup
 
@@ -4074,24 +4076,29 @@ See also: `erc-echo-notice-in-user-buffers',
   "Run just after connection.
 
 Set user modes and run `erc-after-connect hook'."
-  (unless erc-server-connected ; only once per session
-    (let ((server (or erc-server-announced-name (erc-response.sender parsed)))
-	  (nick (car (erc-response.command-args parsed ))))
-      (setq erc-server-connected t)
-      (erc-update-mode-line)
-      (erc-set-initial-user-mode nick)
-      (erc-server-setup-periodical-ping)
-      (run-hook-with-args 'erc-after-connect server nick))))
-
-(defun erc-set-initial-user-mode (nick)
-  "If `erc-user-mode' is non-nil for NICK, set the user modes."
-  (when erc-user-mode
-    (let ((mode (if (functionp erc-user-mode)
-		    (funcall erc-user-mode)
-		  erc-user-mode)))
-      (when (stringp mode)
-	(erc-log (format "changing mode for %s to %s" nick mode))
-	(erc-server-send (format "MODE %s %s" nick mode))))))
+  (with-current-buffer (process-buffer proc)
+    (unless erc-server-connected ; only once per session
+      (let ((server (or erc-server-announced-name
+			(erc-response.sender parsed)))
+	    (nick (car (erc-response.command-args parsed)))
+	    (buffer (process-buffer proc)))
+	(setq erc-server-connected t)
+	(erc-update-mode-line)
+	(erc-set-initial-user-mode nick buffer)
+	(erc-server-setup-periodical-ping buffer)
+	(run-hook-with-args 'erc-after-connect server nick)))))
+
+(defun erc-set-initial-user-mode (nick buffer)
+  "If `erc-user-mode' is non-nil for NICK, set the user modes.
+The server buffer is given by BUFFER."
+  (with-current-buffer buffer
+    (when erc-user-mode
+      (let ((mode (if (functionp erc-user-mode)
+		      (funcall erc-user-mode)
+		    erc-user-mode)))
+	(when (stringp mode)
+	  (erc-log (format "changing mode for %s to %s" nick mode))
+	  (erc-server-send (format "MODE %s %s" nick mode)))))))
 
 (defun erc-display-error-notice (parsed string)
   "Display STRING as an error notice.



From MAILER-DAEMON Sun Oct 14 00:51:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPx-0005Y7-TV
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPo-0005O8-I9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPl-0005L3-GW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPl-0005Kt-3h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
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@hcoop.net>) id 1IgvPk-0004Bf-R7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPk-0005QP-2V
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPk-0007C7-5r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPk-0007C7-5r@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:20 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix error in erc-command-no-process-p
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, 14 Oct 2007 04:49:28 -0000

commit c4a6e3578e2cb9780d69f3a3dce2ea394eaa8e41
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 21:23:57 2007 -0400

    Fix error in erc-command-no-process-p
    
    * 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.

diff --git a/ChangeLog b/ChangeLog
index ef5a24d..4c602d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-14  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
 2007-08-12  Michael Olson  <mwolson@gnu.org>
 
 	* erc-identd.el (erc-identd-filter): Instead of sending an EOF
diff --git a/erc.el b/erc.el
index 324a820..fd709ed 100644
--- a/erc.el
+++ b/erc.el
@@ -2496,7 +2496,8 @@ See also `erc-server-send'."
 is not alive, nil otherwise."
   (let ((fun (erc-extract-command-from-line str)))
     (and fun
-	 (get fun 'process-not-needed))))
+	 (symbolp (car fun))
+	 (get (car fun) 'process-not-needed))))
 
 (defun erc-command-name (cmd)
   "For CMD being the function name of a ERC command, something like



From MAILER-DAEMON Sun Oct 14 00:51:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRi-0006pg-78
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPx-0005Vk-6z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPq-0005QP-Kc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPq-0005Q9-DW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
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@hcoop.net>) id 1IgvPq-0004De-5Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPp-0005S9-GU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPp-0007LC-IO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPp-0007LC-IO@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:25 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Sync from Emacs trunk
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, 14 Oct 2007 04:51:18 -0000

commit 66f1dd9702273cdcd34c51d6e5ae04ab96ac5d11
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:08:16 2007 -0400

    Sync from Emacs trunk

diff --git a/ChangeLog b/ChangeLog
index 0a1e009..7342a05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/erc-log.el b/erc-log.el
index e0f5669..856f1dc 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -280,7 +280,7 @@ The current buffer is given by BUFFER."
 
 (defun erc-log-all-but-server-buffers (buffer)
   "Returns t if logging should be enabled in BUFFER.
-Returns nil iff `erc-server-buffer-p' returns t."
+Returns nil if `erc-server-buffer-p' returns t."
   (save-excursion
     (save-window-excursion
       (set-buffer buffer)
diff --git a/erc.el b/erc.el
index f14ea52..e62df39 100644
--- a/erc.el
+++ b/erc.el
@@ -4031,7 +4031,7 @@ and always returns t."
 (defun erc-echo-notice-in-target-buffer (s parsed buffer sender)
   "Echos a private notice in BUFFER, if BUFFER is non-nil.  This
 function is designed to be added to either `erc-echo-notice-hook'
-or `erc-echo-notice-always-hook', and returns non-nil iff BUFFER
+or `erc-echo-notice-always-hook', and returns non-nil if BUFFER
 is non-nil."
   (if buffer
       (progn (erc-display-message parsed nil buffer s) t)
@@ -4055,7 +4055,7 @@ designed to be added to either `erc-echo-notice-hook' or
   "Echos a private notice in the active buffer if the active
 buffer is not the server buffer.  This function is designed to be
 added to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff the active
+`erc-echo-notice-always-hook', and returns non-nil if the active
 buffer is not the server buffer."
   (if (not (eq (erc-server-buffer) (erc-active-buffer)))
       (progn (erc-display-message parsed nil 'active s) t)
@@ -4072,7 +4072,7 @@ designed to be added to either `erc-echo-notice-hook' or
   "Echos a private notice in all of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
 sender is a member.
 
 See also: `erc-echo-notice-in-first-user-buffer',
@@ -4086,7 +4086,7 @@ See also: `erc-echo-notice-in-first-user-buffer',
   "Echos a private notice in BUFFER and in all of the buffers for
 which SENDER is a member.  This function is designed to be added
 to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff there is
+`erc-echo-notice-always-hook', and returns non-nil if there is
 at least one buffer for which the sender is a member or the
 default target.
 
@@ -4102,7 +4102,7 @@ See also: `erc-echo-notice-in-user-buffers',
   "Echos a private notice in one of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
 sender is a member.
 
 See also: `erc-echo-notice-in-user-buffers',
@@ -5041,7 +5041,7 @@ Specifically, return the position of `erc-insert-marker'."
 (defun erc-send-input (input)
   "Treat INPUT as typed in by the user. It is assumed that the input
 and the prompt is already deleted.
-This returns non-nil only iff we actually send anything."
+This returns non-nil only if we actually send anything."
   ;; Handle different kinds of inputs
   (cond
    ;; Ignore empty input



From MAILER-DAEMON Sun Oct 14 00:51:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRi-0006qQ-NY
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOx-00052e-Fd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOa-0004lH-Uf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004k3-6t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
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@hcoop.net>) id 1IgvOX-0003pf-7r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOW-0004yE-GE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOW-0005Ac-If
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOW-0005Ac-If@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:04 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:51:19 -0000

commit 3524f7c08b70b3ebbc2abe149caf2a50fade12e9
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Feb 20 03:57:15 2006 +0000

    Update from CVS
    
    2006-02-19  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
       <C-tab>.
       (erc-button-previous): New function.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-125

diff --git a/ChangeLog b/ChangeLog
index 63c92ea..92cd064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-19  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
+	<C-tab>.
+	(erc-button-previous): New function.
+
 2006-02-15  Michael Olson  <mwolson@gnu.org>
 
 	* NEWS: Add category for ERC 5.2.
diff --git a/erc-button.el b/erc-button.el
index 6d2cd82..e37ca00 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -68,7 +68,7 @@
 
 ;;; Variables
 
-(defconst erc-button-version "$Revision: 1.73 $"
+(defconst erc-button-version "$Revision: 1.74 $"
   "ERC button mode revision.")
 
 (defface erc-button '((t (:bold t)))
@@ -219,6 +219,7 @@ PAR is a number of a regexp grouping whose text will be passed to
         (define-key map (kbd "<button2>") 'erc-button-click-button)
       (define-key map (kbd "<mouse-2>") 'erc-button-click-button))
     (define-key map (kbd "TAB") 'erc-button-next)
+    (define-key map (kbd "<C-tab>") 'erc-button-previous)
     (set-keymap-parent map erc-mode-map)
     map)
   "Local keymap for ERC buttons.")
@@ -430,6 +431,22 @@ call it with the value of the `erc-data' text property."
         (error "No next button"))
       t)))
 
+(defun erc-button-previous ()
+  "Go to the previous button in this buffer."
+  (interactive)
+  (let ((here (point)))
+    (when (< here (erc-beg-of-input-line))
+      (while (and (get-text-property here 'erc-callback)
+                  (not (= here (point-min))))
+        (setq here (1- here)))
+      (while (and (not (get-text-property here 'erc-callback))
+                  (not (= here (point-min))))
+        (setq here (1- here)))
+      (if (> here (point-min))
+          (goto-char here)
+        (error "No previous button"))
+      t)))
+
 (defun erc-browse-emacswiki (thing)
   "Browse to thing in the emacs-wiki."
   (browse-url (concat erc-emacswiki-url thing)))



From MAILER-DAEMON Sun Oct 14 00:51:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRi-0006pt-FQ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRe-0006lP-95
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPP-00059T-2E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPM-00059F-TQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
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@hcoop.net>) id 1IgvPM-00044z-Mr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPL-0005Ga-Pv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPL-0006XR-S2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPL-0006XR-S2@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:55 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--main--0
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, 14 Oct 2007 04:51:18 -0000

commit 0a4814c16f4728df93a60f0cff71790b24fb74ae
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 01:45:15 2007 +0000

    Merged from erc--main--0
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--main--0--patch-133
       Makefile: Fix name of ChangeLog files
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-14

diff --git a/ChangeLog b/ChangeLog
index 2ad7799..825f4a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,8 @@
 	(EXTRAS): New variable containing the contents of our "Emacs 22
 	extras" tarball.
 	(SOURCE): Remove $(TESTING).
-	(MISC): Add COPYING and ChangeLog.2006.
+	(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.
diff --git a/Makefile b/Makefile
index dbd9ab6..93b9914 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED), $(ALLSOURCE))
 TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
 MISC	= AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
-		ChangeLog.2006 ChangeLog.2005 ChangeLog.2004 \
-		ChangeLog.2003 ChangeLog.2002 ChangeLog.2001 \
+		ChangeLog.06 ChangeLog.05 ChangeLog.04 ChangeLog.03 \
+		ChangeLog.02 ChangeLog.01 \
 		servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
diff --git a/NEWS b/NEWS
index bce99d5..9c97183 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,7 @@ MS-DOS operating system.
  o erc-autojoin.el -> erc-join.el
  o erc-complete.el -> erc-hecomplete.el
  o erc-nickserv.el -> erc-services.el
+ o ChangeLog.NNNN -> ChangeLog.NN
 
 ** Header line changes
 



From MAILER-DAEMON Sun Oct 14 00:51:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRi-0006qH-Jg
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRf-0006mN-6Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPM-00057Z-C7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPK-00057R-Mp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPJ-00043w-O3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPI-0005Fc-TR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPI-0006SP-Vq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPI-0006SP-Vq@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:52 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-bbdb: Make it easier to cancel
	merging /whois info
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, 14 Oct 2007 04:51:19 -0000

commit 7f82b9c1e10009f38a76b5685f850ead0eb57720
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 31 04:17:49 2007 +0000

    erc-bbdb: Make it easier to cancel merging /whois info
    
    2007-03-31  Michael Olson  <mwolson@gnu.org>
    
    	* 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-125

diff --git a/ChangeLog b/ChangeLog
index 06500dc..5d4b348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-31  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
diff --git a/erc-bbdb.el b/erc-bbdb.el
index dd8f8b5..fd5535b 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -130,7 +130,7 @@ their \"displayed name\"."
 		     (bbdb-search (bbdb-records) nil nil nil finger)
 		     (unless silent
 		       (bbdb-completing-read-one-record
-			"Merge using record of: "))
+			"Merge using record of (C-g to skip, RET for new): "))
 		     (when create-p
 		       (bbdb-create-internal (or name
 						 "John Doe")
@@ -152,7 +152,7 @@ their \"displayed name\"."
 							   'visible))))))
       (bbdb-display-records (list record)))))
 
-(defun erc-bbdb-insinuate-and-show-entry (create-p proc nick name finger-host silent &optional chan new-nick)
+(defun erc-bbdb-insinuate-and-show-entry-1 (create-p proc nick name finger-host silent &optional chan new-nick)
   (let ((record (erc-bbdb-search-name-and-create
 		 create-p nil nick finger-host silent))) ;; don't search for a name
     (when record
@@ -166,6 +166,13 @@ their \"displayed name\"."
       (erc-bbdb-highlight-record record)
       (erc-bbdb-show-entry record chan proc))))
 
+(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
+	       #'erc-bbdb-insinuate-and-show-entry-1
+	       create-p proc nick name finger-host silent chan new-nick))
+
 (defun erc-bbdb-whois (proc parsed)
   (let (; We could use server name too, probably
 	(nick (second (erc-response.command-args parsed)))
diff --git a/erc.texi b/erc.texi
index a75a986..d098782 100644
--- a/erc.texi
+++ b/erc.texi
@@ -306,17 +306,49 @@ channel on Freenode.
 
 @item Connect to Freenode
 
+Run @kbd{M-x erc}.  Use ``irc.freenode.net'' as the IRC server, ``6667''
+as the port, and choose a nickname.
+
 @item Get used to the interface
 
+Switch to the ``irc.freenode.net:6667'' buffer, if you're not already
+there.  You will see first some messages about checking for ident, and
+then a bunch of other messages that describe the current IRC server.
+
 @item Join the #emacs channel
 
+In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}.  Depending
+on how you've set up ERC, either a new buffer for ``#emacs'' will be
+displayed, or a new buffer called ``#emacs'' will be created in the
+background.  If the latter, switch to the ``#emacs'' buffer.  You will
+see the channel topic and a list of the people who are currently on the
+channel.
+
 @item Register your nickname with Freenode
 
+If you would like to be able to talk with people privately on the
+Freenode network, you will have to ``register'' your nickname.  To do
+so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg
+NickServ register <password>'', replacing ``<password>'' with your
+desired password.  It should tell you that the operation was successful.
+
 @item Talk to people in the channel
 
+If you switch back to the ``#emacs'' buffer, you can type a message, and
+everyone on the channel will see it.
+
 @item Open a query buffer to talk to someone
 
-@c (must identify first in FreeNode)
+If you want to talk with someone in private (this should usually not be
+done for technical help, only for personal questions), type ``/query
+<nick>'', replacing ``<nick>'' with the nickname of the person you would
+like to talk to.  Depending on how ERC is set up, you will either see a
+new buffer with the name of the person, or such a buffer will be created
+in the background and you will have to switch to it.  Begin typing
+messages, and you will be able to have a conversation.
+
+Note that if the other person is not registered, you will not be able to
+talk with them.
 
 @end itemize
 



From MAILER-DAEMON Sun Oct 14 00:51:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRi-0006qY-Sp
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRf-0006mh-ML
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPM-000576-1f
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPK-00056S-2u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPJ-00043j-Iu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPI-0005FW-Ki
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPI-0006Rw-MJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPI-0006Rw-MJ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:52 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-track: Make C-c C-SPC comply
	with Emacs devel rules
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, 14 Oct 2007 04:51:20 -0000

commit 9638facd896730c4ef573ccc4c7922b73bd8cd08
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 30 03:19:13 2007 +0000

    erc-track: Make C-c C-SPC comply with Emacs devel rules
    
    2007-03-30  Michael Olson  <mwolson@gnu.org>
    
    	* FOR-RELEASE: Solve C-c C-SPC keybinding dilemma.
    
    	* erc-track.el (track): Call
    	erc-track-minor-mode-maybe, and tear down the minor mode when
    	disabling.
    	(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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-124

diff --git a/ChangeLog b/ChangeLog
index 82ecfb4..06500dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 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'.
 
@@ -13,11 +15,26 @@
 
 	* erc-track.el (track): Assimilate track-when-active module, since
 	there's no need to have two modules in one file -- an option will
-	do.  Remove track-modified-channels alias.
+	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>
 
diff --git a/FOR-RELEASE b/FOR-RELEASE
index 8d8c486..0a26ba5 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -31,12 +31,17 @@ erc--main--0 branch.
 *** [DONE] Make M-x erc start a session.
 New users never think of using M-x erc-select.
 
-*** Change keybinding definitions for `erc-track-switch-buffer'.
+*** [DONE] Change keybinding definitions for `erc-track-switch-buffer'.
 `C-c C-SPC' / `C-c C-@' is set as a global keybinding and is known to
 conflict with rcirc, for example.  Would setting `erc-track-mode-map'
 work?  Otherwise we could encourage people to use something like
 `C-c e SPC' or `C-c c'.
 
+**** Solution: We went with a global minor mode which does nothing
+but set the global-level C-c C-SPC and C-c C-@ keybindings.  It
+defaults to warning the user if one of their keybindings would be
+overridden, so this solution should be OK to install in Emacs.
+
 *** Make a tarball with the modules that weren't included with
 Emacs 22 that can be downloaded from GNU's ftp server.
 
diff --git a/erc-track.el b/erc-track.el
index baacba5..4a8b673 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -47,6 +47,27 @@
   "Track active buffers and show activity in the modeline."
   :group 'erc)
 
+(defcustom erc-track-enable-keybindings 'ask
+  "Whether to enable the ERC track keybindings, namely:
+`C-c C-SPC' and `C-c C-@', which both do the same thing.
+
+The default is to check to see whether these keys are used
+already: if not, then enable the ERC track minor mode, which
+provides these keys.  Otherwise, do not touch the keys.
+
+This can alternatively be set to either t or nil, which indicate
+respectively always to enable ERC track minor mode or never to
+enable ERC track minor mode.
+
+The reason for using this default value is to both (1) adhere to
+the Emacs development guidelines which say not to touch keys of
+the form C-c C-<something> and also (2) to meet the expectations
+of long-time ERC users, many of whom rely on these keybindings."
+  :group 'erc-track
+  :type '(choice (const :tag "Ask, if used already" ask)
+		 (const :tag "Enable" t)
+		 (const :tag "Disable" nil)))
+
 (defcustom erc-track-visibility t
   "Where do we look for buffers to determine their visibility?
 The value of this variable determines, when a buffer is considered
@@ -489,6 +510,61 @@ START is the minimum length of the name used."
 	 (equal (erc-unique-substrings '("abc" "abcdefg"))
 		'("abc" "abcd"))))))
 
+;;; Minor mode
+
+;; Play nice with other IRC clients (and Emacs development rules) by
+;; making this a minor mode
+
+(defvar erc-track-minor-mode-map (make-sparse-keymap)
+  "Keymap for rcirc track minor mode.")
+
+(define-key erc-track-minor-mode-map (kbd "C-c C-@") 'erc-track-switch-buffer)
+(define-key erc-track-minor-mode-map (kbd "C-c C-SPC")
+  'erc-track-switch-buffer)
+
+;;;###autoload
+(define-minor-mode erc-track-minor-mode
+  "Global minor mode for tracking ERC buffers and showing activity in the
+mode line.
+
+This exists for the sole purpose of providing the C-c C-SPC and
+C-c C-@ keybindings.  Make sure that you have enabled the track
+module, otherwise the keybindings will not do anything useful."
+  :init-value nil
+  :lighter ""
+  :keymap erc-track-minor-mode-map
+  :global t
+  :group 'erc-track)
+
+(defun erc-track-minor-mode-maybe ()
+  "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)))
+    (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-@"))))
+	     (if key
+		 (if (y-or-n-p
+		      (concat "The C-c " key " binding is in use;"
+			      " override it for tracking? "))
+		     (progn
+		       (message (concat "Will change it; set"
+					" `erc-track-enable-keybindings'"
+					" to disable this message"))
+		       (sleep-for 3)
+		       (erc-track-minor-mode 1))
+		   (message (concat "Not changing it; set"
+				    " `erc-track-enable-keybindings'"
+				    " to disable this message"))
+		   (sleep-for 3))
+	       (erc-track-minor-mode 1))))
+	  ((eq erc-track-enable-keybindings t)
+	   (erc-track-minor-mode 1))
+	  (t nil))))
+
 ;;; Module
 
 ;;;###autoload (autoload 'erc-track-mode "erc-track" nil t)
@@ -514,7 +590,9 @@ START is the minimum length of the name used."
 	 (add-hook 'window-configuration-change-hook
 		   'erc-modified-channels-update))
        (add-hook 'erc-insert-post-hook 'erc-track-modified-channels)
-       (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))))
+       (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))
+     ;; enable the tracking keybindings
+     (erc-track-minor-mode-maybe)))
   ;; Disable:
   ((when (boundp 'erc-track-when-inactive)
      (erc-track-remove-from-mode-line)
@@ -533,7 +611,10 @@ START is the minimum length of the name used."
 	 (remove-hook 'window-configuration-change-hook
 		      'erc-modified-channels-update))
        (remove-hook 'erc-disconnected-hook 'erc-modified-channels-update)
-       (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels)))))
+       (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels))
+     ;; disable the tracking keybindings
+     (when erc-track-minor-mode
+       (erc-track-minor-mode -1)))))
 
 (defcustom erc-track-when-inactive nil
   "Enable channel tracking even for visible buffers, if you are
@@ -835,7 +916,9 @@ relative to `erc-track-switch-direction'"
 switch back to the last non-ERC buffer visited.  Next is defined by
 `erc-track-switch-direction', a negative argument will reverse this."
   (interactive "p")
-  (when erc-track-mode
+  (if (not erc-track-mode)
+      (message (concat "Enable the ERC track module if you want to use the"
+		       " tracking minor mode"))
     (cond (erc-modified-channels-alist
 	   ;; if we're not in erc-mode, set this buffer to return to
 	   (unless (eq major-mode 'erc-mode)
@@ -848,12 +931,6 @@ switch back to the last non-ERC buffer visited.  Next is defined by
 		(buffer-live-p erc-track-last-non-erc-buffer))
 	   (switch-to-buffer erc-track-last-non-erc-buffer)))))
 
-;; These bindings are global, because they pop us from any other
-;; buffer to an active ERC buffer!
-
-(global-set-key (kbd "C-c C-@") 'erc-track-switch-buffer)
-(global-set-key (kbd "C-c C-SPC") 'erc-track-switch-buffer)
-
 (provide 'erc-track)
 
 ;;; erc-track.el ends here



From MAILER-DAEMON Sun Oct 14 00:51:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRi-0006qw-W0
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOx-00052m-Ue
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOa-0004l7-5w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004k1-3r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
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@hcoop.net>) id 1IgvOX-0003pn-N4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOX-0004yQ-0D
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOX-0005Bc-3q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOX-0005Bc-3q@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:05 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:51:20 -0000

commit 4f03cfda577ecf49a3ce29a71d0835b645cb3e48
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Feb 20 04:00:14 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-127

diff --git a/erc-capab.el b/erc-capab.el
index 7aea479..15ca9fd 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -67,7 +67,7 @@
 
 (require 'erc)
 
-(defconst erc-capab-version "$Revision: 1.5 $"
+(defconst erc-capab-version "$Revision: 1.6 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:



From MAILER-DAEMON Sun Oct 14 00:51:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRl-0006sn-Gb
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOx-00052P-0t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOW-0004hL-7Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004hB-9F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003oF-Bq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOS-0004wd-O1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:00 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOS-00053c-Q9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:00 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOS-00053c-Q9@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:00 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add autoload for erc-capab-identify.
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, 14 Oct 2007 04:51:22 -0000

commit c38f64fb7b9b092a5a7942b0edfe2f741d20d8d8
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Feb 11 18:30:24 2006 +0000

    Add autoload for erc-capab-identify.
    
    * erc.el (erc-update-modules): Handle erc-capab-identify correctly.  Make
      some requirements shorter, so that it's easier to see why they are
      needed.
    
    * erc-capab.el: Add autoload cookie for capab-identify.
      (erc-capab-send-identify-messages, erc-capab-identify-activate): Minor
      whitespace fix in code.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-111

diff --git a/ChangeLog b/ChangeLog
index d42385f..d35067a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-update-modules): Handle erc-capab-identify
+	correctly.  Make some requirements shorter, so that it's easier to
+	see why they are needed.
+
+	* erc-capab.el: Add autoload cookie for capab-identify.
+	(erc-capab-send-identify-messages, erc-capab-identify-activate):
+	Minor whitespace fix in code.
+
 2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-list.el: Define `list' module which sets the alias
diff --git a/erc-capab.el b/erc-capab.el
index c77f989..9fb1ac9 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -63,9 +63,6 @@
 
 ;;; Todo:
 
-;; Somebody who knows about autoload cookies could please add them where
-;; necessary.
-
 ;;; Code:
 
 (require 'erc)
@@ -89,6 +86,7 @@
 (define-erc-response-handler (290)
   "Handle dancer-ircd CAPAB messages." nil nil)
 
+;;;###autoload (autoload 'erc-capab-identify-mode "erc-capab" nil t)
 (define-erc-module capab-identify nil
   "Handle dancer-ircd's CAPAB IDENTIFY-MSG and IDENTIFY-CTCP."
   ;; append so that `erc-server-parameters' is already set by `erc-server-005'
@@ -137,7 +135,7 @@ These arguments are sent to this function when called as a hook in
   (when (and (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
              ;; could possibly check for IRCD=dancer in `erc-server-parameters'
              ;; instead of looking for specific version names
-	     (assoc "CAPAB" erc-server-parameters))
+             (assoc "CAPAB" erc-server-parameters))
     (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
     (erc-server-send "CAPAB IDENTIFY-MSG")
     (erc-server-send "CAPAB IDENTIFY-CTCP")
@@ -150,7 +148,7 @@ These arguments are sent to this function when called as a hook in
 PROC is the current server's process.
 PARSED is an `erc-parsed' response struct."
   (when (or (string= "IDENTIFY-MSG" (erc-response.contents parsed))
-	    (string= "IDENTIFY-CTCP" (erc-response.contents parsed)))
+            (string= "IDENTIFY-CTCP" (erc-response.contents parsed)))
     (setq erc-capab-identify-activated t)
     (erc-display-message
      parsed 'notice 'active (format "%s activated"
diff --git a/erc.el b/erc.el
index 1a6d0a7..7a488d1 100644
--- a/erc.el
+++ b/erc.el
@@ -1798,15 +1798,14 @@ removed from the list will be disabled."
       (setq req (concat "erc-" (symbol-name mod)))
       (cond
        ;; yuck. perhaps we should bring the filenames into sync?
+       ((string= req "erc-capab-identify")
+	(setq req "erc-capab"))
        ((string= req "erc-completion")
-	(setq req "erc-pcomplete")
-	(setq mod 'completion))
+	(setq req "erc-pcomplete"))
        ((string= req "erc-pcomplete")
-	(setq req "erc-pcomplete")
 	(setq mod 'completion))
        ((string= req "erc-autojoin")
-	(setq req "erc-join")
-	(setq mod 'autojoin)))
+	(setq req "erc-join")))
       (condition-case nil
 	  (require (intern req))
 	(error nil))



From MAILER-DAEMON Sun Oct 14 00:51:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRl-0006t9-Pe
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRh-0006p0-Lj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRg-0006oK-SD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052l-SE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
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@hcoop.net>) id 1IgvOx-0003yF-Kn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOw-00057A-RC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOw-0005sr-T7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOw-0005sr-T7@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:30 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix `erc' to use correct full-name.
	New face for my nick.
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, 14 Oct 2007 04:51:22 -0000

commit f81e4190a4e917a257c63ae51b6475a805101379
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Oct 5 20:13:00 2006 +0000

    Fix `erc' to use correct full-name.  New face for my nick.
    
    * erc.el (erc-my-nick-face): New face.
      (erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
      fixes a bug where the :full-name argument passed to the function
      was not respected.
      (erc-format-my-nick): Use `erc-my-nick-face'.  This should help
      make it easier to find messages you sent in conversations when
      `erc-show-my-nick' is non-nil.
      (erc-compute-server): Doc fix.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-55

diff --git a/ChangeLog b/ChangeLog
index 5c4e6fe..a7a9320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-05  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-my-nick-face): New face.
+	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
+	fixes a bug where the :full-name argument passed to the function
+	was not respected.
+	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
+	make it easier to find messages you sent in conversations when
+	`erc-show-my-nick' is non-nil.
+	(erc-compute-server): Doc fix.
+
 2006-09-11  Michael Olson  <mwolson@gnu.org>
 
 	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
diff --git a/erc.el b/erc.el
index 0297dd7..e7f4d39 100644
--- a/erc.el
+++ b/erc.el
@@ -1173,6 +1173,12 @@ See the variable `erc-command-indicator'."
   "ERC face for errors."
   :group 'erc-faces)
 
+;; same default color as `erc-input-face'
+(defface erc-my-nick-face '((t (:bold t :foreground "brown")))
+  "ERC face for your current nickname in messages sent by you.
+See also `erc-show-my-nick'."
+  :group 'erc-faces)
+
 (defface erc-nick-default-face '((t (:bold t)))
   "ERC nickname default face."
   :group 'erc-faces)
@@ -2120,7 +2126,7 @@ be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
 
   (run-hook-with-args 'erc-before-connect server port nick)
-  (erc-open server port nick erc-user-full-name t password))
+  (erc-open server port nick full-name t password))
 
 (defalias 'erc-select 'erc)
 
@@ -3907,7 +3913,7 @@ See also `erc-format-nick-function'."
 	    (nick (erc-current-nick)))
 	(concat
 	 (erc-propertize open 'face 'erc-default-face)
-	 (erc-propertize nick 'face 'erc-nick-default-face)
+	 (erc-propertize nick 'face 'erc-my-nick-face)
 	 (erc-propertize close 'face 'erc-default-face)))
     (let ((prefix "> "))
       (erc-propertize prefix 'face 'erc-default-face))))
@@ -5460,7 +5466,7 @@ Sets the buffer local variables:
 This tries a number of increasingly more default methods until a
 non-nil value is found.
 
-- SERVER (the argument passwd to this function)
+- SERVER (the argument passed to this function)
 - The `erc-server' option
 - The value of the IRCSERVER environment variable
 - The `erc-default-server' variable"



From MAILER-DAEMON Sun Oct 14 00:51:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRm-0006tk-6g
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRi-0006qN-MB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRh-0006pH-TQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-00053x-Hv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP7-0003zx-BZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP3-000593-8r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:37 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP3-00062P-A5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:37 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP3-00062P-A5@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:37 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update NEWS for recent 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: Sun, 14 Oct 2007 04:51:23 -0000

commit 123d140eae0a104ce8068c1b2102a19c9f32e373
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Dec 27 03:47:52 2006 +0000

    Update NEWS for recent changes
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-74

diff --git a/ChangeLog b/ChangeLog
index 5351d63..9360127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@
 	number of reconnection attempts that ERC will make per server.
 	(erc-server-reconnect-timeout): New option that determines the
 	amount of time, in seconds, that ERC will wait between successive
-	reconnect attempts
+	reconnect attempts.
 	(erc-server-reconnect): New function that reestablishes the
 	current IRC connection.  Move some commands from
 	erc-process-sentinel-1 here.
diff --git a/NEWS b/NEWS
index 03d7be1..e0aeb79 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,20 @@ an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
 `erc-ssl' with `erc-select-ssl' as its alias.  The function that was
 known as `erc' is now `erc-open'.
 
+** New command: /RECONNECT
+This command tries to reconnect to the current IRC server exactly
+once.  It does not work in server buffers (throws an error before the
+command is run), but works in query and channel buffers.
+
+** New options
+
+*** erc-server-reconnect-attempts: Determines the number of
+reconnection attempts that ERC will make per server.
+
+*** erc-server-reconnect-timeout: New option that determines the
+amount of time, in seconds, that ERC will wait between successive
+reconnect attempts.
+
 ** New modules
 
 *** Capab identify (erc-capab.el)



From MAILER-DAEMON Sun Oct 14 00:51:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRl-0006tT-Vy
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRh-0006p8-M2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPW-0005CV-8w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPW-0005CM-5Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
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@hcoop.net>) id 1IgvPT-00045e-5t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPQ-0005I9-Di
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPQ-0006ew-GT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPQ-0006ew-GT@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:00 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make an ELPA package for ERC
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, 14 Oct 2007 04:51:22 -0000

commit 12686f83709818e59089998685c1d117401c3be2
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat May 19 23:08:15 2007 +0000

    Make an ELPA package for ERC
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-19

diff --git a/ChangeLog b/ChangeLog
index 8228b98..b2f86df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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-01  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-version-string): Release ERC 5.2.
diff --git a/Makefile b/Makefile
index 98ff913..365709c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,9 @@ INSTALLINFO = install-info --info-dir=$(INFODIR)
 #the above line.
 #INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR)
 
+# Location of Emacs Lisp Package Archive entries
+ELPA=../../elpa
+
 all: lisp $(MANUAL).info
 
 lisp: $(TARGET) 
@@ -189,3 +192,21 @@ upload-extras:
 	  echo close >> upload.lftp ; \
 	  lftp -f upload.lftp ; \
 	  rm -f upload.lftp)
+
+elpa: $(MANUAL).info
+	rm -fR $(ELPA)/$(SNAPDIR)
+	rm -f $(ELPA)/erc-$(VERSION).tar
+	mkdir -p $(ELPA)/$(SNAPDIR) && chmod 0755 $(ELPA)/$(SNAPDIR)
+	cp $(UNCOMPILED) $(SOURCE) $(ELPA)/$(SNAPDIR)
+	cp -r images $(ELPA)/$(SNAPDIR)
+	cp erc-pkg.el $(ELPA)/$(SNAPDIR)
+	cp $(MANUAL).info $(ELPA)/$(SNAPDIR)
+	echo '* Menu:' > $(ELPA)/$(SNAPDIR)/dir
+	echo >> $(ELPA)/$(SNAPDIR)/dir
+	install-info --section "Emacs" "Emacs" \
+	  --info-dir=$(ELPA)/$(SNAPDIR) \
+	  $(ELPA)/$(SNAPDIR)/$(MANUAL).info
+	rm -f $(ELPA)/$(SNAPDIR)/dir.old
+	test -d $(ELPA)/$(SNAPDIR)/images/.arch-ids && \
+	  rm -R $(ELPA)/$(SNAPDIR)/images/.arch-ids || :
+	(cd $(ELPA) && tar cf erc-$(VERSION).tar $(SNAPDIR))
diff --git a/erc-pkg.el b/erc-pkg.el
new file mode 100644
index 0000000..37d1285
--- /dev/null
+++ b/erc-pkg.el
@@ -0,0 +1,4 @@
+;; ELPA package definition for ERC
+
+(define-package "erc" "5.2"
+  "IRC client that is powerful, modular, and extensible")



From MAILER-DAEMON Sun Oct 14 00:51:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRm-0006tw-Ao
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRk-0006rz-CU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRj-0006qs-1A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-00053z-Sn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP7-00040M-I9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP6-0005AP-IZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP6-00067s-Kz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP6-00067s-Kz@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:40 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix error introduced in patch-83
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, 14 Oct 2007 04:51:25 -0000

commit adce545ae26bc4edc37a5097418918591508219c
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Jan 11 01:33:14 2007 +0000

    Fix error introduced in patch-83
    
    * erc-services.el (erc-nickserv-identify-mode): Fix recursive load error.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-85

diff --git a/ChangeLog b/ChangeLog
index 0ca3bd1..8a48196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@
 
 	* erc-services.el (erc-nickserv-identify-mode): Improve
 	documentation for nick-change option and move higher to fix
-	compiler warning.
+	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
diff --git a/erc-services.el b/erc-services.el
index 63ee77c..ce505f5 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -96,7 +96,9 @@ You can also use M-x erc-nickserv-identify-mode to change modes."
 		 (const nil))
   :set (lambda (sym val)
 	 (set sym val)
-	 (erc-nickserv-identify-mode val)))
+	 ;; avoid recursive load at startup
+	 (when (featurep 'erc-services)
+	   (erc-nickserv-identify-mode val))))
 
 ;;;###autoload (autoload 'erc-services-mode "erc-services" nil t)
 (define-erc-module services nickserv



From MAILER-DAEMON Sun Oct 14 00:51:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRn-0006uu-F3
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRl-0006sc-9S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRj-0006r9-39
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052U-2P
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOw-0003xp-42
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOv-00056C-1e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOu-0005pM-GN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOu-0005pM-GN@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:28 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] M-x erc RET can now be used to start
	ERC.
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, 14 Oct 2007 04:51:25 -0000

commit 9983b9a5c0b4a14d2defe68ee222c4b7bee532f7
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Sun Sep 3 21:38:17 2006 +0000

    M-x erc RET can now be used to start ERC.
    
    * erc.el: (erc-open): Renamed from `erc'.
      (erc-before-connect): Change erc-select to erc.
      (erc): Renamed from `erc-select'.  Use `erc-open'.
      (erc-select): Defined as alias of `erc'.
      (erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
      (erc-select-ssl): Defined as alias of `erc-ssl'.
      (erc-cmd-SERVER): Use `erc'.
      (erc-query, erc-handle-irc-url): Use `erc-open'.
    
    * erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
    
    * erc-menu.el (erc-menu-definition): Use `erc'.
    
    * erc-networks.el: Updated copyright years.
      (erc-server-select): Use keyword arguments when calling `erc'.
    
    * erc.texi (Getting Started, Connecting): Changed erc-select to
      erc.
    
    * README: Changed erc-select to erc.
    
    * NEWS: Added note about these changes.
    
    * FOR-RELEASE: Marked this item as done.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-48

diff --git a/ChangeLog b/ChangeLog
index 4b466ae..edcd70b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2006-09-03  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el: M-x erc RET can now be used to start ERC.
+	(erc-open): Renamed from `erc'.
+	(erc-before-connect): Change erc-select to erc.
+	(erc): Renamed from `erc-select'.  Use `erc-open'.
+	(erc-select): Defined as alias of `erc'.
+	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
+	(erc-select-ssl): Defined as alias of `erc-ssl'.
+	(erc-cmd-SERVER): Use `erc'.
+	(erc-query, erc-handle-irc-url): Use `erc-open'.
+
+	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
+
+	* erc-menu.el (erc-menu-definition): Use `erc'.
+
+	* erc-networks.el: Updated copyright years.
+	(erc-server-select): Use keyword arguments when calling `erc'.
+
+	* erc.texi (Getting Started, Connecting): Changed erc-select to
+	erc.
+
+	* README: Changed erc-select to erc.
+
+	* NEWS: Added note about these changes.
+
+	* FOR-RELEASE: Marked this item as done.
+
 2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
diff --git a/FOR-RELEASE b/FOR-RELEASE
index c37607d..76a4f9a 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -19,7 +19,7 @@ other IRC clients, like Circe.
 
 ** Source
 
-*** Make M-x erc start a session.
+*** [DONE] Make M-x erc start a session.
 New users never think of using M-x erc-select.
 
 *** Change keybinding definitions for `erc-track-switch-buffer'.
diff --git a/NEWS b/NEWS
index ec5c217..4c69e9e 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ ERC NEWS                                                       -*- outline -*-
 
 * Changes in ERC 5.2 (unreleased)
 
+** M-x erc RET now starts ERC.
+`erc-select' has been changed to `erc'.  `erc-select' still remains as
+an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
+`erc-ssl' with `erc-select-ssl' as its alias.  The function that was
+known as `erc' is now `erc-open'.
+
 ** New modules
 
 *** Capab identify (erc-capab.el)
diff --git a/README b/README
index e06df1d..33b30e4 100644
--- a/README
+++ b/README
@@ -24,8 +24,8 @@ http://www.emacswiki.org/cgi-bin/wiki.pl?LoadPath
 Usage
 -----
 
-Use M-x erc-select to connect to a server.  You can connect to
-multiple servers.
+Use M-x erc to connect to a server.  You can connect to multiple
+servers.
 
 Customization
 -------------
diff --git a/erc-backend.el b/erc-backend.el
index e9e0596..442b60c 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -552,8 +552,8 @@ Conditionally try to reconnect and take appropriate action."
     (if (erc-server-reconnect-p event)
         ;; Yuck, this should perhaps funcall
         ;; erc-server-reconnect-function with no args
-        (erc erc-session-server erc-session-port erc-server-current-nick
-             erc-session-user-full-name t erc-session-password)
+        (erc-open erc-session-server erc-session-port erc-server-current-nick
+                  erc-session-user-full-name t erc-session-password)
       ;; terminate, do not reconnect
       (erc-display-message nil 'error (current-buffer)
                            'terminated ?e event))))
@@ -1085,11 +1085,11 @@ add things to `%s' instead."
         (let* ((str (cond
                      ;; If I have joined a channel
                      ((erc-current-nick-p nick)
-                      (setq buffer (erc erc-session-server erc-session-port
-                                        nick erc-session-user-full-name
-                                        nil nil
-                                        erc-default-recipients chnl
-                                        erc-server-process))
+                      (setq buffer (erc-open erc-session-server erc-session-port
+                                             nick erc-session-user-full-name
+                                             nil nil
+                                             erc-default-recipients chnl
+                                             erc-server-process))
                       (when buffer
                         (set-buffer buffer)
                         (erc-add-default-channel chnl)
diff --git a/erc-menu.el b/erc-menu.el
index a398e35..2556edf 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -32,7 +32,7 @@
 
 (defvar erc-menu-definition
   (list "ERC"
-	["Connect to server..." erc-select t]
+	["Connect to server..." erc t]
 	["Disconnect from server..." erc-quit-server erc-server-connected]
 	"-"
 	["List channels..." erc-list-channels
diff --git a/erc-networks.el b/erc-networks.el
index 387ddbb..fb7c92a 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -1,6 +1,6 @@
 ;;; erc-networks.el --- IRC networks
 
-;; Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Keywords: comm
@@ -809,7 +809,7 @@ As an example:
 		    (erc-ports-list (nth 3 srv))
 		  (list (nth 3 srv))))
 	 (port (nth (random (length ports)) ports)))
-    (erc host port erc-nick erc-user-full-name t)))
+    (erc :server host :port port)))
 
 ;;; The following experimental
 ;; It does not work yet, help me with it if you
diff --git a/erc.el b/erc.el
index d1fe2d3..aac6edb 100644
--- a/erc.el
+++ b/erc.el
@@ -57,7 +57,7 @@
 
 ;; To connect to an IRC server, do
 ;;
-;; M-x erc-select RET
+;; M-x erc RET
 ;;
 ;; After you are connected to a server, you can use C-h m or have a look at
 ;; the IRC menu.
@@ -1888,8 +1888,8 @@ removed from the list will be disabled."
 	     (display-buffer buffer)
 	   (switch-to-buffer buffer)))))
 
-(defun erc (&optional server port nick full-name
-		      connect passwd tgt-list channel process)
+(defun erc-open (&optional server port nick full-name
+			   connect passwd tgt-list channel process)
   "ERC is a powerful, modular, and extensible IRC client.
 
 Connect to SERVER on PORT as NICK with FULL-NAME.
@@ -2032,7 +2032,7 @@ If no buffer matches, return nil."
 
 (defcustom erc-before-connect nil
   "Hook called before connecting to a server.
-This hook gets executed before `erc-select' actually invokes `erc-mode'
+This hook gets executed before `erc' actually invokes `erc-mode'
 with your input data.  The functions in here get called with three
 parameters, SERVER, PORT and NICK."
   :group 'erc-hooks
@@ -2098,11 +2098,11 @@ functions in here get called with the parameters SERVER and NICK."
     (list :server server :port port :nick nick :password passwd)))
 
 ;;;###autoload
-(defun* erc-select (&key (server (erc-compute-server))
-			 (port   (erc-compute-port))
-			 (nick   (erc-compute-nick))
-			 password
-			 (full-name (erc-compute-full-name)))
+(defun* erc (&key (server (erc-compute-server))
+		  (port   (erc-compute-port))
+		  (nick   (erc-compute-nick))
+		  password
+		  (full-name (erc-compute-full-name)))
   "Select connection parameters and run ERC.
 Non-interactively, it takes keyword arguments
    (server (erc-compute-server))
@@ -2113,7 +2113,7 @@ Non-interactively, it takes keyword arguments
 
 That is, if called with
 
-   (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
+   (erc :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
 
 server and full-name will be set to those values, whereas
 `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
@@ -2121,15 +2121,18 @@ be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
 
   (run-hook-with-args 'erc-before-connect server port nick)
-  (erc server port nick erc-user-full-name t password))
+  (erc-open server port nick erc-user-full-name t password))
 
+(defalias 'erc-select 'erc)
 
-(defun erc-select-ssl (&rest r)
+(defun erc-ssl (&rest r)
   "Interactively select SSL connection parameters and run ERC.
-Arguments are as to erc-select."
+Arguments are the same as for `erc'."
   (interactive (erc-select-read-args))
   (let ((erc-server-connect-function 'erc-open-ssl-stream))
-    (apply 'erc-select r)))
+    (apply 'erc r)))
+
+(defalias 'erc-select-ssl 'erc-ssl)
 
 (defun erc-open-ssl-stream (name buffer host port)
   "Open an SSL stream to an IRC server.
@@ -3178,7 +3181,7 @@ the message given by REASON."
   "Connect to SERVER, leaving existing connection intact."
   (erc-log (format "cmd: SERVER: %s" server))
   (condition-case nil
-      (erc-select :server server :nick (erc-current-nick))
+      (erc :server server :nick (erc-current-nick))
     (error
      (message "Cannot find host %s." server)
      (beep)))
@@ -3695,15 +3698,15 @@ To change how this query window is displayed, use `let' to bind
 	       (buffer-live-p server)
 	       (set-buffer server))
     (error "Couldn't switch to server buffer"))
-  (let ((buf (erc erc-session-server
-		  erc-session-port
-		  (erc-current-nick)
-		  erc-session-user-full-name
-		  nil
-		  nil
-		  (list target)
-		  target
-		  erc-server-process)))
+  (let ((buf (erc-open erc-session-server
+		       erc-session-port
+		       (erc-current-nick)
+		       erc-session-user-full-name
+		       nil
+		       nil
+		       (list target)
+		       target
+		       erc-server-process)))
     (unless buf
       (error "Couldn't open query window"))
     (erc-update-mode-line)
@@ -6224,10 +6227,10 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
     (with-current-buffer (or server-buffer (current-buffer))
       (if (and server-buffer channel)
 	  (erc-cmd-JOIN channel)
-	(erc host port (or user (erc-compute-nick)) (erc-compute-full-name)
-	     (not server-buffer) password nil channel
-	     (when server-buffer
-	       (get-buffer-process server-buffer)))))))
+	(erc-open host port (or user (erc-compute-nick)) (erc-compute-full-name)
+		  (not server-buffer) password nil channel
+		  (when server-buffer
+		    (get-buffer-process server-buffer)))))))
 
 (provide 'erc)
 
diff --git a/erc.texi b/erc.texi
index ac41ca1..2a28e5b 100644
--- a/erc.texi
+++ b/erc.texi
@@ -276,7 +276,7 @@ itself.  An example follows.
 (require 'erc)
 @end lisp
 
-Once ERC is loaded, the command @kbd{M-x erc-select} will start ERC and
+Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
 prompt for the server to connect to.
 
 @c PRE5_2: Sample session, including:
@@ -525,11 +525,11 @@ Translate morse code in messages
 @section Connecting to an IRC Server
 @cindex connecting
 
-The easiest way to connect to an IRC server is to call
-@kbd{M-x erc-select}.  If you want to assign this function to a
-keystroke, the following will help you figure out its parameters.
+The easiest way to connect to an IRC server is to call @kbd{M-x erc}.
+If you want to assign this function to a keystroke, the following will
+help you figure out its parameters.
 
-@defun erc-select
+@defun erc
 Select connection parameters and run ERC.
 Non-interactively, it takes the following keyword arguments.
 
@@ -548,7 +548,7 @@ That is, if called with the following arguments, @var{server} and
 parameters.
 
 @example
-(erc-select :server "irc.freenode.net" :full-name "Harry S Truman")
+(erc :server "irc.freenode.net" :full-name "Harry S Truman")
 @end example
 @end defun
 



From MAILER-DAEMON Sun Oct 14 00:51:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRn-0006vM-Pj
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRl-0006sg-Dk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRk-0006s7-O6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-00053w-5e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP7-0003zF-67
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP2-00058x-VP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP2-00061u-W1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:37 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP2-00061u-W1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:36 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Implement limiting of reconnect
	attempts
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, 14 Oct 2007 04:51:25 -0000

commit b5d3beecc728b7d769fa8cd08ce70e817d4f5b94
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Dec 27 01:48:48 2006 +0000

    Implement limiting of reconnect attempts
    
    * erc-backend.el (erc-server-reconnect-count): New server variable that
      keeps track of reconnection attempts.
      (erc-server-reconnect-attempts): New option that determines the number
      of reconnection attempts that ERC will make per server.
      (erc-server-reconnect-timeout): New option that determines the amount
      of time, in seconds, that ERC will wait between successive reconnect
      attempts
      (erc-server-reconnect): Move additional commands from
      erc-process-sentinel-1 here.
      (erc-server-reconnect-p): Make this a defsubst, since I'm worried about
      the current buffer changing from underneath us.  Implement limit of
      number of reconnect attempts.
      (erc-process-sentinel-1): If we have been disconnected, loop until we
      either reconnect or run out of attempts.
    
    * erc.el (erc-cmd-RECONNECT): Make this its own function, instead of just
      an alias, since we should reset the reconnect count here.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-73

diff --git a/ChangeLog b/ChangeLog
index c030889..5351d63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,23 @@
 2006-12-27  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-cmd-RECONNECT): New command which is an alias to
+	* erc.el (erc-cmd-RECONNECT): New command that calls
 	erc-server-reconnect.
 
-	* erc-backend.el (erc-server-reconnect): New function that
-	reestablishes the current IRC connection.
-	(erc-process-sentinel-1): Use it.
-	(erc-server-reconnect-p): Move higher.
+	* erc-backend.el (erc-server-reconnect-count): New server variable
+	that keeps track of reconnection attempts.
+	(erc-server-reconnect-attempts): New option that determines the
+	number of reconnection attempts that ERC will make per server.
+	(erc-server-reconnect-timeout): New option that determines the
+	amount of time, in seconds, that ERC will wait between successive
+	reconnect attempts
+	(erc-server-reconnect): New function that reestablishes the
+	current IRC connection.  Move some commands from
+	erc-process-sentinel-1 here.
+	(erc-process-sentinel-1): If we have been disconnected, loop until
+	we either reconnect or run out of attempts.
+	(erc-server-reconnect-p): Move higher and make this a defsubst,
+	since I'm worried about the current buffer changing from
+	underneath us.  Implement limit of number of reconnect attempts..
 
 	* erc.texi (Getting Started): Update for /RECONNECT command.
 
diff --git a/erc-backend.el b/erc-backend.el
index 67cc21a..3f653a1 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -185,6 +185,10 @@ If you wish to determine whether an IRC connection is currently
 active, use the `erc-server-process-alive' function instead.")
 (make-variable-buffer-local 'erc-server-connected)
 
+(defvar erc-server-reconnect-count 0
+  "Number of times we have failed to reconnect to the current server.")
+(make-variable-buffer-local 'erc-server-reconnect-count)
+
 (defvar erc-server-quitting nil
   "Non-nil if the user requests a quit.")
 (make-variable-buffer-local 'erc-server-quitting)
@@ -278,6 +282,23 @@ Reconnection will happen automatically for any unexpected disconnection."
   :group 'erc-server
   :type 'boolean)
 
+(defcustom erc-server-reconnect-attempts 2
+  "The number of times that ERC will attempt to reestablish a
+broken connection, or t to always attempt to reconnect.
+
+This only has an effect if `erc-server-auto-reconnect' is non-nil."
+  :group 'erc-server
+  :type '(choice (const :tag "Always reconnect" t)
+                 integer))
+
+(defcustom erc-server-reconnect-timeout 1
+  "The amount of time, in seconds, that ERC will wait between
+successive reconnect attempts.
+
+If a key is pressed while ERC is waiting, it will stop waiting."
+  :group 'erc-server
+  :type 'number)
+
 (defcustom erc-split-line-length 440
   "*The maximum length of a single message.
 If a message exceeds this size, it is broken into multiple ones.
@@ -508,6 +529,10 @@ Make sure you are in an ERC buffer when running this."
                  (buffer-live-p server))
       (error "Couldn't switch to server buffer"))
     (with-current-buffer server
+      (erc-update-mode-line)
+      (erc-set-active-buffer (current-buffer))
+      (setq erc-server-last-sent-time 0)
+      (setq erc-server-lines-sent 0)
       (erc-open erc-session-server erc-session-port erc-server-current-nick
                 erc-session-user-full-name t erc-session-password))))
 
@@ -540,11 +565,16 @@ Make sure you are in an ERC buffer when running this."
                                (match-end 0))))
             (erc-parse-server-response process line)))))))
 
-(defun erc-server-reconnect-p (event)
+(defsubst erc-server-reconnect-p (event)
   "Return non-nil if ERC should attempt to reconnect automatically.
 EVENT is the message received from the closed connection process."
   (and erc-server-auto-reconnect
        (not erc-server-banned)
+       ;; make sure we don't infinitely try to reconnect, unless the
+       ;; user wants that
+       (or (eq erc-server-reconnect-attempts t)
+           (and (integerp erc-server-reconnect-attempts)
+                (< erc-server-reconnect-count erc-server-reconnect-attempts)))
        (or erc-server-timed-out
            (not (string-match "^deleted" event)))
        ;; open-network-stream-nowait error for connection refused
@@ -562,19 +592,26 @@ Conditionally try to reconnect and take appropriate action."
           (set-buffer-modified-p nil)
           (kill-buffer (current-buffer))))
     ;; unexpected disconnect
-    (erc-display-message nil 'error (current-buffer)
-                         (if (erc-server-reconnect-p event)
-                             'disconnected
-                           'disconnected-noreconnect))
-    (erc-update-mode-line)
-    (erc-set-active-buffer (current-buffer))
-    (setq erc-server-last-sent-time 0)
-    (setq erc-server-lines-sent 0)
-    (if (erc-server-reconnect-p event)
-        (erc-server-reconnect)
-      ;; terminate, do not reconnect
-      (erc-display-message nil 'error (current-buffer)
-                           'terminated ?e event))))
+    (let ((again t))
+      (while again
+        (setq again nil)
+        (erc-display-message nil 'error (current-buffer)
+                             (if (erc-server-reconnect-p event)
+                                 'disconnected
+                               'disconnected-noreconnect))
+        (if (erc-server-reconnect-p event)
+            (condition-case err
+                (progn
+                  (erc-server-reconnect)
+                  (setq erc-server-reconnect-count 0))
+              (error (when (integerp erc-server-reconnect-attempts)
+                       (setq erc-server-reconnect-count
+                             (1+ erc-server-reconnect-count))
+                       (sit-for erc-server-reconnect-timeout)
+                       (setq again t))))
+          ;; terminate, do not reconnect
+          (erc-display-message nil 'error (current-buffer)
+                               'terminated ?e event))))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."
diff --git a/erc.el b/erc.el
index 77d2faa..5aea199 100644
--- a/erc.el
+++ b/erc.el
@@ -3195,7 +3195,11 @@ the message given by REASON."
 (defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
 (put 'erc-cmd-GQUIT 'do-not-parse-args t)
 
-(defalias 'erc-cmd-RECONNECT 'erc-server-reconnect)
+(defun erc-cmd-RECONNECT ()
+  "Try to reconnect to the current IRC server."
+  (setq erc-server-reconnect-count 0)
+  (erc-server-reconnect)
+  t)
 
 (defun erc-cmd-SERVER (server)
   "Connect to SERVER, leaving existing connection intact."



From MAILER-DAEMON Sun Oct 14 00:51:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRq-0006xU-9b
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRn-0006v2-JR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRl-0006tL-Rh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-00053v-5S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP7-0003zP-9p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP2-00058o-J4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP2-00061P-Ls
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP2-00061P-Ls@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:36 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add /RECONNECT command
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, 14 Oct 2007 04:51:28 -0000

commit 7bc088a743aa51e23d97367b53397d9acb850577
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Dec 27 00:37:43 2006 +0000

    Add /RECONNECT command
    
    2006-12-27  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-cmd-RECONNECT): New command which is an alias to
    	erc-server-reconnect.
    
    	* erc-backend.el (erc-server-reconnect): New function that
    	reestablishes the current IRC connection.
    	(erc-process-sentinel-1): Use it.
    	(erc-server-reconnect-p): Move higher.
    
    	* erc.texi (Getting Started): Update for /RECONNECT command.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-72

diff --git a/ChangeLog b/ChangeLog
index 2c8c8b2..c030889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-12-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-cmd-RECONNECT): New command which is an alias to
+	erc-server-reconnect.
+
+	* erc-backend.el (erc-server-reconnect): New function that
+	reestablishes the current IRC connection.
+	(erc-process-sentinel-1): Use it.
+	(erc-server-reconnect-p): Move higher.
+
+	* erc.texi (Getting Started): Update for /RECONNECT command.
+
 2006-12-26  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-open): Restore old point correctly, or at least get
diff --git a/erc-backend.el b/erc-backend.el
index 086335f..67cc21a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -500,6 +500,17 @@ We will store server variables in the buffer given by BUFFER."
       (erc-display-message nil nil buffer "Opening connection..\n")
     (erc-login)))
 
+(defun erc-server-reconnect ()
+"Reestablish the current IRC connection.
+Make sure you are in an ERC buffer when running this."
+  (let ((server (erc-server-buffer)))
+    (unless (and server
+                 (buffer-live-p server))
+      (error "Couldn't switch to server buffer"))
+    (with-current-buffer server
+      (erc-open erc-session-server erc-session-port erc-server-current-nick
+                erc-session-user-full-name t erc-session-password))))
+
 (defun erc-server-filter-function (process string)
   "The process filter for the ERC server."
   (with-current-buffer (process-buffer process)
@@ -529,6 +540,16 @@ We will store server variables in the buffer given by BUFFER."
                                (match-end 0))))
             (erc-parse-server-response process line)))))))
 
+(defun erc-server-reconnect-p (event)
+  "Return non-nil if ERC should attempt to reconnect automatically.
+EVENT is the message received from the closed connection process."
+  (and erc-server-auto-reconnect
+       (not erc-server-banned)
+       (or erc-server-timed-out
+           (not (string-match "^deleted" event)))
+       ;; open-network-stream-nowait error for connection refused
+       (not (string-match "^failed with code 111" event))))
+
 (defun erc-process-sentinel-1 (event)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.
 Determine whether user has quit or whether erc has been terminated.
@@ -550,24 +571,11 @@ Conditionally try to reconnect and take appropriate action."
     (setq erc-server-last-sent-time 0)
     (setq erc-server-lines-sent 0)
     (if (erc-server-reconnect-p event)
-        ;; Yuck, this should perhaps funcall
-        ;; erc-server-reconnect-function with no args
-        (erc-open erc-session-server erc-session-port erc-server-current-nick
-                  erc-session-user-full-name t erc-session-password)
+        (erc-server-reconnect)
       ;; terminate, do not reconnect
       (erc-display-message nil 'error (current-buffer)
                            'terminated ?e event))))
 
-(defun erc-server-reconnect-p (event)
-  "Return non-nil if ERC should attempt to reconnect automatically.
-EVENT is the message received from the closed connection process."
-  (and erc-server-auto-reconnect
-       (not erc-server-banned)
-       (or erc-server-timed-out
-           (not (string-match "^deleted" event)))
-       ;; open-network-stream-nowait error for connection refused
-       (not (string-match "^failed with code 111" event))))
-
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."
   (with-current-buffer (process-buffer cproc)
diff --git a/erc.el b/erc.el
index 8be1a71..77d2faa 100644
--- a/erc.el
+++ b/erc.el
@@ -3195,6 +3195,8 @@ the message given by REASON."
 (defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
 (put 'erc-cmd-GQUIT 'do-not-parse-args t)
 
+(defalias 'erc-cmd-RECONNECT 'erc-server-reconnect)
+
 (defun erc-cmd-SERVER (server)
   "Connect to SERVER, leaving existing connection intact."
   (erc-log (format "cmd: SERVER: %s" server))
diff --git a/erc.texi b/erc.texi
index 2a28e5b..1c203cd 100644
--- a/erc.texi
+++ b/erc.texi
@@ -279,6 +279,11 @@ itself.  An example follows.
 Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
 prompt for the server to connect to.
 
+If the connection goes away at some point, ERC will try to reconnect
+automatically.  If it fails to reconnect, and you want to try to
+manually reestablish the connection at some later point, switch to an
+ERC buffer and run the /RECONNECT command.
+
 @c PRE5_2: Sample session, including:
 @c - connect to Freenode
 @c - /join #emacs



From MAILER-DAEMON Sun Oct 14 00:51:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRq-0006xC-2X
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRn-0006uk-AH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRl-0006su-IQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052i-LK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOx-0003y7-9Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOw-000574-Fg
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOw-0005sM-HG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOw-0005sM-HG@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:30 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Apply the correct version of the
	previous fix.
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, 14 Oct 2007 04:51:27 -0000

commit f73f49d20f9a67cbf12fb065fb3a34eaeaba93e8
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Sep 11 22:47:40 2006 +0000

    Apply the correct version of the previous fix.
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-54

diff --git a/erc-nicklist.el b/erc-nicklist.el
index 669f055..7a94d2b 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -207,8 +207,9 @@ Seach for the BBDB record of this contact.  If not found, return nil."
 	   (channels (erc-server-user-buffers server-user))
 	   (op       (erc-channel-user-op channel-user))
 	   (voice    (erc-channel-user-voice channel-user))
-	   (bbdb-nick (or (erc-nicklist-search-for-nick (concat login "@" host))
-			  "")
+	   (bbdb-nick (or (erc-nicklist-search-for-nick
+			   (concat login "@" host))
+			  ""))
 	   (away-status (if voice "" "\n(Away)"))
 	   (balloon-text (concat bbdb-nick (if (string= "" bbdb-nick)
 					       "" "\n")
@@ -225,7 +226,7 @@ Seach for the BBDB record of this contact.  If not found, return nil."
 			      'erc-nicklist-channel channel
 			      'help-echo balloon-text)
 	      "\n")))
-  (erc-nicklist-mode)))
+  (erc-nicklist-mode))
 
 
 (defun erc-nicklist ()



From MAILER-DAEMON Sun Oct 14 00:51:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRq-0006xn-FW
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPx-0005XB-6w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPu-0005Ta-4a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPu-0005TW-1u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
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@hcoop.net>) id 1IgvPt-0004Ef-RB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPt-0005TQ-5D
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPt-0007Rh-8k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPt-0007Rh-8k@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:29 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Sync from emacs22
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, 14 Oct 2007 04:51:29 -0000

commit 6156ecd95fd924680ae6dce71fdafb23f4818df6
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Sep 19 07:12:44 2007 -0400

    Sync from emacs22

diff --git a/ChangeLog b/ChangeLog
index f2ea5f1..fec7357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>  (tiny change)
 
 	* erc.texi (Special-Features): Fix small typo.
 
@@ -7,7 +7,7 @@
 	* 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>
+2007-09-11  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
 
 	* erc-sound.el: Fix typo in setting up instructions.
 



From MAILER-DAEMON Sun Oct 14 00:51:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRq-0006y7-Np
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRo-0006wJ-U4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRn-0006v9-Mn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052h-LI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOw-0003xz-RU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOv-00056j-Rc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOv-0005rM-Rv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOv-0005rM-Rv@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:29 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Sync with 5.2 release branch
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, 14 Oct 2007 04:51:29 -0000

commit 15137134246791069c725acc3be7ce2f359713d0
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Sep 11 03:36:35 2006 +0000

    Sync with 5.2 release branch
    
     * Add copyright notices to the ChangeLog files, as in erc--emacs--22.
    
     * Add "2006" to all copyright years, since the new rules say that we
       have to include every year that we have a release, starting with 2006.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-52

diff --git a/ChangeLog b/ChangeLog
index da17a54..52b2316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -464,7 +464,9 @@
 
 2006-07-05  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-modules): Add the `page' module to the list.
+	* erc.el (erc-modules): Use `set' instead of `set-default', since
+	this setting should never be buffer-local.  Add the `list' and
+	`page' modules to the list.
 
 	* erc.texi (Modules): Add entries for `list' and `page' modules.
 	Change "spell" to "spelling".
@@ -753,6 +755,17 @@
 
 	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 
+2006-02-12  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el,
+	erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el,
+	erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el,
+	erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el,
+	erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el,
+	erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el,
+	erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el: Add
+	2006 to copyright years, to comply with the changed guidelines.
+
 2006-02-11  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-update-modules): Handle erc-capab-identify
@@ -1305,8 +1318,13 @@
 	* erc-track.el (erc-track-remove-from-mode-line): Handle case
 	where global-mode-string is not a list.  Emacs22 permits this.
 
+
 See ChangeLog.05 for earlier changes.
 
+    Copyright (C) 2006 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.01 b/ChangeLog.01
index 3029e5e..5d6bdf8 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -1035,6 +1035,10 @@
 
 	* erc-speak.el 1.1, erc.el 1.1: New file.
 
+    Copyright (C) 2001 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.02 b/ChangeLog.02
index 297681e..297b9d3 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -2596,6 +2596,10 @@
 
 See ChangeLog.01 for earlier changes.
 
+    Copyright (C) 2002 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.03 b/ChangeLog.03
index bc3b1b7..707ceb3 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -2140,6 +2140,10 @@
 
 See ChangeLog.02 for earlier changes.
 
+    Copyright (C) 2003 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.04 b/ChangeLog.04
index 82ee3f7..77cf045 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -2069,6 +2069,10 @@
 
 See ChangeLog.03 for earlier changes.
 
+    Copyright (C) 2004 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.05 b/ChangeLog.05
index 5a3f69d..b91395b 100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@ -1217,6 +1217,10 @@
 
 See ChangeLog.04 for earlier changes.
 
+    Copyright (C) 2005 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index ff9bbd9..d04fe78 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -1,6 +1,6 @@
 ;;; erc-ezbounce.el ---  Handle EZBounce bouncer commands
 
-;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: comm
diff --git a/erc-fill.el b/erc-fill.el
index d318864..9552ce8 100644
--- a/erc-fill.el
+++ b/erc-fill.el
@@ -1,6 +1,6 @@
 ;;; erc-fill.el --- Filling IRC messages in various ways
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006 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 c844af5..f6d32ee 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -1,6 +1,7 @@
 ;; erc-goodies.el --- Collection of ERC modules
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 
diff --git a/erc-hecomplete.el b/erc-hecomplete.el
index 763d75c..85a8156 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 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006 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 792a595..108ed71 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -1,6 +1,6 @@
 ;;; erc-ibuffer.el --- ibuffer integration with ERC
 
-;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/erc-imenu.el b/erc-imenu.el
index bf2d5ef..e897a9d 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 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/erc-join.el b/erc-join.el
index 3da50a5..86b79c5 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: irc
diff --git a/erc-lang.el b/erc-lang.el
index 20c89a8..04cfbe9 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/erc-list.el b/erc-list.el
index fe83967..38ea0ec 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -1,6 +1,6 @@
 ;;; erc-list.el --- Provide a faster channel listing mechanism
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 ;; Copyright (C) 2004 Brian Palmer
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
diff --git a/erc-match.el b/erc-match.el
index 5cc8eca..db3e770 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -1,6 +1,6 @@
 ;;; erc-match.el --- Highlight messages matching certain regexps
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: comm, faces
diff --git a/erc-netsplit.el b/erc-netsplit.el
index 4e30df9..59dd489 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/erc-notify.el b/erc-notify.el
index 1c9fc99..f21090d 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Keywords: comm
diff --git a/erc-page.el b/erc-page.el
index d8e6770..4c6b86b 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 Free Software Foundation
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index 31de8a4..49b929d 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 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 3e60d7a..7a22954 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 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006 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 cabb8e2..87707e6 100644
--- a/erc-ring.el
+++ b/erc-ring.el
@@ -1,6 +1,6 @@
 ;; erc-ring.el -- Command history handling for erc using ring.el
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: comm
diff --git a/erc-services.el b/erc-services.el
index 6769487..c8bac7f 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -1,6 +1,6 @@
 ;;; erc-services.el --- Identify to NickServ
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-speedbar.el b/erc-speedbar.el
index 2de2c57..7bc8546 100644
--- a/erc-speedbar.el
+++ b/erc-speedbar.el
@@ -1,6 +1,6 @@
 ;;; erc-speedbar.el --- Speedbar support for ERC
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006 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 a7a8535..612675f 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -1,6 +1,6 @@
 ;;; erc-spelling.el --- use flyspell in ERC
 
-;; Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Keywords: irc
diff --git a/erc-track.el b/erc-track.el
index 209d54a..3c8f93a 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -1,6 +1,6 @@
 ;;; erc-track.el --- Track modified channel buffers
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, faces
diff --git a/erc-truncate.el b/erc-truncate.el
index 49cd20d..7a1feaa 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 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006 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 84562e7..d00dfc5 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 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes
diff --git a/erc.el b/erc.el
index bfafba3..0297dd7 100644
--- a/erc.el
+++ b/erc.el
@@ -1807,6 +1807,9 @@ removed from the list will be disabled."
      :tag
      "Mark unidentified users on freenode and other servers supporting CAPAB"
      capab-identify)
+    (const :tag "Complete nicknames and commands (programmable)"
+	   completion)
+    (const :tag "Complete nicknames and commands (old)" hecomplete)
     (const :tag "Wrap long lines" fill)
     (const :tag "Launch an identd server on port 8113" identd)
     (const :tag "Highlight or remove IRC control characters"
@@ -1817,12 +1820,8 @@ removed from the list will be disabled."
     (const :tag "Detect netsplits" netsplit)
     (const :tag "Don't display non-IRC commands after evaluation"
 	   noncommands)
-    (const :tag
-	   "Notify when the online status of certain users changes"
+    (const :tag "Notify when the online status of certain users changes"
 	   notify)
-    (const :tag "Complete nicknames and commands (programmable)"
-	   completion)
-    (const :tag "Complete nicknames and commands (old)" hecomplete)
     (const :tag "Process CTCP PAGE requests from IRC" page)
     (const :tag "Make displayed lines read-only" readonly)
     (const :tag "Replace text in messages" replace)



From MAILER-DAEMON Sun Oct 14 00:51:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRu-000714-Ev
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRp-0006x3-U8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRo-0006vY-Ab
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-000543-Vo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP8-00040U-1C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP7-0005Ah-6L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP7-00068u-7t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP7-00068u-7t@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:41 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Added a "Current channel" submenu.
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, 14 Oct 2007 04:51:30 -0000

commit 559d3fb47789e5215a90a33ec3264701da2be684
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 11 03:13:43 2007 +0000

    Added a "Current channel" submenu.
    
    * erc-menu.el (erc-menu-definition): Put items specific to
    channels in a "Current channel" submenu.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-87

diff --git a/ChangeLog b/ChangeLog
index 1be6505..a28b428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-01-11  Diane Murray  <disumu@x3y2z1.net>
 
+	* 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.
 
diff --git a/erc-menu.el b/erc-menu.el
index 466ed23..bc6afc9 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -40,41 +40,43 @@
 	 (and erc-server-connected (fboundp 'erc-list-channels))]
 	["Join channel..." erc-join-channel erc-server-connected]
 	["Start a query..." erc-cmd-QUERY erc-server-connected]
-	"-"
-	["List users in channel" erc-channel-names erc-channel-users]
-	["List channel operators" erc-cmd-OPS erc-channel-users]
 	["Input action..." erc-input-action (erc-default-target)]
-	["Set topic..." erc-set-topic
-	 (and (and (erc-default-target) (not (erc-query-buffer-p)))
-	      (or (not (member "t" erc-channel-modes))
-		  (erc-channel-user-op-p (erc-current-nick))))]
-	(list "Channel modes"
-	      ["Change mode..." erc-insert-mode-command
-	       (erc-channel-user-op-p (erc-current-nick))]
-	      ["No external send" (erc-toggle-channel-mode "n")
-	       :active (erc-channel-user-op-p (erc-current-nick))
-	       :style toggle :selected (member "n" erc-channel-modes)]
-	      ["Topic set by channel operator" (erc-toggle-channel-mode "t")
-	       :style toggle :selected (member "t" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Invite only" (erc-toggle-channel-mode "i")
-	       :style toggle :selected (member "i" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Private" (erc-toggle-channel-mode "p")
-	       :style toggle :selected (member "p" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Secret" (erc-toggle-channel-mode "s")
-	       :style toggle :selected (member "s" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Moderated" (erc-toggle-channel-mode "m")
-	       :style toggle :selected (member "m" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Set a limit..." erc-set-channel-limit
-	       (erc-channel-user-op-p (erc-current-nick))]
-	      ["Set a key..." erc-set-channel-key
-	       (erc-channel-user-op-p (erc-current-nick))])
-	["Leave this channel..." erc-part-from-channel erc-channel-users]
 	"-"
+	(list
+	 "Current channel"
+	 ["List users in channel" erc-channel-names erc-channel-users]
+	 ["List channel operators" erc-cmd-OPS erc-channel-users]
+	 ["Set topic..." erc-set-topic
+	  (and (and (erc-default-target) (not (erc-query-buffer-p)))
+	       (or (not (member "t" erc-channel-modes))
+		   (erc-channel-user-op-p (erc-current-nick))))]
+	 (list "Channel modes"
+	       ["Change mode..." erc-insert-mode-command
+		(erc-channel-user-op-p (erc-current-nick))]
+	       ["No external send" (erc-toggle-channel-mode "n")
+		:active (erc-channel-user-op-p (erc-current-nick))
+		:style toggle :selected (member "n" erc-channel-modes)]
+	       ["Topic set by channel operator" (erc-toggle-channel-mode "t")
+		:style toggle :selected (member "t" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Invite only" (erc-toggle-channel-mode "i")
+		:style toggle :selected (member "i" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Private" (erc-toggle-channel-mode "p")
+		:style toggle :selected (member "p" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Secret" (erc-toggle-channel-mode "s")
+		:style toggle :selected (member "s" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Moderated" (erc-toggle-channel-mode "m")
+		:style toggle :selected (member "m" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Set a limit..." erc-set-channel-limit
+		(erc-channel-user-op-p (erc-current-nick))]
+	       ["Set a key..." erc-set-channel-key
+		(erc-channel-user-op-p (erc-current-nick))])
+	 ["Leave this channel..." erc-part-from-channel erc-channel-users]
+	 "-")
 	(list "Pals, fools and other keywords"
 	      ["Add pal..." erc-add-pal]
 	      ["Delete pal..." erc-delete-pal]



From MAILER-DAEMON Sun Oct 14 00:51:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRu-00071F-Ko
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRq-0006xK-5r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRo-0006w3-Mp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP0-00053U-Hr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
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@hcoop.net>) id 1IgvP0-0003yv-3Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOz-00057q-8z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOz-0005wO-Aj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOz-0005wO-Aj@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:33 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--emacs--22
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, 14 Oct 2007 04:51:30 -0000

commit 93c10b61ffa8edbc92308a0177734d7692775074
Merge: 1e95fcd... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Nov 20 02:43:07 2006 +0000

    Merged from erc--emacs--22
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-20
       Re-add header-line fix
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-62

diff --cc erc.el
index 931ffc9,98a369f..eb6089a
--- a/erc.el
+++ b/erc.el
@@@ -5817,13 -5712,7 +5817,13 @@@ if `erc-away' is non-nil.
  				((erc-server-process-alive)
  				 "")
  				(t
 -				 ": CLOSED"))))
 +				 ": CLOSED")))
 +	  (face (cond ((eq erc-header-line-face-method nil)
 +		       nil)
 +		      ((functionp erc-header-line-face-method)
 +		       (funcall erc-header-line-face-method))
 +		      (t
- 		       erc-header-line))))
++		       'erc-header-line))))
        (cond ((featurep 'xemacs)
  	     (setq modeline-buffer-identification
  		   (list (format-spec erc-mode-line-format spec)))



From MAILER-DAEMON Sun Oct 14 00:51:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRu-00071e-Qu
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRr-0006yV-4m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRp-0006wc-FA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052Q-1E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOw-0003xr-6L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOv-00056A-1d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOu-0005or-7O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOu-0005or-7O@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:28 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add help-echo and mouse-face
	properties to tracked channel names.
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, 14 Oct 2007 04:51:31 -0000

commit 554ce8e5a9d26d94dcc9dc99575d0638071f37ca
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Mon Aug 21 18:30:22 2006 +0000

    Add help-echo and mouse-face properties to tracked channel names.
    
    * erc-track.el (erc-track-mode-line-mouse-face): New variable.
      (erc-make-mode-line-buffer-name): Add help-echo and mouse-face
      properties to channel name.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-47

diff --git a/ChangeLog b/ChangeLog
index 1b876a4..4b466ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-21  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
+	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
+	properties to channel name.
+
 2006-08-20  Michael Olson  <mwolson@gnu.org>
 
 	* erc-identd.el (erc-identd): New customization group.
diff --git a/erc-track.el b/erc-track.el
index 939b545..209d54a 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -580,6 +580,11 @@ ARGS are ignored."
       (erc-modified-channels-display)
       (force-mode-line-update t))))
 
+(defvar erc-track-mouse-face (if (featurep 'xemacs)
+				 'modeline-mousable
+			       'mode-line-highlight)
+  "The face to use when mouse is over channel names in the mode line.")
+
 (defun erc-make-mode-line-buffer-name (string buffer &optional faces count)
   "Return STRING as a button that switches to BUFFER when clicked.
 If FACES are provided, color STRING with them."
@@ -609,6 +614,12 @@ If FACES are provided, color STRING with them."
 	    (posn-window (event-start e)))
 	   (switch-to-buffer-other-window ,buffer))))
     (put-text-property 0 (length name) 'local-map map name)
+    (put-text-property
+     0 (length name)
+     'help-echo (concat "mouse-2: switch to buffer, "
+			"mouse-3: switch to buffer in other window")
+     name)
+    (put-text-property 0 (length name) 'mouse-face erc-track-mouse-face name)
     (when (and faces erc-track-use-faces)
       (put-text-property 0 (length name) 'face faces name))
     name))



From MAILER-DAEMON Sun Oct 14 00:51:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRv-00071r-2y
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRr-0006yu-PH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRq-0006xG-6R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-000544-W1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP8-000405-6G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP2-00058i-9F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP2-00060u-B1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP2-00060u-B1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:36 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Restore old point correctly when
	reconnecting
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, 14 Oct 2007 04:51:32 -0000

commit bebbc11cd998de818300d9d126ad0d60648d5bc9
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Dec 26 23:50:02 2006 +0000

    Restore old point correctly when reconnecting
    
    2006-12-26  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-open): Restore old point correctly, or at least get
    	closer to doing so than before.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-71

diff --git a/ChangeLog b/ChangeLog
index a3e8c27..2c8c8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-open): Restore old point correctly, or at least get
+	closer to doing so than before.
+
 2006-12-13  Leo  <sdl.web@gmail.com>
 
 	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
diff --git a/erc.el b/erc.el
index 3918fdb..8be1a71 100644
--- a/erc.el
+++ b/erc.el
@@ -1915,10 +1915,11 @@ Returns the buffer for the given server or channel."
 	(connected-p (unless connect erc-server-connected))
 	(buffer (erc-get-buffer-create server port channel))
 	(old-buffer (current-buffer))
-	(old-point (point))
+	old-point
 	continued-session)
     (erc-update-modules)
     (set-buffer buffer)
+    (setq old-point (point))
     (erc-mode)
     (setq erc-server-announced-name server-announced-name)
     (setq erc-server-connected connected-p)



From MAILER-DAEMON Sun Oct 14 00:51:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRv-000727-9y
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRs-0006zj-QP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRs-0006z9-40
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-00053u-4F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP7-00040D-4G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP6-0005AD-A2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP6-00067P-CJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP6-00067P-CJ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:40 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fixed lag formatting. Set
	header-line face 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: Sun, 14 Oct 2007 04:51:33 -0000

commit 3c3ac5f8130169dfb9219abeb8ceef1024b875d2
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 11 01:26:10 2007 +0000

    Fixed lag formatting.  Set header-line face property.
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-84

diff --git a/ChangeLog b/ChangeLog
index 9e955d3..0ca3bd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-11  Diane Murray  <disumu@x3y2z1.net>
+
+	* 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
diff --git a/erc.el b/erc.el
index a4fbbf2..cbd4be0 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 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.4 (devel)"
+(defconst erc-version-string "Version 5.2 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -5818,7 +5818,9 @@ if `erc-away' is non-nil."
 
 (defun erc-format-lag-time ()
   "Return the estimated lag time to server, `erc-server-lag'."
-  (format "lag:%.0f" (erc-with-server-buffer erc-server-lag)))
+  (let ((lag (erc-with-server-buffer erc-server-lag)))
+    (cond (lag (format "lag:%.0f" lag))
+	  (t ""))))
 
 (defun erc-update-mode-line-buffer (buffer)
   "Update the mode line in a single ERC buffer BUFFER."
@@ -5872,7 +5874,10 @@ if `erc-away' is non-nil."
 			      (erc-propertize header 'help-echo help-echo
 					      'face face)
 			    (erc-propertize header 'help-echo help-echo))))))
-		(t (setq header-line-format header))))))
+		(t (setq header-line-format
+			 (if face
+			     (erc-propertize header 'face face)
+			   header)))))))
     (if (featurep 'xemacs)
 	(redraw-modeline)
       (force-mode-line-update))))



From MAILER-DAEMON Sun Oct 14 00:51:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRx-00074d-Ob
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRu-00071D-JL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRs-0006zs-WF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-00053y-Jd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP7-000401-CO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP3-000599-IG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:37 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP3-00062u-L7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:37 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP3-00062u-L7@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:37 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-iswitchb: Fix bug with C-g
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, 14 Oct 2007 04:51:35 -0000

commit b372b547bf0ea6122f764dec7476dd50e6676168
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Dec 28 01:30:50 2006 +0000

    erc-iswitchb: Fix bug with C-g
    
    2006-12-28  Leo  <sdl.web@gmail.com>
    
    	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
    	hitting C-g does not leave iswitchb-mode on.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-75

diff --git a/ChangeLog b/ChangeLog
index 9360127..403c6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-28  Leo  <sdl.web@gmail.com>
+
+	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
+	hitting C-g does not leave iswitchb-mode on.
+
 2006-12-27  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-cmd-RECONNECT): New command that calls
diff --git a/erc.el b/erc.el
index 5aea199..cd665e8 100644
--- a/erc.el
+++ b/erc.el
@@ -1689,21 +1689,22 @@ needs to be active for this function to work."
     (require 'iswitchb))
   (let ((enabled iswitchb-mode))
     (or enabled (iswitchb-mode 1))
-    (let ((iswitchb-make-buflist-hook
-	   (lambda ()
-	     (setq iswitchb-temp-buflist
-		   (mapcar 'buffer-name
-			   (erc-buffer-list
-			    nil
-			    (when arg erc-server-process)))))))
-      (switch-to-buffer
-       (iswitchb-read-buffer
-	"Switch-to: "
-	(if (boundp 'erc-modified-channels-alist)
-	    (buffer-name (caar (last erc-modified-channels-alist)))
-	  nil)
-	t)))
-    (or enabled (iswitchb-mode -1))))
+    (unwind-protect
+	(let ((iswitchb-make-buflist-hook
+	       (lambda ()
+		 (setq iswitchb-temp-buflist
+		       (mapcar 'buffer-name
+			       (erc-buffer-list
+				nil
+				(when arg erc-server-process)))))))
+	  (switch-to-buffer
+	   (iswitchb-read-buffer
+	    "Switch-to: "
+	    (if (boundp 'erc-modified-channels-alist)
+		(buffer-name (caar (last erc-modified-channels-alist)))
+	      nil)
+	    t)))
+      (or enabled (iswitchb-mode -1)))))
 
 (defun erc-channel-list (proc)
   "Return a list of channel buffers.



From MAILER-DAEMON Sun Oct 14 00:51:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRx-00074R-H5
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRu-00070W-1D
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRs-0006zM-Dp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOx-00052j-MF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
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@hcoop.net>) id 1IgvOx-0003y1-27
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOw-00056p-6R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOw-0005rp-6a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOw-0005rp-6a@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:30 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-nicklist: Fix missing paren.
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, 14 Oct 2007 04:51:34 -0000

commit 763f1850c5c3df806f35e7fd319ec240af633ed4
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Sep 11 22:44:11 2006 +0000

    erc-nicklist: Fix missing paren.
    
    2006-09-11  Michael Olson  <mwolson@gnu.org>
    
    	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
    	parenthesis.  Thanks to Stephan Stahl for the report.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-53

diff --git a/ChangeLog b/ChangeLog
index 52b2316..5c4e6fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
+	parenthesis.  Thanks to Stephan Stahl for the report.
+
 2006-09-10  Eric Hanchrow  <offby1@blarg.net>
 
 	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
diff --git a/erc-nicklist.el b/erc-nicklist.el
index 45041b3..669f055 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -225,7 +225,7 @@ Seach for the BBDB record of this contact.  If not found, return nil."
 			      'erc-nicklist-channel channel
 			      'help-echo balloon-text)
 	      "\n")))
-  (erc-nicklist-mode))
+  (erc-nicklist-mode)))
 
 
 (defun erc-nicklist ()



From MAILER-DAEMON Sun Oct 14 00:51:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvRx-00074n-TK
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRw-00073S-By
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRu-00071T-PD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-000540-U3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP8-00040D-7q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP7-0005As-Fb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP7-00069P-I3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP7-00069P-I3@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:41 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix to always run
	`erc-before-connect' hook before connecting.
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, 14 Oct 2007 04:51:36 -0000

commit 391a8312bfa72b69a5654c6608e4e053368ffba0
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 11 12:18:39 2007 +0000

    Fix to always run `erc-before-connect' hook before connecting.
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-88

diff --git a/ChangeLog b/ChangeLog
index a28b428..503d29d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-01-11  Diane Murray  <disumu@x3y2z1.net>
 
+	* 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.
 
diff --git a/erc.el b/erc.el
index cbd4be0..e6e21c8 100644
--- a/erc.el
+++ b/erc.el
@@ -1925,6 +1925,7 @@ Returns the buffer for the given server or channel."
 	(old-buffer (current-buffer))
 	old-point
 	continued-session)
+    (when connect (run-hook-with-args 'erc-before-connect server port nick))
     (erc-update-modules)
     (set-buffer buffer)
     (setq old-point (point))
@@ -2136,8 +2137,6 @@ server and full-name will be set to those values, whereas
 `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
 be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
-
-  (run-hook-with-args 'erc-before-connect server port nick)
   (erc-open server port nick full-name t password))
 
 (defalias 'erc-select 'erc)



From MAILER-DAEMON Sun Oct 14 00:51:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS1-00077S-VL
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRy-00075C-9g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRw-00073e-JC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-000541-U5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP8-0003zF-8X
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP1-00058W-Hv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP1-0005zu-Ky
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP1-0005zu-Ky@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:35 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Temporarily enable iswitchb 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: Sun, 14 Oct 2007 04:51:38 -0000

commit f32cb85f0a6a1565bbbbe857273eaec17dbfbba7
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Dec 13 02:03:26 2006 +0000

    Temporarily enable iswitchb mode
    
    2006-12-13  Leo  <sdl.web@gmail.com>
    
    	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
    	isn't active already, instead of leaving it on.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-69

diff --git a/CREDITS b/CREDITS
index 064d8fb..0e6856b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -154,6 +154,11 @@ Andrea Russo <rastandy@inventati.org>:
 Juanma Barranquero <lekktu@gmail.com>:
   * Vetted the inline documentation and provided many fixes.
 
+Leo <sdl.web AT gmail.com>:
+  * Fixed the erc-iswitchb function to only temporarily enable
+    iswitchb mode if it isn't active already (4 lines changed).
+
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index e1dcb12..d6e8709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-13  Leo  <sdl.web@gmail.com>
+
+	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
+	isn't active already, instead of leaving it on.
+
 2006-12-08  Michael Olson  <mwolson@gnu.org>
 
 	* CREDITS: Add Juanma Barranquero.
diff --git a/erc.el b/erc.el
index fe010e7..3918fdb 100644
--- a/erc.el
+++ b/erc.el
@@ -1685,22 +1685,25 @@ If `erc-track-mode' is in enabled, put the last element of
 Due to some yet unresolved reason, global function `iswitchb-mode'
 needs to be active for this function to work."
   (interactive "P")
-  (eval-and-compile
+  (eval-when-compile
     (require 'iswitchb))
-  (let ((iswitchb-make-buflist-hook
-	 (lambda ()
-	   (setq iswitchb-temp-buflist
-		 (mapcar 'buffer-name
-			 (erc-buffer-list
-			  nil
-			  (when arg erc-server-process)))))))
-    (switch-to-buffer
-     (iswitchb-read-buffer
-      "Switch-to: "
-      (if (boundp 'erc-modified-channels-alist)
-	  (buffer-name (caar (last erc-modified-channels-alist)))
-	nil)
-      t))))
+  (let ((enabled iswitchb-mode))
+    (or enabled (iswitchb-mode 1))
+    (let ((iswitchb-make-buflist-hook
+	   (lambda ()
+	     (setq iswitchb-temp-buflist
+		   (mapcar 'buffer-name
+			   (erc-buffer-list
+			    nil
+			    (when arg erc-server-process)))))))
+      (switch-to-buffer
+       (iswitchb-read-buffer
+	"Switch-to: "
+	(if (boundp 'erc-modified-channels-alist)
+	    (buffer-name (caar (last erc-modified-channels-alist)))
+	  nil)
+	t)))
+    (or enabled (iswitchb-mode -1))))
 
 (defun erc-channel-list (proc)
   "Return a list of channel buffers.



From MAILER-DAEMON Sun Oct 14 00:51:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS2-00077o-5T
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQ0-0005Z2-9R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPt-0005So-90
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPs-0005Rk-4q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
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@hcoop.net>) id 1IgvPr-0004E4-Tm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPr-0005Sj-7y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPr-0007OC-9e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPr-0007OC-9e@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:27 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix dir entry in ELPA package for ERC
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, 14 Oct 2007 04:51:39 -0000

commit 0466dbd901949e8cc203aedb545bd452348d4c8c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Sep 10 13:42:39 2007 -0400

    Fix dir entry in ELPA package for ERC
    
    * 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.

diff --git a/Makefile b/Makefile
index ca4ce8a..4abef18 100644
--- a/Makefile
+++ b/Makefile
@@ -185,8 +185,7 @@ elpa: $(MANUAL).info
 	cp -r images $(ELPA)/$(SNAPDIR)
 	cp erc-pkg.el $(ELPA)/$(SNAPDIR)
 	cp $(MANUAL).info $(ELPA)/$(SNAPDIR)
-	echo '* Menu:' > $(ELPA)/$(SNAPDIR)/dir
-	echo >> $(ELPA)/$(SNAPDIR)/dir
+	cp dir-template $(ELPADIR)/$(SNAPDIR)/dir
 	install-info --section "Emacs" "Emacs" \
 	  --info-dir=$(ELPA)/$(SNAPDIR) \
 	  $(ELPA)/$(SNAPDIR)/$(MANUAL).info
diff --git a/dir-template b/dir-template
new file mode 100644
index 0000000..08346cd
--- /dev/null
+++ b/dir-template
@@ -0,0 +1,15 @@
+This is the file .../info/dir, which contains the
+topmost node of the Info hierarchy, called (dir)Top.
+The first time you invoke Info you start off looking at this node.
+
+File: dir,	Node: Top	This is the top of the INFO tree
+
+  This (the Directory node) gives a menu of major topics.
+  Typing "q" exits, "?" lists all Info commands, "d" returns here,
+  "h" gives a primer for first-timers,
+  "mEmacs<Return>" visits the Emacs manual, etc.
+
+  In Emacs, you can click mouse button 2 on a menu item or cross reference
+  to select it.
+
+* Menu:



From MAILER-DAEMON Sun Oct 14 00:51:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS2-000782-I9
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQ0-0005Yz-1K
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPv-0005Ut-EG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPv-0005Up-Bu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
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@hcoop.net>) id 1IgvPv-0004F0-2H
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPu-0005To-Cb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPu-0007Th-E9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPu-0007Th-E9@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:30 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add "/me's" command
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, 14 Oct 2007 04:51:39 -0000

commit b6aee7017492988a0b0c64d90a2675623bf3a85c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Oct 6 21:43:01 2007 -0400

    Add "/me's" command
    
    * 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.

diff --git a/ChangeLog b/ChangeLog
index b686f12..285c045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/erc.el b/erc.el
index d8459dc..6957e3d 100644
--- a/erc.el
+++ b/erc.el
@@ -3016,6 +3016,11 @@ LINE has the format \"USER ACTION\"."
    (t nil)))
 (put 'erc-cmd-ME 'do-not-parse-args t)
 
+(defun erc-cmd-ME\'S (line)
+  "Do a /ME command, but add the string \" 's\" to the beginning."
+  (erc-cmd-ME (concat " 's" line)))
+(put 'erc-cmd-ME\'S 'do-not-parse-args t)
+
 (defun erc-cmd-LASTLOG (line)
   "Show all lines in the current buffer matching the regexp LINE.
 
@@ -5035,7 +5040,7 @@ Specifically, return the position of `erc-insert-marker'."
    erc-input-marker
    (erc-end-of-input-line)))
 
-(defvar erc-command-regexp "^/\\([A-Za-z]+\\)\\(\\s-+.*\\|\\s-*\\)$"
+(defvar erc-command-regexp "^/\\([A-Za-z']+\\)\\(\\s-+.*\\|\\s-*\\)$"
   "Regular expression used for matching commands in ERC.")
 
 (defun erc-send-input (input)



From MAILER-DAEMON Sun Oct 14 00:51:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS3-00078p-Or
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvS1-00077B-Je
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRx-00074W-Mt
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP7-00053s-Hq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
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@hcoop.net>) id 1IgvP6-000405-MO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP5-0005A1-N5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP5-00066P-OO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP5-00066P-OO@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:39 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] 
	[commit][emacs22] NEWS entries: Added erc-my-nick-face,
	fixed capab-identify.
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, 14 Oct 2007 04:51:41 -0000

commit 2e2bb35e4f3fa8518ab546fdf9b763911f204d30
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 11 00:49:11 2007 +0000

    NEWS entries: Added erc-my-nick-face, fixed capab-identify.
    
    * NEWS: Added note for `erc-my-nick-face'.  Fixed capab-identify
    wording.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-82

diff --git a/ChangeLog b/ChangeLog
index 6dd5c87..1cda541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/NEWS b/NEWS
index e0aeb79..6215c54 100644
--- a/NEWS
+++ b/NEWS
@@ -22,10 +22,16 @@ reconnection attempts that ERC will make per server.
 amount of time, in seconds, that ERC will wait between successive
 reconnect attempts.
 
+** New face: `erc-my-nick-face'
+This helps make it easier to distinguish messages sent by yourself
+from messages sent by other users when the value of the variable
+`erc-show-my-nick' is non-nil.
+
 ** New modules
 
 *** Capab identify (erc-capab.el)
-Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
+Mark users who haven't identified to NickServ on servers supporting
+CAPAB IDENTIFY-MSG.
 
 ** Changes and additions to modules
 



From MAILER-DAEMON Sun Oct 14 00:51:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS4-00078u-1c
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvS2-000781-Gf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRy-00075b-R7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-000542-UY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
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@hcoop.net>) id 1IgvP8-00040O-23
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP6-0005Ab-TC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP6-00068P-UE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP6-00068P-UE@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:40 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Show channel list in server buffer
	if it's not chanlist-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: Sun, 14 Oct 2007 04:51:42 -0000

commit dff88585cf9f9cf96ef48105e9848741d5a78bc3
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 11 02:22:53 2007 +0000

    Show channel list in server buffer if it's not chanlist-mode.
    
    * erc-backend.el (321, 323): Display channel list in server buffer
    when not using the channel list module.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-86

diff --git a/ChangeLog b/ChangeLog
index 8a48196..1be6505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-01-11  Diane Murray  <disumu@x3y2z1.net>
 
+	* 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.
diff --git a/erc-backend.el b/erc-backend.el
index 3f653a1..477354b 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1571,7 +1571,7 @@ See `erc-display-server-message'." nil
 (define-erc-response-handler (321)
   "LIST header." nil
   (setq erc-channel-list nil)
-  (erc-display-message parsed 'notice 'active 's321))
+  (erc-display-message parsed 'notice proc 's321))
 
 (define-erc-response-handler (322)
   "LIST notice." nil
@@ -1581,7 +1581,7 @@ See `erc-display-server-message'." nil
       (add-to-list 'erc-channel-list (list channel))
       (erc-update-channel-topic channel topic)
       (erc-display-message
-       parsed 'notice 'active 's322
+       parsed 'notice proc 's322
        ?c channel ?u num-users ?t (or topic "")))))
 
 (define-erc-response-handler (324)



From MAILER-DAEMON Sun Oct 14 00:51:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS6-0007Al-Dh
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvS4-00079a-QV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvS2-00077Z-2C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP7-00053r-8C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
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@hcoop.net>) id 1IgvP5-0003zx-Pu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP5-00059j-2p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP5-00065P-5G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP5-00065P-5G@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:39 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix typo in url-irc-function
	instructions
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, 14 Oct 2007 04:51:45 -0000

commit 66b924fbfaeeaf6793faf7d25befc79dd39f6e0c
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Jan 10 02:40:28 2007 +0000

    Fix typo in url-irc-function instructions
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-80

diff --git a/ChangeLog b/ChangeLog
index ade1625..4d6fe93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/erc.el b/erc.el
index 69fdc83..eea5064 100644
--- a/erc.el
+++ b/erc.el
@@ -6242,7 +6242,7 @@ This function should be on `erc-kill-channel-hook'."
        (erc-response.command vect)))
 
 ;; Teach url.el how to open irc:// URLs with ERC.
-;; To activate, customize `url-irc-function' to `url-irc-erc'.
+;; To activate, customize `url-irc-function' to `erc-handle-irc-url'.
 
 ;;;###autoload
 (defun erc-handle-irc-url (host port channel user password)



From MAILER-DAEMON Sun Oct 14 00:51:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS6-0007Aw-I4
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvS4-00079b-Ps
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvS2-00078T-TW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP8-00053t-4G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:42 -0400
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@hcoop.net>) id 1IgvP6-00040B-PO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP5-0005A7-Vb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP6-00066u-2A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP6-00066u-2A@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:40 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-services: Avoid BitlBee error,
	minor code cleanup
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, 14 Oct 2007 04:51:45 -0000

commit 25f2a8d3b5ece2e849291fc08acea9b0fe60ca40
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Jan 11 01:08:46 2007 +0000

    erc-services: Avoid BitlBee error, minor code cleanup
    
    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.
    	(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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-83

diff --git a/ChangeLog b/ChangeLog
index 1cda541..9e955d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+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.
+	(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
diff --git a/erc-bbdb.el b/erc-bbdb.el
index 854256f..611b90b 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -78,10 +78,15 @@ on if you want to have lots of People named \"John Doe\" in your BBDB."
 (defcustom erc-bbdb-popup-type 'visible
   "*If t, pop up a BBDB buffer showing the record of a WHOISed person
 or the person who has just joined a channel.
+
 If set to 'visible, the BBDB buffer only pops up when someone was WHOISed
-or a person joined a channel visible on any frame."
+or a person joined a channel visible on any frame.
+
+If set to nil, never pop up a BBDD buffer."
   :group 'erc-bbdb
-  :type 'sexp)
+  :type '(choice (const :tag "When visible" visible)
+		 (const :tag "When joining" t)
+		 (const :tag "Never" nil)))
 
 (defcustom erc-bbdb-irc-nick-field 'irc-nick
   "The notes field name to use for annotating IRC nicknames."
diff --git a/erc-services.el b/erc-services.el
index b93317e..63ee77c 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -77,6 +77,27 @@ This group allows you to set variables to somewhat automate
 communication with those Services."
   :group 'erc)
 
+(defcustom erc-nickserv-identify-mode 'both
+  "The mode which is used when identifying to Nickserv.
+
+Possible settings are:.
+
+'autodetect  - Identify when the real Nickserv sends an identify request.
+'nick-change - Identify when you log in or change your nickname.
+'both        - Do the former if the network supports it, otherwise do the
+               latter.
+nil          - Disables automatic Nickserv identification.
+
+You can also use M-x erc-nickserv-identify-mode to change modes."
+  :group 'erc-services
+  :type '(choice (const autodetect)
+		 (const nick-change)
+		 (const both)
+		 (const nil))
+  :set (lambda (sym val)
+	 (set sym val)
+	 (erc-nickserv-identify-mode val)))
+
 ;;;###autoload (autoload 'erc-services-mode "erc-services" nil t)
 (define-erc-module services nickserv
   "This mode automates communication with services."
@@ -128,27 +149,6 @@ communication with those Services."
 	 (remove-hook 'erc-nick-changed-functions
 		      'erc-nickserv-identify-on-nick-change))))
 
-(defcustom erc-nickserv-identify-mode 'both
-  "The mode which is used when identifying to Nickserv.
-
-Possible settings are:.
-
-'autodetect  - Identify when the real Nickserv sends an identify request.
-'nick-change - Identify when you change your nickname.
-'both        - Do the former if the network supports it, otherwise do the
-               latter.
-nil          - Disables automatic Nickserv identification.
-
-You can also use M-x erc-nickserv-identify-mode to change modes."
-  :group 'erc-services
-  :type '(choice (const autodetect)
-		 (const nick-change)
-		 (const both)
-		 (const nil))
-  :set (lambda (sym val)
-	 (set sym val)
-	 (erc-nickserv-identify-mode val)))
-
 (defcustom erc-prompt-for-nickserv-password t
   "Ask for the password when identifying to NickServ."
   :group 'erc-services
@@ -184,7 +184,13 @@ Example of use:
 ;; Variables:
 
 (defcustom erc-nickserv-alist
-  '((DALnet
+  '((BitlBee
+     nil
+     nil
+     "&bitlbee"
+     "identify"
+     nil)
+    (DALnet
      "NickServ!service@dal.net"
      "/msg\\s-NickServ@services.dal.net\\s-IDENTIFY\\s-<password>"
      "NickServ@services.dal.net"
@@ -266,6 +272,24 @@ ANSWER is the command to use for the answer.  The default is 'privmsg.
 		  (string :tag "Command")
 		  (const :tag "No special command necessary" nil)))))
 
+(defsubst erc-nickserv-alist-sender (network &optional entry)
+  (nth 1 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-regexp (network &optional entry)
+  (nth 2 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-nickserv (network &optional entry)
+  (nth 3 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-ident-keyword (network &optional entry)
+  (nth 4 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-use-nick-p (network &optional entry)
+  (nth 5 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-ident-command (network &optional entry)
+  (nth 6 (or entry (assoc network erc-nickserv-alist))))
+
 ;; Functions:
 
 (defun erc-nickserv-identify-autodetect (proc parsed)
@@ -277,14 +301,14 @@ password for this nickname, otherwise try to send it automatically."
   (unless (and (null erc-nickserv-passwords)
 	       (null erc-prompt-for-nickserv-password))
     (let* ((network (erc-network))
-	   (nickserv (nth 1 (assoc network erc-nickserv-alist)))
-	   (identify-regex (nth 2 (assoc network erc-nickserv-alist)))
+	   (sender (erc-nickserv-alist-sender network))
+	   (identify-regex (erc-nickserv-alist-regexp network))
 	   (sspec (erc-response.sender parsed))
 	   (nick (car (erc-response.command-args parsed)))
 	   (msg (erc-response.contents parsed)))
       ;; continue only if we're sure it's the real nickserv for this network
       ;; and it's asked us to identify
-      (when (and nickserv (equal sspec nickserv)
+      (when (and sender (equal sspec sender)
 		 (string-match identify-regex msg))
 	(erc-log "NickServ IDENTIFY request detected")
 	(erc-nickserv-call-identify-function nick)
@@ -295,7 +319,7 @@ password for this nickname, otherwise try to send it automatically."
   (unless (or (and (null erc-nickserv-passwords)
 		   (null erc-prompt-for-nickserv-password))
 	      (and (eq erc-nickserv-identify-mode 'both)
-		   (nth 2 (assoc (erc-network) erc-nickserv-alist))))
+		   (erc-nickserv-alist-regexp (erc-network))))
     (erc-nickserv-call-identify-function nick)))
 
 (defun erc-nickserv-identify-on-nick-change (nick old-nick)
@@ -303,7 +327,7 @@ password for this nickname, otherwise try to send it automatically."
   (unless (or (and (null erc-nickserv-passwords)
 		   (null erc-prompt-for-nickserv-password))
 	      (and (eq erc-nickserv-identify-mode 'both)
-		   (nth 2 (assoc (erc-network) erc-nickserv-alist))))
+		   (erc-nickserv-alist-regexp (erc-network))))
     (erc-nickserv-call-identify-function nick)))
 
 (defun erc-nickserv-call-identify-function (nickname)
@@ -333,12 +357,16 @@ When called interactively, read the password using `read-passwd'."
     (let* ((erc-auto-discard-away nil)
 	   (network (erc-network))
 	   (nickserv-info (assoc network erc-nickserv-alist))
-	   (nickserv (or (nth 3 nickserv-info) "NickServ"))
-	   (identify-word (or (nth 4 nickserv-info) "IDENTIFY"))
-	   (nick (if (nth 5 nickserv-info)
+	   (nickserv (or (erc-nickserv-alist-nickserv nil nickserv-info)
+			 "NickServ"))
+	   (identify-word (or (erc-nickserv-alist-ident-keyword
+			       nil nickserv-info)
+			      "IDENTIFY"))
+	   (nick (if (erc-nickserv-alist-use-nick-p nil nickserv-info)
 		     (concat (erc-current-nick) " ")
 		   ""))
-	   (msgtype (or (nth 6 nickserv-info) "PRIVMSG")))
+	   (msgtype (or (erc-nickserv-alist-ident-command nil nickserv-info)
+			"PRIVMSG")))
       (erc-message msgtype
 		   (concat nickserv " " identify-word " " nick password)))))
 



From MAILER-DAEMON Sun Oct 14 00:51:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS7-0007Ck-NE
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvQ0-0005Yo-5a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPs-0005SX-VY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPs-0005SE-L8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
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@hcoop.net>) id 1IgvPs-0004EE-FH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPr-0005Sv-Oq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPr-0007PC-Qy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPr-0007PC-Qy@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:27 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fixed typo in erc-sound.el setting up
	instructions.
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, 14 Oct 2007 04:51:46 -0000

commit 5f780c762e2b095d256a904371eb0280ec28f6ba
Author: Exal de Jesus Garcia Carrillo <exal@gnu.org>
Date:   Tue Sep 11 16:48:02 2007 -0500

    Fixed typo in erc-sound.el setting up instructions.

diff --git a/ChangeLog b/ChangeLog
index c0a9eab..80ab5c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-11  Exal de Jesus  Garcia Carrillo  <exal@gnu.org>
+
+	* 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
diff --git a/erc-sound.el b/erc-sound.el
index d02887a..7a1a281 100644
--- a/erc-sound.el
+++ b/erc-sound.el
@@ -30,7 +30,7 @@
 
 ;; Add the following to your .emacs if you want to play sounds.
 ;;
-;; (require 'erc-soud)
+;; (require 'erc-sound)
 ;; (erc-sound-enable)
 ;;
 ;; To send requests to other users from within query buffers, type the



From MAILER-DAEMON Sun Oct 14 00:51:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvS8-0007Dr-Sf
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvS7-0007CW-Fy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvS5-0007AI-Ll
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP7-00053p-0s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
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@hcoop.net>) id 1IgvP6-0003zF-6D
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP4-00059L-5i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:38 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP4-00063u-7h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:38 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP4-00063u-7h@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:38 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-services: Add a way of doing
	things that is best of both worlds
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, 14 Oct 2007 04:51:47 -0000

commit 8cecfcfb51884e9ae08f947e544bb40b2a04c30c
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Dec 28 07:00:54 2006 +0000

    erc-services: Add a way of doing things that is best of both worlds
    
    * erc-networks.el (erc-server-alist): Fix definition for
      irc.arstechnica.com.  Properly escape periods in Konfido.Net and
      Kewl.Org.
      (erc-networks-alist): Add entries for Ars and LinuxChix, though the
      latter does not actually provide an announced network name.
    
    * erc-services.el (erc-nickserv-identify-mode): Add 'both method, which
      waits for a NickServ message if the network supports it, otherwise
      sends the password after connecting.
      (erc-nickserv-identify-mode): Default to 'both.
      (erc-nickserv-passwords): Add OFTC and Azzurra to custom options.
      (erc-nickserv-alist): Indentation fix.
      (erc-nickserv-identify-on-connect)
      (erc-nickserv-identify-on-nick-change): Handle 'both method.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-77

diff --git a/ChangeLog b/ChangeLog
index b02d6f9..61b05c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,18 @@
 
 	* erc-networks.el (erc-server-alist): Add Ars OpenIRC and
 	LinuxChix networks.  Thanks to Angelina Carlton for mentioning
-	them.
+	them.  Properly escape periods in Konfido.Net and Kewl.Org.
+	(erc-networks-alist): Add entries for Ars and LinuxChix, though
+	the latter does not actually provide an announced network name.
+
+	* erc-services.el (erc-nickserv-identify-mode): Add 'both method,
+	which waits for a NickServ message if the network supports it,
+	otherwise sends the password after connecting.
+	(erc-nickserv-identify-mode): Default to 'both.
+	(erc-nickserv-passwords): Add OFTC and Azzurra to custom options.
+	(erc-nickserv-alist): Indentation fix.
+	(erc-nickserv-identify-on-connect)
+	(erc-nickserv-identify-on-nick-change): Handle 'both method.
 
 2006-12-28  Leo  <sdl.web@gmail.com>
 
diff --git a/erc-networks.el b/erc-networks.el
index f27a602..b5c13d8 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -64,7 +64,7 @@
   ("AngelEyez: Random server" AngelEyez "irc.angeleyez.net" ((6666 7000)))
   ("AnotherNet: Random server" Anothernet "irc.another.net" (6667 7000 ))
   ("ArabChat: Random server" ArabChat "irc.arabchat.org" ((6660 6667)))
-  ("Ars OpenIRC: Random server" ArsOpenIRC "irc.arstechnica.com" 6667)
+  ("Ars-OpenIRC: Random server" Ars "irc.arstechnica.com" 6667)
   ("AsiaTalk: Random server" AsiaTalk "irc.asiatalk.org" ((6667 6669) 7000 ))
   ("AstroLink: Random server" AstroLink "irc.astrolink.org" ((6660 6667)))
   ("Asylumnet: Random server" Asylumnet "irc.asylum-net.org" ((6661 6669) 7000 7777 ))
@@ -281,12 +281,12 @@
   ("K0wNet: Random server" K0wNet "irc.k0w.net" ((6660 6669)))
   ("KDFSnet: Random server" KDFSnet "irc.kdfs.net" ((6667 6669)))
   ("Kemik: Random server" Kemik "irc.kemik.net" 6667)
-  ("Kewl.Org: Random server" Kewl.Org "irc.kewl.org" (6667 7000 ))
+  ("Kewl.Org: Random server" Kewl\.Org "irc.kewl.org" (6667 7000 ))
   ("Kickchat: Random server" Kickchat "irc.kickchat.com" ((6660 6669) 7000 ))
   ("Kidsworld: Random server" KidsWorld "irc.kidsworld.org" ((6666 6669)))
   ("Knightnet: AF, ZA, Durban" Knightnet "orc.dbn.za.knightnet.net" (6667 5555 ))
   ("Knightnet: US, CA, Goldengate" Knightnet "goldengate.ca.us.knightnet.net" (6667 5555 ))
-  ("Konfido.Net: Random server" Konfido.Net "irc.konfido.net" 6667)
+  ("Konfido.Net: Random server" Konfido\.Net "irc.konfido.net" 6667)
   ("KreyNet: Random server" Kreynet "irc.krey.net" 6667)
   ("Krono: Random server" Krono "irc.krono.net" ((6660 6669) 7000 ))
   ("Krushnet: Random server" Krushnet "irc.krushnet.org" 6667)
@@ -459,6 +459,7 @@ PORTS is either a number, a list of numbers, or a list of port ranges."
     (AngelEyez "angeleyez.net")
     (Anothernet "another.net")
     (ArabChat "arabchat.org")
+    (Ars "arstechnica.com")
     (AsiaTalk "asiatalk.org")
     (AstroLink "astrolink.org")
     (Asylumnet "asylumnet.org")
@@ -588,6 +589,7 @@ PORTS is either a number, a list of numbers, or a list of port ranges."
     (LagNet "lagnet.org.za")
     (Librenet "librenet.net")
     (LinkNet "link-net.org")
+    (LinuxChix "cats\.meow\.at\\|linuxchix\.org")
     (Liquidized "liquidized.net")
     (M-IRC "m-sys.org")
     (MagicStar "magicstar.net")
diff --git a/erc-services.el b/erc-services.el
index c8bac7f..b93317e 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -94,7 +94,7 @@ communication with those Services."
   (interactive
    (list (intern (completing-read
 		  "Choose Nickserv identify mode (RET to disable): "
-		  '(("autodetect") ("nick-change")) nil t))))
+		  '(("autodetect") ("nick-change") ("both")) nil t))))
   (cond ((eq mode 'autodetect)
 	 (setq erc-nickserv-identify-mode 'autodetect)
 	 (add-hook 'erc-server-NOTICE-functions
@@ -111,6 +111,14 @@ communication with those Services."
 		   'erc-nickserv-identify-on-nick-change)
 	 (remove-hook 'erc-server-NOTICE-functions
 		      'erc-nickserv-identify-autodetect))
+	((eq mode 'both)
+	 (setq erc-nickserv-identify-mode 'both)
+	 (add-hook 'erc-server-NOTICE-functions
+		   'erc-nickserv-identify-autodetect)
+	 (add-hook 'erc-after-connect
+		   'erc-nickserv-identify-on-connect)
+	 (add-hook 'erc-nick-changed-functions
+		   'erc-nickserv-identify-on-nick-change))
 	(t
 	 (setq erc-nickserv-identify-mode nil)
 	 (remove-hook 'erc-server-NOTICE-functions
@@ -120,22 +128,25 @@ communication with those Services."
 	 (remove-hook 'erc-nick-changed-functions
 		      'erc-nickserv-identify-on-nick-change))))
 
-(defcustom erc-nickserv-identify-mode 'autodetect
+(defcustom erc-nickserv-identify-mode 'both
   "The mode which is used when identifying to Nickserv.
 
 Possible settings are:.
 
 'autodetect  - Identify when the real Nickserv sends an identify request.
 'nick-change - Identify when you change your nickname.
+'both        - Do the former if the network supports it, otherwise do the
+               latter.
 nil          - Disables automatic Nickserv identification.
 
 You can also use M-x erc-nickserv-identify-mode to change modes."
   :group 'erc-services
   :type '(choice (const autodetect)
 		 (const nick-change)
+		 (const both)
 		 (const nil))
   :set (lambda (sym val)
-	 (set-default sym val)
+	 (set sym val)
 	 (erc-nickserv-identify-mode val)))
 
 (defcustom erc-prompt-for-nickserv-password t
@@ -156,12 +167,14 @@ Example of use:
 	  (list :tag "Network"
 		(choice :tag "Network name"
 			(const freenode)
+			(const OFTC)
 			(const DALnet)
 			(const GalaxyNet)
 			(const SlashNET)
 			(const BRASnet)
 			(const iip)
 			(const Austnet)
+			(const Azzurra)
 			(symbol :tag "Network name"))
 		(repeat :tag "Nickname and password"
 			(cons :tag "Identity"
@@ -209,24 +222,24 @@ Example of use:
      "IDENTIFY"
      nil
      "")
-     (Austnet
-      "NickOP!service@austnet.org"
-      "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
-      "nickop@austnet.org"
-      "identify"
-      nil)
-     (Azzurra
-      "NickServ!service@azzurra.org"
-      "/ns\\s-IDENTIFY\\s-password"
-      "NickServ"
-      "IDENTIFY"
-      nil)
-     (OFTC
-      "NickServ!services@services.oftc.net"
-      "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
-      "NickServ"
-      "IDENTIFY"
-      nil))
+    (Austnet
+     "NickOP!service@austnet.org"
+     "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
+     "nickop@austnet.org"
+     "identify"
+     nil)
+    (Azzurra
+     "NickServ!service@azzurra.org"
+     "/ns\\s-IDENTIFY\\s-password"
+     "NickServ"
+     "IDENTIFY"
+     nil)
+    (OFTC
+     "NickServ!services@services.oftc.net"
+     "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
+     "NickServ"
+     "IDENTIFY"
+     nil))
    "Alist of NickServer details, sorted by network.
 Every element in the list has the form
   \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER)
@@ -279,14 +292,18 @@ password for this nickname, otherwise try to send it automatically."
 
 (defun erc-nickserv-identify-on-connect (server nick)
   "Identify to Nickserv after the connection to the server is established."
-  (unless (and (null erc-nickserv-passwords)
-	       (null erc-prompt-for-nickserv-password))
+  (unless (or (and (null erc-nickserv-passwords)
+		   (null erc-prompt-for-nickserv-password))
+	      (and (eq erc-nickserv-identify-mode 'both)
+		   (nth 2 (assoc (erc-network) erc-nickserv-alist))))
     (erc-nickserv-call-identify-function nick)))
 
 (defun erc-nickserv-identify-on-nick-change (nick old-nick)
   "Identify to Nickserv whenever your nick changes."
-  (unless (and (null erc-nickserv-passwords)
-	       (null erc-prompt-for-nickserv-password))
+  (unless (or (and (null erc-nickserv-passwords)
+		   (null erc-prompt-for-nickserv-password))
+	      (and (eq erc-nickserv-identify-mode 'both)
+		   (nth 2 (assoc (erc-network) erc-nickserv-alist))))
     (erc-nickserv-call-identify-function nick)))
 
 (defun erc-nickserv-call-identify-function (nickname)



From MAILER-DAEMON Sun Oct 14 00:51:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSB-0007GQ-2k
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvS9-0007EL-Ca
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOv-0004zo-Mr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOo-0004zS-KY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
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@hcoop.net>) id 1IgvOo-0003vU-ES
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOn-00054I-Ox
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOn-0005ek-Qq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOn-0005ek-Qq@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:21 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix active buffer issue that caused
	messages to go to the wrong place.
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, 14 Oct 2007 04:51:49 -0000

commit 04dbf9ab3cccefc792be4bb47947ca5245c56613
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Aug 3 02:35:02 2006 +0000

    Fix active buffer issue that caused messages to go to the wrong place.
    
    * erc.el (erc-active-buffer): Fix bug that caused messages to go to the
      wrong buffer.  Thanks to offby1 for the report.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-27

diff --git a/ChangeLog b/ChangeLog
index 9c94148..a59c842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-02  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-active-buffer): Fix bug that caused messages to go
+	to the wrong buffer.  Thanks to offby1 for the report.
+
 2006-07-29  Michael Olson  <mwolson@gnu.org>
 
 	* erc-log.el (erc-log-setup-logging): Don't offer to save the
diff --git a/erc.el b/erc.el
index 1d2cc5c..bfc8c9e 100644
--- a/erc.el
+++ b/erc.el
@@ -1392,8 +1392,8 @@ server buffer")
 Defaults to the server buffer."
   (with-current-buffer (erc-server-buffer)
     (if (buffer-live-p erc-active-buffer)
-	erc-active-buffer)
-    (setq erc-active-buffer (current-buffer))))
+	erc-active-buffer
+      (setq erc-active-buffer (current-buffer)))))
 
 (defun erc-set-active-buffer (buffer)
   "Set the value of `erc-active-buffer' to BUFFER."



From MAILER-DAEMON Sun Oct 14 00:51:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSD-0007Iu-GB
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvS9-0007Ei-I7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvS7-0007Cu-Th
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP7-00053q-1d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:41 -0400
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@hcoop.net>) id 1IgvP6-0003zP-Ac
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:40 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP3-00059F-SF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:37 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP3-00063P-U9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:37 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP3-00063P-U9@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:37 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-networks: Add Ars OpenIRC and
	LinuxChix
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, 14 Oct 2007 04:51:50 -0000

commit 50932f672d8ff853fb9d87b1c0fcfe1a2f905c02
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Dec 28 03:34:54 2006 +0000

    erc-networks: Add Ars OpenIRC and LinuxChix
    
    2006-12-28  Michael Olson  <mwolson@gnu.org>
    
    	* erc-list.el: Change header to mention that this is part of ERC,
    	rather than GNU Emacs.
    
    	* erc-networks.el (erc-server-alist): Add Ars OpenIRC and
    	LinuxChix networks.  Thanks to Angelina Carlton for mentioning
    	them.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-76

diff --git a/ChangeLog b/ChangeLog
index 403c6c3..b02d6f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-28  Michael Olson  <mwolson@gnu.org>
+
+	* erc-list.el: Change header to mention that this is part of ERC,
+	rather than GNU Emacs.
+
+	* erc-networks.el (erc-server-alist): Add Ars OpenIRC and
+	LinuxChix networks.  Thanks to Angelina Carlton for mentioning
+	them.
+
 2006-12-28  Leo  <sdl.web@gmail.com>
 
 	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
diff --git a/erc-list.el b/erc-list.el
index 38ea0ec..a574d6e 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -6,20 +6,20 @@
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Keywords: comm
 
-;; This file is part of GNU Emacs.
+;; This file is part of ERC.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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 2, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; 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.
 
diff --git a/erc-networks.el b/erc-networks.el
index fb7c92a..f27a602 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -64,6 +64,7 @@
   ("AngelEyez: Random server" AngelEyez "irc.angeleyez.net" ((6666 7000)))
   ("AnotherNet: Random server" Anothernet "irc.another.net" (6667 7000 ))
   ("ArabChat: Random server" ArabChat "irc.arabchat.org" ((6660 6667)))
+  ("Ars OpenIRC: Random server" ArsOpenIRC "irc.arstechnica.com" 6667)
   ("AsiaTalk: Random server" AsiaTalk "irc.asiatalk.org" ((6667 6669) 7000 ))
   ("AstroLink: Random server" AstroLink "irc.astrolink.org" ((6660 6667)))
   ("Asylumnet: Random server" Asylumnet "irc.asylum-net.org" ((6661 6669) 7000 7777 ))
@@ -294,6 +295,7 @@
   ("LagNet: AF, ZA, Johannesburg" LagNet "mystery.lagnet.org.za" 6667)
   ("Librenet: Random server" Librenet "irc.librenet.net" 6667)
   ("LinkNet: Random server" LinkNet "irc.link-net.org" ((6667 6669)))
+  ("LinuxChix: Random server" LinuxChix "irc.linuxchix.org" 6667)
   ("Liquidized: Random server" Liquidized "irc.liquidized.net" (6667 7000 ))
   ("M-IRC: Random server" M-IRC "irc.m-sys.org" ((6667 6669)))
   ("MagicStar: Random server" MagicStar "irc.magicstar.net" 6667)



From MAILER-DAEMON Sun Oct 14 00:51:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSD-0007J7-KS
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOk-0004vj-Ku
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOY-0004j8-GT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004he-NN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003nt-Kw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOR-0004wE-Dy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:47:59 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOR-00051c-Gi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:47:59 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOR-00051c-Gi@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:47:59 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:51:50 -0000

commit 3e54c62edd48c165d10bcb8703e3f8897ca848eb
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Feb 10 21:28:51 2006 +0000

    Update from CVS
    
    2006-02-09  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-capab.el: Require erc.
       (erc-capab-send-identify-messages): Use `erc-server-send'.
       (erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
       the flags so we can also check whether the `erc-identified' text
       property is there at all.
       (erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
       This fixes a bug where the prefix wasn't inserted when timestamps
       are inserted on the right.  Tweaked nickname regexp.
       (erc-capab-find-parsed): New function.
       (erc-capab-get-unidentified-nickname): Updated to check for 0
       flag.  Only get nickname if there's a nickuserhost associated with
       this message.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-107

diff --git a/ChangeLog b/ChangeLog
index 735e8f7..cbddc26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 
+	* erc-capab.el: Require erc.
+	(erc-capab-send-identify-messages): Use `erc-server-send'.
+	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
+	the flags so we can also check whether the `erc-identified' text
+	property is there at all.
+	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
+	This fixes a bug where the prefix wasn't inserted when timestamps
+	are inserted on the right.  Tweaked nickname regexp.
+	(erc-capab-find-parsed): New function.
+	(erc-capab-get-unidentified-nickname): Updated to check for 0
+	flag.  Only get nickname if there's a nickuserhost associated with
+	this message.
+
 	* erc-capab.el: New file.  Adds the new module
 	`erc-capab-identify', which allows flagging of unidentified users
 	on servers running an ircd based on dancer - irc.freenode.net, for
diff --git a/erc-capab.el b/erc-capab.el
index e0a9f01..0f45f3d 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -60,10 +60,13 @@
 
 ;; Somebody who knows about autoload cookies could please add them where
 ;; necessary.
+;; Make sure nickname regexp works with other format-nick functions.
 
 ;;; Code:
 
-(defconst erc-capab-version "$Revision: 1.2 $"
+(require 'erc)
+
+(defconst erc-capab-version "$Revision: 1.3 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -125,8 +128,8 @@ PARSED is the current message, a response struct."
              ;; instead of looking for specific version names
 	     (assoc "CAPAB" erc-server-parameters))
     (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
-    (erc-send-command "CAPAB IDENTIFY-MSG")
-    (erc-send-command "CAPAB IDENTIFY-CTCP")
+    (erc-server-send "CAPAB IDENTIFY-MSG")
+    (erc-server-send "CAPAB IDENTIFY-CTCP")
     (setq erc-capab-identify-sent t)))
 
 
@@ -154,7 +157,9 @@ PARSED is an `erc-parsed' response struct."
             (if erc-capab-identify-mode
                 (erc-propertize (match-string 2 msg)
                                 'erc-identified
-                                (string= (match-string 1 msg) "+"))
+                                (if (string= (match-string 1 msg) "+")
+                                    1
+                                  0))
               (match-string 2 msg)))
       nil)))
 
@@ -163,27 +168,41 @@ PARSED is an `erc-parsed' response struct."
   (when (and erc-capab-identify-prefix
              (with-current-buffer (erc-server-buffer)
                erc-capab-identify-activated))
+    (goto-char (point-min))
+    (goto-char (or (erc-capab-find-parsed) (point-min)))
     (let ((nickname (erc-capab-get-unidentified-nickname
-                     (erc-get-parsed-vector (- (point-max) 1)))))
+                     (erc-get-parsed-vector (point)))))
       (when (and nickname
                  (goto-char (point-min))
                  (re-search-forward
                   ;; matches nick in channel, msg, notice, and action messages
                   ;; this assumes the default action format is used
-                  (concat "\\(<\\|[^\\*]\\* ?\\|-\\)"
+                  (concat "\\(<\\|[^\\*]?\\* ?\\|-\\)"
                           "\\(" (regexp-quote nickname) "\\)")
                   nil t))
         (goto-char (match-beginning 2))
         (insert erc-capab-identify-prefix)))))
 
+(defun erc-capab-find-parsed ()
+  "Return the position of text found with the `erc-parsed' property."
+  (catch 'position
+    (while (< (point) (point-max))
+      (cond ((get-char-property (point) 'erc-parsed)
+             (throw 'position (point)))
+            (t
+             (goto-char (or (next-single-property-change
+                             (point) 'erc-parsed)
+                            (point-max))))))))
+
 (defun erc-capab-get-unidentified-nickname (parsed)
   "Return the nickname of the user if unidentified.
 PARSED is an `erc-parsed' response struct."
-  (and (erc-response-p parsed)
-       (eq nil (get-text-property 0 'erc-identified
-                                  (erc-response.contents parsed)))
-       (erc-get-parsed-vector-nick parsed)
-       (nth 0 (erc-parse-user (erc-get-parsed-vector-nick parsed)))))
+  (when (and (erc-response-p parsed)
+             (equal 0 (get-text-property 0 'erc-identified
+                                     (erc-response.contents parsed))))
+    (let ((nickuserhost (erc-get-parsed-vector-nick parsed)))
+      (when nickuserhost
+       (nth 0 (erc-parse-user nickuserhost))))))
 
 (provide 'erc-capab)
 



From MAILER-DAEMON Sun Oct 14 00:51:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSD-0007JT-Su
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSA-0007FD-4v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPK-00056U-Ai
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055v-OJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPI-00042l-I6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPH-0005Et-Dl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPH-0006Pw-Gb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPH-0006Pw-Gb@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:51 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] manual: Work on FOR-RELEASE items
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, 14 Oct 2007 04:51:50 -0000

commit a6dd2f7fea27cc7c3db331ef65a5795ebae9db98
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 17 00:21:16 2007 +0000

    manual: Work on FOR-RELEASE items
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-120

diff --git a/ChangeLog b/ChangeLog
index 7bffc90..862463e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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
diff --git a/erc.texi b/erc.texi
index e99cbc8..a75a986 100644
--- a/erc.texi
+++ b/erc.texi
@@ -73,6 +73,11 @@ Obtaining ERC
 * Releases::                    Released versions of ERC.
 * Development::                 Latest unreleased development changes.
 
+Getting Started
+
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
+
 Advanced Usage
 
 * Connecting::                  Ways of connecting to an IRC server.
@@ -193,9 +198,9 @@ tla update
 
 @end enumerate
 
-If you are new to Arch and want to learn more about developing with it,
-you might find this tutorial helpful:
-@uref{http://www.mwolson.org/projects/ArchTutorial.html}.
+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.
 
 @subheading Development snapshots
 
@@ -266,8 +271,6 @@ locations that require this.
 @chapter Getting Started
 @cindex settings
 
-@c PRE5_2: Mention .ercrc.el
-
 To use ERC, add the directory containing its files to your
 @code{load-path} variable, in your @file{.emacs} file.  Then, load ERC
 itself.  An example follows.
@@ -279,20 +282,117 @@ itself.  An example follows.
 Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
 prompt for the server to connect to.
 
+If you want to place ERC settings in their own file, you can place them
+in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
+
+If you would rather use the Customize interface to change how ERC works,
+do @kbd{M-x customize-group RET erc RET}.  In particular, ERC comes with
+lots of modules that may be enabled or disabled; to select which ones
+you want, do @kbd{M-x customize-variable RET erc-modules RET}.
+
+@menu
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
+@end menu
+
+@node Sample Session, Special Features, Getting Started, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Sample Session
+
+This is an example ERC session which shows how to connect to the #emacs
+channel on Freenode.
+
+@itemize @bullet
+
+@item Connect to Freenode
+
+@item Get used to the interface
+
+@item Join the #emacs channel
+
+@item Register your nickname with Freenode
+
+@item Talk to people in the channel
+
+@item Open a query buffer to talk to someone
+
+@c (must identify first in FreeNode)
+
+@end itemize
+
+@node Special Features, , Sample Session, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Special Features
+
+ERC has some features that distinguish it from some IRC clients.
+
+@itemize @bullet
+
+@item multiple channels and multiple servers
+
+Every channel is put in a separate buffer.  Several IRC servers may be
+connected to at the same time.
+
+@cindex query buffers
+@item private message separation
+
+Private conversations are treated as channels, and are put into separate
+buffers in Emacs.  We call these ``query buffers''.
+
+@item highlighting
+
+Some occurences of words can be highlighted, which makes it easier to
+track different kinds of conversations.
+
+@item notification
+
+ERC can notify you that certain users are online.
+
+@item channel tracking
+
+Channels can be hidden and conversation continue in the background.  You
+are notified when something is said in such a channel that is not
+currently visible.  This makes it easy to get Real Work done while still
+maintaining an IRC presence.
+
+@item nick completion
+
+ERC can complete words upon hitting @kbd{TAB}, which eases the writing
+of nicknames in messages.
+
+@cindex history ring
+@item history
+
+Past actions are kept in history rings for future use.  To navigate a
+history ring, hit @kbd{M-p} to go backwards and @kbd{M-n} to go
+forwards.
+
+@item multiple languages
+
+Different channels and servers may have different language encodings.
+
+In addition, it is possible to translate the messages that ERC uses into
+multiple languages.  Please contact the developers of ERC at
+@email{erc-discuss@@gnu.org} if you are interested in helping with the
+translation effort.
+
+@item user scripting
+
+Users can load scripts (e.g. auto greeting scripts) when ERC starts up.
+
+It is also possible to make custom IRC commands, if you know a little
+Emacs Lisp.  Just make an Emacs Lisp function and call it
+@code{erc-cmd-NEWCOMMAND}, where @code{NEWCOMMAND} is the name of the
+new command in capital letters.
+
+@item auto reconnect
+
 If the connection goes away at some point, ERC will try to reconnect
 automatically.  If it fails to reconnect, and you want to try to
 manually reestablish the connection at some later point, switch to an
-ERC buffer and run the /RECONNECT command.
-
-@c PRE5_2: Sample session, including:
-@c - connect to Freenode
-@c - /join #emacs
-@c - see messages flying past, point out topic lines, messages, channel
-@c   members
-@c - identifying your nick with NickServ (most IRC servers have this)
-@c - talking to the channel
-@c - open a /query buffer to talk to someone (must identify first in
-@c   FreeNode)
+ERC  buffer and run the @code{/RECONNECT} command.
+
+@end itemize
 
 
 @node Keystroke Summary, Modules, Getting Started, Top



From MAILER-DAEMON Sun Oct 14 00:51:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSE-0007Ji-3P
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSA-0007Fp-MW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPK-00057B-8N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00056G-VN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPJ-00043b-GC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPI-0005FQ-A9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPI-0006RR-Cv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPI-0006RR-Cv@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:52 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Add choice to have log
	files with network name
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, 14 Oct 2007 04:51:51 -0000

commit 4b9938ebb97b0324745132378dad024d8747ad20
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 30 01:36:59 2007 +0000

    erc-log: Add choice to have log files with network name
    
    2007-03-30  Michael Olson  <mwolson@gnu.org>
    
    	* 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-123

diff --git a/ChangeLog b/ChangeLog
index 7da64ba..82ecfb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,14 @@
 	* 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-active module, since
 	there's no need to have two modules in one file -- an option will
 	do.  Remove track-modified-channels alias.
diff --git a/erc-log.el b/erc-log.el
index 053bb37..9801192 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -85,7 +85,9 @@
 ;;; Code:
 
 (require 'erc)
-(eval-when-compile (require 'cl))
+(eval-when-compile
+  (require 'erc-networks)
+  (require 'cl))
 
 (defgroup erc-log nil
   "Logging facilities for ERC."
@@ -100,10 +102,12 @@ NICK is the current nick,
 SERVER and PORT are the parameters used to connect BUFFERs
 `erc-server-process'."
   :group 'erc-log
-  :type '(choice (const erc-generate-log-file-name-long)
-		 (const erc-generate-log-file-name-short)
-		 (const erc-generate-log-file-name-with-date)
-		 (symbol)))
+  :type '(choice (const :tag "Long style" erc-generate-log-file-name-long)
+		 (const :tag "Long, but with network name rather than server"
+			erc-generate-log-file-name-network)
+		 (const :tag "Short" erc-generate-log-file-name-short)
+		 (const :tag "With date" erc-generate-log-file-name-with-date)
+		 (symbol :tag "Other function")))
 
 (defcustom erc-truncate-buffer-on-save nil
   "Truncate any ERC (channel, query, server) buffer when it is saved."
@@ -347,6 +351,19 @@ This function is a possible value for `erc-generate-log-file-name-function'."
     ;; we need a make-safe-file-name function.
     (convert-standard-filename file)))
 
+(defun erc-generate-log-file-name-network (buffer target nick server port)
+  "Generates a log-file name using the network name rather than server name.
+This results in a file name of the form #channel!nick@network.txt.
+This function is a possible value for `erc-generate-log-file-name-function'."
+  (require 'erc-networks)
+  (let ((file (concat
+	       (if target (concat target "!"))
+	       nick "@"
+	       (or (with-current-buffer buffer (erc-network-name)) server)
+	       ".txt")))
+    ;; we need a make-safe-file-name function.
+    (convert-standard-filename file)))
+
 ;;;###autoload
 (defun erc-save-buffer-in-logs (&optional buffer)
   "Append BUFFER contents to the log file, if logging is enabled.



From MAILER-DAEMON Sun Oct 14 00:51:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSE-0007K3-Ch
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSB-0007Gk-9w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPK-00057G-98
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-000560-OK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPI-00042T-Tq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPI-0005FB-0z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPI-0006Qu-2S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPI-0006Qu-2S@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:52 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-track: Fix mentions of
	erc-track-when-inactive-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: Sun, 14 Oct 2007 04:51:51 -0000

commit f57320e2238294ee66f07a71811b9a75b53ee1d3
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 30 01:19:09 2007 +0000

    erc-track: Fix mentions of erc-track-when-inactive-mode
    
    2007-03-30  Michael Olson  <mwolson@gnu.org>
    
    	* erc-track.el (erc-track-visibility): Mention
            erc-track-when-inactive.
    	(erc-buffer-visible): Use erc-track-when-inactive.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-122

diff --git a/ChangeLog b/ChangeLog
index 11ee037..7da64ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 	do.  Remove track-modified-channels alias.
 	(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.
 
 2007-03-17  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc-track.el b/erc-track.el
index 994d767..baacba5 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -52,7 +52,7 @@
 The value of this variable determines, when a buffer is considered
 visible or invisible.  New messages in invisible buffers are tracked,
 while switching to visible buffers when they are tracked removes them
-from the list.  See also `erc-track-when-inactive-mode'.
+from the list.  See also `erc-track-when-inactive'.
 
 Possible values are:
 
@@ -565,7 +565,7 @@ only consider active buffers visible.")
 
 (defun erc-buffer-visible (buffer)
   "Return non-nil when the buffer is visible."
-  (if erc-track-when-inactive-mode
+  (if erc-track-when-inactive
       (when erc-buffer-activity; could be nil
 	(and (get-buffer-window buffer erc-track-visibility)
 	     (<= (erc-time-diff erc-buffer-activity (erc-current-time))



From MAILER-DAEMON Sun Oct 14 00:51:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSF-0007LH-Nu
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSC-0007Hx-Dy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005Cu-32
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPW-0005Cg-U0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
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@hcoop.net>) id 1IgvPV-00045k-BR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPU-0005K9-ER
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPU-0006lu-GJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPU-0006lu-GJ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:04 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] manual: Fix a typo, update URL
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, 14 Oct 2007 04:51:52 -0000

commit 2271109f00f2ec269a8a51c233c49165ff3e30ac
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jun 25 15:12:45 2007 +0000

    manual: Fix a typo, update URL
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-154

diff --git a/ChangeLog b/ChangeLog
index 72d7445..871d296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/erc.texi b/erc.texi
index bfd5894..60f6022 100644
--- a/erc.texi
+++ b/erc.texi
@@ -900,7 +900,7 @@ stuff, to the current ERC buffer."
 @c previous chapter)
 
 This section has not yet been written.  For now, the easiest way to
-check out the available option for ERC is to do
+check out the available options for ERC is to do
 @kbd{M-x customize-group erc RET}.
 
 
@@ -916,7 +916,7 @@ or if you have bugs to report, there are several places you can go.
 @itemize @bullet
 
 @item
-@uref{http://www.emacswiki.org/cgi-bin/wiki/EmacsIRCClient} is the
+@uref{http://www.emacswiki.org/cgi-bin/wiki/ERC} is the
 emacswiki.org page for ERC.  Anyone may add tips, hints, or bug
 descriptions to it.
 
@@ -929,14 +929,11 @@ The mailing lists are also available on Gmane.
 accessing the mailing lists, adding content to them, and searching them.
 
 @enumerate
-@item gmane.emacs.erc.announce
-Announcements
+@item gmane.emacs.erc.announce: Announcements
 
-@item gmane.emacs.erc.discuss
-General discussion
+@item gmane.emacs.erc.discuss: General discussion
 
-@item gmane.emacs.erc.cvs
-Log messages for changes to the ERC source code
+@item gmane.emacs.erc.cvs: Log messages for changes to the ERC source code
 
 @end enumerate
 



From MAILER-DAEMON Sun Oct 14 00:51:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSF-0007Lc-Us
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSD-0007Ic-7v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005Dv-Vb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005Dp-Tm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPU-00045n-Tf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPT-0005Jn-KX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPT-0006kQ-Ma
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPT-0006kQ-Ma@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:03 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Update header
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, 14 Oct 2007 04:51:53 -0000

commit 8f5a9200084c228dac3e5ccd43c9c21dab88e02a
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Jun 19 23:43:03 2007 +0000

    erc-log: Update header
    
    2007-06-19  Michael Olson  <mwolson@gnu.org>
    
    	* erc-log.el: Update header with accurate instructions.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-151

diff --git a/ChangeLog b/ChangeLog
index 2a6cad0..fcd6883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/erc-log.el b/erc-log.el
index c86ba60..1bafca6 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -31,17 +31,26 @@
 
 ;; Quick start:
 ;;
-;; (setq erc-enable-logging t)
+;; (require 'erc-log)
 ;; (setq erc-log-channels-directory "/path/to/logfiles") ; must be writable
+;; (erc-log-enable)
 ;;
-;; There are two ways to setup logging. The first will write to the log files
-;; on each incoming or outgoing line - this may not be optimal on a laptop
-;; HDD. To do this, M-x customize-variable erc-modules, and add "log".
+;; Or:
 ;;
-;; The second method will save buffers on /part, /quit, or killing the
-;; channel buffer. To do this, add the following to your .emacs:
+;; M-x customize-variable erc-modules, and add "log".
 ;;
-;; (require 'erc-log)
+;; There are two ways to setup logging.  The first (default) method
+;; will save buffers on /part, /quit, or killing the channel
+;; buffer.
+;;
+;; The second will write to the log files on each incoming or outgoing
+;; line - this may not be optimal on a laptop HDD.  To use this
+;; method, add the following to the above instructions.
+;;
+;; (setq erc-save-buffer-on-part nil
+;;       erc-save-queries-on-quit nil
+;;       erc-log-write-after-send t
+;;       erc-log-write-after-insert t)
 ;;
 ;; If you only want to save logs for some buffers, customise the
 ;; variable `erc-enable-logging'.



From MAILER-DAEMON Sun Oct 14 00:51:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSG-0007Ln-3B
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSD-0007JA-Mx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005DS-Gl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005Ch-5w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPW-000454-1p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPT-0005JZ-1N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPT-0006jR-4J
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPT-0006jR-4J@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:03 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-goodies: Fix bug with buffer
	ordering in erc-scroll-to-bottom
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, 14 Oct 2007 04:51:54 -0000

commit 4050552ba8737dd6c90e2df749480d757e82bbe9
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Jun 13 00:25:47 2007 +0000

    erc-goodies: Fix bug with buffer ordering in erc-scroll-to-bottom
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-149

diff --git a/CREDITS b/CREDITS
index bf10c21..d7f9ba9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -161,6 +161,9 @@ Leo <sdl.web AT gmail.com>:
 Vivek Dasmohapatra <vivek AT etla DOT org>:
   * Fixed issue with reconnecting to a not-yet-dead server connection.
 
+Ivan Kanis <apple AT kanis DOT eu>:
+  * Fixed window ordering bug in erc-goodies.el (1 line changed).
+
 
 ----
 
diff --git a/ChangeLog b/ChangeLog
index 0f6f03f..f048b8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/erc-compat.el b/erc-compat.el
index 58afcb0..dba5911 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -288,6 +288,40 @@ starting with a character."
 	 (setq pairs (cddr pairs)))
        (nreverse alist)))))
 
+;; Emacs21 does not have `with-selected-window', but Emacs22 and
+;; XEmacs do.
+(if (or (fboundp 'with-selected-window)
+	(condition-case nil
+	    (progn
+	      (require 'window)
+	      (fboundp 'with-selected-window))
+	  (error nil)))
+    (defmacro erc-with-selected-window (window &rest body)
+      "Execute the forms in BODY with WINDOW as the selected window.
+The value returned is the value of the last form in BODY."
+      (cons 'with-selected-window (cons window body)))
+  ;; ripped from subr.el in Emacs 22
+  (defmacro erc-with-selected-window (window &rest body)
+    "Execute the forms in BODY with WINDOW as the selected window.
+The value returned is the value of the last form in BODY."
+    `(let ((save-selected-window-window (selected-window))
+	   (save-selected-window-alist
+	    (mapcar (lambda (frame) (list frame (frame-selected-window frame)))
+		    (frame-list))))
+       (save-current-buffer
+	 (unwind-protect
+	     (progn (select-window ,window 'norecord)
+		    ,@body)
+	   (dolist (elt save-selected-window-alist)
+	     (and (frame-live-p (car elt))
+		  (window-live-p (cadr elt))
+		  (set-frame-selected-window (car elt) (cadr elt))))
+	   (if (window-live-p save-selected-window-window)
+	       (select-window save-selected-window-window 'norecord)))))))
+
+(put 'erc-with-selected-window 'lisp-indent-function 1)
+(put 'erc-with-selected-window 'edebug-form-spec '(form body))
+
 ;; Emacs has `cancel-timer', but XEmacs uses `delete-itimer'.
 (defun erc-cancel-timer (timer)
   (cond ((fboundp 'cancel-timer)
diff --git a/erc-goodies.el b/erc-goodies.el
index 933e6b3..e7b4de5 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -84,8 +84,7 @@ DISPLAY-START is ignored."
       ;; works, but it solves the problem, and has no negative side effects.
       ;; (Fran Litterio, 2003/01/07)
       (let ((resize-mini-windows nil))
-        (save-selected-window
-          (select-window window)
+        (erc-with-selected-window window
           (save-restriction
             (widen)
             (when (and erc-insert-marker



From MAILER-DAEMON Sun Oct 14 00:51:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSH-0007NS-Vx
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSE-0007KD-Ha
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005Cp-42
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPW-0005CO-Ts
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
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@hcoop.net>) id 1IgvPT-00045k-8S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPQ-0005IG-N6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPQ-0006fR-P5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPQ-0006fR-P5@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:00 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Makefile: Improve Debian package
	building
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, 14 Oct 2007 04:51:55 -0000

commit 5896ddfe43844ddf8cbb22498c61b2cb2ff21b47
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon May 21 00:39:10 2007 +0000

    Makefile: Improve Debian package building
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-20

diff --git a/ChangeLog b/ChangeLog
index b2f86df..f628f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2007-05-19  Michael Olson  <mwolson@gnu.org>
 
 	* Makefile (ELPA): New variable that contains the location of my
diff --git a/Makefile b/Makefile
index 365709c..1f1d354 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-speak.el \
 		 README.extras COPYING
 
 ALLSOURCE = $(wildcard *.el)
-SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED), $(ALLSOURCE))
+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 \
@@ -91,14 +91,21 @@ distclean:
 	-rm -f $(MANUAL).info $(MANUAL).html $(TARGET)
 	-rm -Rf ../$(SNAPDIR)
 
-debprepare: $(ALLSOURCE) $(SPECIAL) distclean
-	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
-	cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
-	cp -r images ../$(SNAPDIR)
-	test -d ../$(SNAPDIR)/images/.arch-ids && rm -R \
-	  ../$(SNAPDIR)/images/.arch-ids || :
-	test -d ../$(SNAPDIR)/images/CVS && rm -R \
-	  ../$(SNAPDIR)/images/.arch-ids || :
+debclean:
+	-rm -f ../../dist/$(DISTRIBUTOR)/erc_*
+	-rm -f ../erc_$(VERSION)*
+
+debprepare:
+	-rm -Rf ../$(SNAPDIR)
+	cp ../erc-$(VERSION).tar.gz ../erc_$(VERSION).orig.tar.gz
+	(cd .. && tar -xzf erc_$(VERSION).orig.tar.gz)
+	cp -R debian ../$(SNAPDIR)
+	test -d ../$(SNAPDIR)/debian/.arch-ids && rm -Rf \
+	  ../$(SNAPDIR)/debian/.arch-ids \
+	  ../$(SNAPDIR)/debian/maint/.arch-ids \
+	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
+	test -d ../$(SNAPDIR)/debian/\{arch\} && rm -Rf \
+	  ../$(SNAPDIR)/debian/\{arch\}
 
 debbuild:
 	(cd ../$(SNAPDIR) && \
@@ -112,38 +119,10 @@ debbuild:
 	  echo "Done running linda." && \
 	  debsign)
 
-debrelease: debprepare
-	-rm -f ../../dist/$(DISTRIBUTOR)/erc_*
-	-rm -f ../erc_$(VERSION)*
-	(cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
-	cp -R debian ../$(SNAPDIR)
-	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
-	  ../$(SNAPDIR)/debian/CVS \
-	  ../$(SNAPDIR)/debian/maint/CVS \
-	  ../$(SNAPDIR)/debian/scripts/CVS || :
-	test -d ../$(SNAPDIR)/debian/.arch-ids && rm -R \
-	  ../$(SNAPDIR)/debian/.arch-ids \
-	  ../$(SNAPDIR)/debian/maint/.arch-ids \
-	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
-	$(MAKE) debbuild
+debinstall:
 	cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
-debrevision:
-	-rm -f ../../dist/$(DISTRIBUTOR)/erc_*
-	-rm -f ../erc_$(VERSION)-*
-	-rm -fr ../erc-$(VERSION)
-	$(MAKE) debprepare
-	cp -R debian ../$(SNAPDIR)
-	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
-	  ../$(SNAPDIR)/debian/CVS \
-	  ../$(SNAPDIR)/debian/maint/CVS \
-	  ../$(SNAPDIR)/debian/scripts/CVS || :
-	test -d ../$(SNAPDIR)/debian/.arch-ids && rm -R \
-	  ../$(SNAPDIR)/debian/.arch-ids \
-	  ../$(SNAPDIR)/debian/maint/.arch-ids \
-	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
-	$(MAKE) debbuild
-	cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
+deb: debclean debprepare debbuild debinstall
 
 release: autoloads distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)



From MAILER-DAEMON Sun Oct 14 00:51:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSI-0007OK-Mz
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSF-0007LG-In
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOv-0004xJ-3s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOl-0004x6-N9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
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@hcoop.net>) id 1IgvOl-0003uY-Bw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOk-00053K-Li
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOk-0005Zf-OS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOk-0005Zf-OS@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:18 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.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: Sun, 14 Oct 2007 04:51:56 -0000

commit fe894a55afc3997c0fc8746f178d624b2cc24f8d
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jul 10 04:02:01 2006 +0000

    Merged from erc--rel--5.1.
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-1
       Fix typos in the manual.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-6
       Match coding system targets case-insensitively.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-7
       erc-identd: Do not prompt user about killing process on exit.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-17

diff --git a/ChangeLog b/ChangeLog
index 2cc0745..1917fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,21 @@
 	is given, and no matches are found, use our default reason instead
 	of "nil".
 
+2006-06-30  Michael Olson  <mwolson@gnu.org>
+
+	* erc-goodies.el (erc-handle-irc-url): Docfix.
+
+	* erc-identd.el (erc-identd-start): Do not prompt the user about
+	killing the identd process on exit.
+
+2006-06-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-coding-system-for-target): Match
+	case-insensitively.  Use a pattern match instead of `assoc', as
+	per the documentation for `erc-encoding-coding-alist'.
+
+	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
+
 2006-06-27  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el: Update maintainer information and URLs.
@@ -59,6 +74,10 @@
 	indicators when the user is no longer away.
 	(autoaway): Add the above function to the 305 hook.
 
+2006-06-05  Romain Francoise  <romain@orebokech.com>
+
+	* erc.texi (History): Fix various typos.
+
 2006-06-04  Michael Olson  <mwolson@gnu.org>
 
 	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
diff --git a/erc-backend.el b/erc-backend.el
index 817a67d..925b43a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -565,7 +565,11 @@ action."
   "Return the coding system or cons cell appropriate for TARGET.
 This is determined via `erc-encoding-coding-alist' or
 `erc-server-coding-system'."
-  (or (cdr (assoc target erc-encoding-coding-alist))
+  (or (let ((case-fold-search t))
+        (catch 'match
+          (dolist (pat erc-encoding-coding-alist)
+            (when (string-match (car pat) target)
+              (throw 'match (cdr pat))))))
       (and (functionp erc-server-coding-system)
            (funcall erc-server-coding-system))
       erc-server-coding-system))
diff --git a/erc-goodies.el b/erc-goodies.el
index d50a8d9..72efb4d 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -521,7 +521,7 @@ servers.  If called from a program, PROC specifies the server process."
 
 (defun erc-handle-irc-url (host port channel user password)
   "Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD.
-If ERC is already connected to HOST:PORT, simly /join CHANNEL.
+If ERC is already connected to HOST:PORT, simply /join CHANNEL.
 Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
   (let ((server-buffer
          (car (erc-buffer-filter
diff --git a/erc-identd.el b/erc-identd.el
index 197d51c..e93b495 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -46,6 +46,10 @@
 			     system-type (user-login-name)))
 	(process-send-eof erc-identd-process)))))
 
+;; Ignore useless byte-compile warning
+(eval-when-compile
+  (put 'process-kill-without-query 'byte-compile nil))
+
 ;;;###autoload
 (defun erc-identd-start (&optional port)
   "Start an identd server listening to port 8113.
@@ -69,7 +73,10 @@ system."
 				  :server t :noquery t
 				  :filter 'erc-identd-filter)
 	  (open-network-stream-server "identd" (generate-new-buffer "identd")
-				      port nil 'erc-identd-filter))))
+				      port nil 'erc-identd-filter)))
+  (if (fboundp 'set-process-query-on-exit-flag)
+      (set-process-query-on-exit-flag erc-identd-process nil)
+    (process-kill-without-query erc-identd-process)))
 
 ;;;###autoload
 (defun erc-identd-stop (&rest ignore)
diff --git a/erc-track.el b/erc-track.el
index 28d5589..4d0850c 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -111,7 +111,7 @@ If this variable is set to `max', then channel names will be shortened
 to the max.  Usually, shortened channel names will remain unique for a
 given set of existing channels.  When shortening to the max, the shortened
 channel names will be unique for the set of active channels only.
-Example: If there are tow active channels #emacs and #vi, and two inactive
+Example: If there are two active channels #emacs and #vi, and two inactive
 channels #electronica and #folk, then usually the active channels are
 shortened to #em and #v.  When shortening to the max, however, #emacs is
 not compared to #electronica -- only to #vi, therefore it can be shortened
diff --git a/erc.texi b/erc.texi
index e1fb8b6..2ce3095 100644
--- a/erc.texi
+++ b/erc.texi
@@ -566,7 +566,7 @@ questions.
 ERC was originally written by Alexander L. Belikoff
 @email{abel@@bfr.co.il} and Sergey Berezin
 @email{sergey.berezin@@cs.cmu.edu}.  They stopped development around
-december 1999. Their last released version was ERC 2.0.
+December 1999. Their last released version was ERC 2.0.
 
 P.S.: If one of the original developers of ERC reads this, we'd like to
 receive additional information for this file and hear comments in
@@ -585,12 +585,12 @@ there. The thing is, I do not have free time and enough incentive
 anymore to work on ERC, so I would be happy if you guys take over the
 project entirely."
 
-So we happily hacked away on ERC, and soon after (september 2001)
+So we happily hacked away on ERC, and soon after (September 2001)
 released the next "stable" version, 2.1.
 
-Most of the development of the new ERC happend on #emacs on
+Most of the development of the new ERC happened on #emacs on
 irc.openprojects.net. Over time, many people contributed code, ideas,
-bugfixes. And not to forget alot of alpha/beta/gamma testing.
+bugfixes. And not to forget a lot of alpha/beta/gamma testing.
 
 See the @file{CREDITS} file for a list of contributors.
 



From MAILER-DAEMON Sun Oct 14 00:51:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSI-0007Nw-Fl
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSF-0007LD-IF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005DW-Gl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005Cf-3B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPV-00045m-8i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPT-0005Ju-Sb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPT-0006kw-Vh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPT-0006kw-Vh@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:03 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-stamp: Put timestamp on both
	left and right 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: Sun, 14 Oct 2007 04:51:56 -0000

commit 1b48951546788176ae91a7778006f981db09aeeb
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Jun 20 00:26:17 2007 +0000

    erc-stamp: Put timestamp on both left and right by default
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-152

diff --git a/ChangeLog b/ChangeLog
index fcd6883..ea81e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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.
+
 2007-06-19  Michael Olson  <mwolson@gnu.org>
 
 	* erc-log.el: Update header with accurate instructions.
diff --git a/erc-stamp.el b/erc-stamp.el
index 0b8017f..d753dd0 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -58,16 +58,48 @@ If nil, timestamping is turned off."
   :type '(choice (const nil)
 		 (string)))
 
-(defcustom erc-insert-timestamp-function 'erc-insert-timestamp-right
+(defcustom erc-timestamp-format-left "\n[%a %b %e %Y]\n"
+  "*If set to a string, messages will be timestamped.
+This string is processed using `format-time-string'.
+Good examples are \"%T\" and \"%H:%M\".
+
+This timestamp is used for timestamps on the left side of the
+screen when `erc-insert-timestamp-function' is set to
+`erc-insert-timestamp-left-and-right'.
+
+If nil, timestamping is turned off."
+  :group 'erc-stamp
+  :type '(choice (const nil)
+		 (string)))
+
+(defcustom erc-timestamp-format-right " [%H:%M]"
+  "*If set to a string, messages will be timestamped.
+This string is processed using `format-time-string'.
+Good examples are \"%T\" and \"%H:%M\".
+
+This timestamp is used for timestamps on the right side of the
+screen when `erc-insert-timestamp-function' is set to
+`erc-insert-timestamp-left-and-right'.
+
+If nil, timestamping is turned off."
+  :group 'erc-stamp
+  :type '(choice (const nil)
+		 (string)))
+
+(defcustom erc-insert-timestamp-function 'erc-insert-timestamp-left-and-right
   "*Function to use to insert timestamps.
 
 It takes a single argument STRING which is the final string
 which all text-properties already appended.  This function only cares about
 inserting this string at the right position.  Narrowing is in effect
 while it is called, so (point-min) and (point-max) determine the region to
-operate on."
+operate on.
+
+You will probably want to set
+`erc-insert-away-timestamp-function' to the same value."
   :group 'erc-stamp
-  :type '(choice (const :tag "Right" erc-insert-timestamp-right)
+  :type '(choice (const :tag "Both sides" erc-insert-timestamp-left-and-right)
+		 (const :tag "Right" erc-insert-timestamp-right)
 		 (const :tag "Left" erc-insert-timestamp-left)
 		 function))
 
@@ -82,12 +114,14 @@ If `erc-timestamp-format' is set, this will not be used."
   :type '(choice (const nil)
 		 (string)))
 
-(defcustom erc-insert-away-timestamp-function 'erc-insert-timestamp-right
+(defcustom erc-insert-away-timestamp-function
+  'erc-insert-timestamp-left-and-right
   "*Function to use to insert the away timestamp.
 
 See `erc-insert-timestamp-function' for details."
   :group 'erc-stamp
-  :type '(choice (const :tag "Right" erc-insert-timestamp-right)
+  :type '(choice (const :tag "Both sides" erc-insert-timestamp-left-and-right)
+		 (const :tag "Right" erc-insert-timestamp-right)
 		 (const :tag "Left" erc-insert-timestamp-left)
 		 function))
 
@@ -160,6 +194,18 @@ or `erc-send-modify-hook'."
   "Last timestamp inserted into the buffer.")
 (make-variable-buffer-local 'erc-timestamp-last-inserted)
 
+(defvar erc-timestamp-last-inserted-left nil
+  "Last timestamp inserted into the left side of the buffer.
+This is used when `erc-insert-timestamp-function' is set to
+`erc-timestamp-left-and-right'")
+(make-variable-buffer-local 'erc-timestamp-last-inserted-left)
+
+(defvar erc-timestamp-last-inserted-right nil
+  "Last timestamp inserted into the right side of the buffer.
+This is used when `erc-insert-timestamp-function' is set to
+`erc-timestamp-left-and-right'")
+(make-variable-buffer-local 'erc-timestamp-last-inserted-right)
+
 (defcustom erc-timestamp-only-if-changed-flag t
   "*Insert timestamp only if its value changed since last insertion.
 If `erc-insert-timestamp-function' is `erc-insert-timestamp-left', a
@@ -272,6 +318,26 @@ be printed just before the window-width."
       (when erc-timestamp-intangible
 	(erc-put-text-property from (1+ (point)) 'intangible t)))))
 
+(defun erc-insert-timestamp-left-and-right (string)
+  "This is another function that can be assigned to
+`erc-insert-timestamp-function'.  If the date is changed, it will
+print a blank line, the date, and another blank line.  If the time is
+changed, it will then print it off to the right."
+  (let* ((ct (current-time))
+	 (ts-left (erc-format-timestamp ct erc-timestamp-format-left))
+	 (ts-right (erc-format-timestamp ct erc-timestamp-format-right)))
+    ;; insert left timestamp
+    (unless (string-equal ts-left erc-timestamp-last-inserted-left)
+      (goto-char (point-min))
+      (erc-put-text-property 0 (length ts-left) 'field 'erc-timestamp ts-left)
+      (insert ts-left)
+      (setq erc-timestamp-last-inserted-left ts-left))
+    ;; insert right timestamp
+    (let ((erc-timestamp-only-if-changed-flag t)
+	  (erc-timestamp-last-inserted erc-timestamp-last-inserted-right))
+      (erc-insert-timestamp-right ts-right)
+      (setq erc-timestamp-last-inserted-right ts-right))))
+
 ;; for testing: (setq erc-timestamp-only-if-changed-flag nil)
 
 (defun erc-format-timestamp (time format)



From MAILER-DAEMON Sun Oct 14 00:51:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSI-0007Ni-AO
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSF-0007Kl-4m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005DP-Hu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005D6-50
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPT-00045M-79
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPQ-0005I3-5G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPQ-0006eR-7Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPQ-0006eR-7Z@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:00 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Revert trivial 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: Sun, 14 Oct 2007 04:51:55 -0000

commit 94c171a6ce0a5e730853a658ed5e8500237d4fd7
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 22 22:00:02 2007 +0000

    Revert trivial change
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-143

diff --git a/README b/README
index 5756e6f..6c56123 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-This is the README file for ERC. 
+This is the README file for ERC.
 
 ERC is a powerful, modular, and extensible IRC client for Emacs.
 



From MAILER-DAEMON Sun Oct 14 00:52:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvPy-0005YG-G8
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPp-0005Oy-Dd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPm-0005M3-6j
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPl-0005Lp-U2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
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@hcoop.net>) id 1IgvPl-0004C4-IS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPk-0005Qb-Ni
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPk-0007D5-PX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:20 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPk-0007D5-PX@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:20 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Be more careful about the current
	buffer in erc-process-sentinel-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: Sun, 14 Oct 2007 04:49:28 -0000

commit 590370e8ff611b30868ba0e73127425729275abf
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 23:34:18 2007 -0400

    Be more careful about the current buffer in erc-process-sentinel-1
    
    * erc-backend.el (erc-process-sentinel-1): Take server buffer as an
      argument, so that we can make sure that it is current.  If it is
      deleted during a reconnect attempt, stop trying to reconnect.
      (erc-process-sentinel): Pass buffer to erc-process-sentinel-1.

diff --git a/ChangeLog b/ChangeLog
index 50b8dd4..b0dce79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 	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.  If it is deleted during
+	a reconnect attempt, stop trying to reconnect.
+	(erc-process-sentinel): Pass buffer to erc-process-sentinel-1.
 
 	* 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
diff --git a/erc-backend.el b/erc-backend.el
index 75bef89..463bffa 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -610,39 +610,42 @@ EVENT is the message received from the closed connection process."
            ;; open-network-stream-nowait error for connection refused
            (not (string-match "^failed with code 111" event)))))
 
-(defun erc-process-sentinel-1 (event)
+(defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.
 Determine whether user has quit or whether erc has been terminated.
 Conditionally try to reconnect and take appropriate action."
-  (if erc-server-quitting
-      ;; normal quit
-      (progn
-        (erc-display-message nil 'error (current-buffer) 'finished)
-        (when erc-kill-server-buffer-on-quit
-          (set-buffer-modified-p nil)
-          (kill-buffer (current-buffer))))
-    ;; unexpected disconnect
-    (let ((again t))
-      (while again
-        (setq again nil)
-        (erc-display-message nil 'error (current-buffer)
-                             (if (erc-server-reconnect-p event)
-                                 'disconnected
-                               'disconnected-noreconnect))
-        (if (erc-server-reconnect-p event)
-            (condition-case err
-                (progn
-                  (setq erc-server-reconnecting nil)
-                  (erc-server-reconnect)
-                  (setq erc-server-reconnect-count 0))
-              (error (when (integerp erc-server-reconnect-attempts)
-                       (setq erc-server-reconnect-count
-                             (1+ erc-server-reconnect-count))
-                       (sit-for erc-server-reconnect-timeout)
-                       (setq again t))))
-          ;; terminate, do not reconnect
+  (with-current-buffer buffer
+    (if erc-server-quitting
+        ;; normal quit
+        (progn
+          (erc-display-message nil 'error (current-buffer) 'finished)
+          (when erc-kill-server-buffer-on-quit
+            (set-buffer-modified-p nil)
+            (kill-buffer (current-buffer))))
+      ;; unexpected disconnect
+      (let ((again t))
+        (while again
+          (setq again nil)
           (erc-display-message nil 'error (current-buffer)
-                               'terminated ?e event))))))
+                               (if (erc-server-reconnect-p event)
+                                   'disconnected
+                                 'disconnected-noreconnect))
+          (if (erc-server-reconnect-p event)
+              (condition-case err
+                  (progn
+                    (setq erc-server-reconnecting nil)
+                    (erc-server-reconnect)
+                    (setq erc-server-reconnect-count 0))
+                (error (when (buffer-live-p buffer)
+                         (set-buffer buffer)
+                         (when (integerp erc-server-reconnect-attempts)
+                           (setq erc-server-reconnect-count
+                                 (1+ erc-server-reconnect-count))
+                           (sit-for erc-server-reconnect-timeout)
+                           (setq again t)))))
+            ;; terminate, do not reconnect
+            (erc-display-message nil 'error (current-buffer)
+                                 'terminated ?e event)))))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."
@@ -669,7 +672,7 @@ Conditionally try to reconnect and take appropriate action."
         (delete-region (point) (point-max))
         ;; Decide what to do with the buffer
         ;; Restart if disconnected
-        (erc-process-sentinel-1 event)
+        (erc-process-sentinel-1 event buf)
         ;; Make sure we don't write to the buffer if it has been
         ;; killed
         (when (buffer-live-p buf)



From MAILER-DAEMON Sun Oct 14 00:52:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSO-0007TF-Bm
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSI-0007NW-40
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOv-0004xV-Mk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOm-0004xK-5r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
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@hcoop.net>) id 1IgvOl-0003ud-P7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOl-00053Q-1s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOl-0005aA-3i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOl-0005aA-3i@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:19 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Remove version strings from modules.
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, 14 Oct 2007 04:51:58 -0000

commit b4ad5d55be65364ecc2b4cf6e979fe1d9764bbcf
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jul 10 04:15:35 2006 +0000

    Remove version strings from modules.
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-8
       Remove module version strings, since we do not update them anymore.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-18

diff --git a/ChangeLog b/ChangeLog
index 1917fb4..6e741a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,20 @@
 
 2006-06-30  Michael Olson  <mwolson@gnu.org>
 
+	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
+	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
+	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
+	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
+	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
+	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
+	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
+	erc.el: Remove version strings.
+
+	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
+	module versions anymore.
+
+	* erc-imenu.el: Remove unnecessary lines in header.
+
 	* erc-goodies.el (erc-handle-irc-url): Docfix.
 
 	* erc-identd.el (erc-identd-start): Do not prompt the user about
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 880f731..4eba453 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -31,9 +31,6 @@
 
 (require 'erc)
 
-(defconst erc-autoaway-version "$Revision: 1.27 $"
-  "ERC Autoaway revision.")
-
 (defgroup erc-autoaway nil
   "Set yourself automatically away after some idletime and set
 yourself back when you type something."
diff --git a/erc-backend.el b/erc-backend.el
index 925b43a..7dce9e4 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -105,8 +105,6 @@
 
 ;;;; Variables and options
 
-(defconst erc-backend-version "$Revision: 1.48 $")
-
 (defvar erc-server-responses (make-hash-table :test #'equal)
   "Hashtable mapping server responses to their handler hooks.")
 
diff --git a/erc-bbdb.el b/erc-bbdb.el
index f4ef05b..854256f 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -50,9 +50,6 @@
 (require 'bbdb-gui)
 (require 'bbdb-hooks)
 
-(defconst erc-bbdb-version "$Revision: 1.34 $"
-  "ERC BBDB revision.")
-
 (defgroup erc-bbdb nil
   "Variables related to BBDB usage."
   :group 'erc)
diff --git a/erc-button.el b/erc-button.el
index 9445e35..13e2a38 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -68,9 +68,6 @@
 
 ;;; Variables
 
-(defconst erc-button-version "$Revision: 1.75 $"
-  "ERC button mode revision.")
-
 (defface erc-button '((t (:bold t)))
   "ERC button face."
   :group 'erc-faces)
diff --git a/erc-capab.el b/erc-capab.el
index 6dc4584..7f59cd8 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -66,9 +66,6 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-capab-version "$Revision: 1.11 $"
-  "ERC CAPAB revision number.")
-
 ;;; Customization:
 
 (defgroup erc-capab nil
diff --git a/erc-chess.el b/erc-chess.el
index 6039e69..f79cf7f 100644
--- a/erc-chess.el
+++ b/erc-chess.el
@@ -36,9 +36,6 @@
 
 ;;;; Variables
 
-(defconst erc-chess-version "$Revision: 1.28 $"
-  "ERC chess revision.")
-
 (defgroup erc-chess nil
   "Playing chess over IRC."
   :group 'erc)
diff --git a/erc-compat.el b/erc-compat.el
index 802acb8..ee9bf89 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -28,9 +28,6 @@
 
 ;;; Code:
 
-(defconst erc-compat-version "$Revision: 1.33 $"
-  "ERC compat revision.")
-
 ;; erc-define-minor-mode: the easy-mmode-define-minor-mode available
 ;; in XEmacs' easy-mmode.el does not have the BODY argument.  This
 ;; code has to work, even if somebody has defaliased
diff --git a/erc-dcc.el b/erc-dcc.el
index fc84302..cf86205 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -58,9 +58,6 @@
   (require 'cl)
   (require 'pcomplete))
 
-(defconst erc-dcc-version "$Revision: 1.98 $"
-  "ERC DCC revision")
-
 (defgroup erc-dcc nil
   "DCC stands for Direct Client Communication, where you and your
 friend's client programs connect directly to each other,
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index f8d09ff..ff9bbd9 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -29,9 +29,6 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-ezb-version "$Revision: 1.15 $"
-  "ERC EZBouncer revision.")
-
 (defgroup erc-ezbounce nil
   "Interface to the EZBounce IRC bouncer (a virtual IRC server)"
   :group 'erc)
diff --git a/erc-fill.el b/erc-fill.el
index f01fb3b..f945d83 100644
--- a/erc-fill.el
+++ b/erc-fill.el
@@ -34,9 +34,6 @@
 (require 'erc)
 (require 'erc-stamp); for the timestamp stuff
 
-(defconst erc-fill-version "$Revision: 1.34 $"
-  "ERC fill revision.")
-
 (defgroup erc-fill nil
   "Filling means to reformat long lines in different ways."
   :group 'erc)
diff --git a/erc-hecomplete.el b/erc-hecomplete.el
index c015cd5..763d75c 100644
--- a/erc-hecomplete.el
+++ b/erc-hecomplete.el
@@ -36,9 +36,6 @@
 (require 'erc-match); for erc-pals
 (require 'hippie-exp); for the hippie expand stuff
 
-(defconst erc-hecomplete-version "$Revision: 1.1 $"
-  "ERC complete revision.")
-
 ;;;###autoload (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t)
 (define-erc-module hecomplete nil
   "Complete nick at point."
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index a91f2fa..a122908 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -35,9 +35,6 @@
 (require 'ibuf-ext)
 (require 'erc)
 
-(defconst erc-ibuffer-version "$Revision: 1.31 $"
-  "ERC ibuffer revision.")
-
 (defgroup erc-ibuffer nil
   "The Ibuffer group for ERC."
   :group 'erc)
diff --git a/erc-imenu.el b/erc-imenu.el
index cdb1745..bf2d5ef 100644
--- a/erc-imenu.el
+++ b/erc-imenu.el
@@ -31,11 +31,6 @@
 
 ;;; Code:
 
-
-;; Author: Mario Lang <mlang@delysid.org>
-
-;; This file is not part of GNU Emacs. But the same license applies.
-
 ;;; Commentary:
 
 ;; This package defines the function `erc-create-imenu-index'.  ERC
@@ -47,9 +42,6 @@
 (require 'erc)
 (require 'imenu)
 
-(defconst erc-imenu-version "$Revision: 1.12 $"
-  "ERC imenu revision.")
-
 (defun erc-unfill-notice ()
   "Return text from point to a computed end as a string unfilled.
 Don't rely on this function, read it first!"
diff --git a/erc-join.el b/erc-join.el
index 8691c5f..3da50a5 100644
--- a/erc-join.el
+++ b/erc-join.el
@@ -36,9 +36,6 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-join-version "$Revision: 1.2 $"
-  "ERC autojoin revision.")
-
 (defgroup erc-autojoin nil
   "Enable autojoining."
   :group 'erc)
diff --git a/erc-list.el b/erc-list.el
index 019be8f..2243a2f 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -38,9 +38,6 @@
   (require 'overlay))
 (eval-when-compile (require 'cl))
 
-(defconst erc-list-version "$Revision: 1.49 $"
-  "ERC channel list revision number")
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; User customizable variables.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/erc-log.el b/erc-log.el
index 8328881..752d712 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -97,9 +97,6 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-log-version "$Revision: 1.30 $"
-  "ERC log mode revision")
-
 (defgroup erc-log nil
   "Logging facilities for ERC."
   :group 'erc)
diff --git a/erc-match.el b/erc-match.el
index 010432e..ad875ce 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -40,9 +40,6 @@
 
 ;; Customisation:
 
-(defconst erc-match-version "$Revision: 1.54 $"
-  "ERC match mode revision.")
-
 (defgroup erc-match nil
   "Keyword and Friend/Foe/... recognition.
 Group containing all things concerning pattern matching in ERC
diff --git a/erc-menu.el b/erc-menu.el
index d7a20ba..36c28b7 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -31,9 +31,6 @@
 
 (require 'easymenu)
 
-(defconst erc-menu-version "$Revision: 1.25 $"
-  "ERC menu revision")
-
 (defvar erc-menu-definition
   (list "IRC"
 	["Connect to server..." erc-select t]
diff --git a/erc-netsplit.el b/erc-netsplit.el
index 7a5236b..02fbe96 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -34,9 +34,6 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-netsplit-version "$Revision: 1.18 $"
-  "ERC netsplit version.")
-
 (defgroup erc-netsplit nil
   "Netsplit detection tries to automatically figure when a
 netsplit happens, and filters the QUIT messages. It also keeps
diff --git a/erc-networks.el b/erc-networks.el
index 0ff73f8..b79a56a 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -45,9 +45,6 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-nets-version "$Revision: 1.1 $"
-  "ERC networks revision.")
-
 ;; Variables
 
 (defgroup erc-networks nil
diff --git a/erc-nicklist.el b/erc-nicklist.el
index 49af2e5..5599565 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -82,9 +82,6 @@
   (error nil))
 (eval-when-compile (require 'cl))
 
-(defconst erc-nicklist-version "$Revision: 1.16 $"
-  "ERC Nicklist version.")
-
 (defgroup erc-nicklist nil
   "Display a list of nicknames in a separate window."
   :group 'erc)
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index 33494bf..efe2a18 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -46,9 +46,6 @@
 (require 'time-date)
 (eval-when-compile (require 'cl))
 
-(defconst erc-pcomplete-version "$Revision: 1.35 $"
-  "ERC pcomplete mode revision")
-
 (defgroup erc-pcomplete nil
   "Programmable completion for ERC"
   :group 'erc)
diff --git a/erc-replace.el b/erc-replace.el
index 76e55ce..07e8cd1 100644
--- a/erc-replace.el
+++ b/erc-replace.el
@@ -37,9 +37,6 @@
 
 (require 'erc)
 
-(defconst erc-replace-version "$Revision: 1.10 $"
-  "Revision of the ERC replace module.")
-
 (defgroup erc-replace nil
   "Replace text from incoming messages"
   :group 'erc)
diff --git a/erc-ring.el b/erc-ring.el
index 08344dc..cabb8e2 100644
--- a/erc-ring.el
+++ b/erc-ring.el
@@ -39,9 +39,6 @@
 (require 'comint)
 (require 'ring)
 
-(defvar erc-ring-version "$Revision: 1.22 $"
-  "ERC ring revision")
-
 ;;;###autoload (autoload 'erc-ring-mode "erc-ring" nil t)
 (define-erc-module ring nil
   "Stores input in a ring so that previous commands and messages can
diff --git a/erc-services.el b/erc-services.el
index 2e6367e..6769487 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -63,9 +63,6 @@
 (require 'erc-networks)
 (eval-when-compile (require 'cl))
 
-(defconst erc-nickserv-version "$Revision: 1.1 $"
-  "ERC NickServ revision.")
-
 ;; Customization:
 
 (defgroup erc-services nil
diff --git a/erc-speedbar.el b/erc-speedbar.el
index 5f0d703..254d7fc 100644
--- a/erc-speedbar.el
+++ b/erc-speedbar.el
@@ -41,9 +41,6 @@
 (condition-case nil (require 'dframe) (error nil))
 (eval-when-compile (require 'cl))
 
-(defconst erc-speedbar-version "$Revision: 1.23 $"
-  "ERC Speedbar version.")
-
 ;;; Customization:
 
 (defgroup erc-speedbar nil
diff --git a/erc-spelling.el b/erc-spelling.el
index aaa5293..528668f 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -34,9 +34,6 @@
 (require 'erc)
 (require 'flyspell)
 
-(defconst erc-spelling-version "$Revision: 1.11 $"
-  "ERC spelling revision.")
-
 ;;;###autoload (autoload 'erc-spelling-mode "erc-spelling" nil t)
 (define-erc-module spelling nil
   "Enable flyspell mode in ERC buffers."
diff --git a/erc-stamp.el b/erc-stamp.el
index 87ad874..5d43baa 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -38,9 +38,6 @@
 (require 'erc)
 (require 'erc-compat)
 
-(defconst erc-stamp-version "$Revision: 1.56 $"
-  "ERC stamp mode revision.")
-
 (defgroup erc-stamp nil
   "For long conversation on IRC it is sometimes quite
 useful to have individual messages timestamp.  This
diff --git a/erc-track.el b/erc-track.el
index 4d0850c..939b545 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -42,9 +42,6 @@
 
 ;;; Code:
 
-(defconst erc-track-version "$Revision: 1.88 $"
-  "ERC track mode revision")
-
 (defgroup erc-track nil
   "Track active buffers and show activity in the modeline."
   :group 'erc)
diff --git a/erc.el b/erc.el
index 0dcdba0..f67dfaa 100644
--- a/erc.el
+++ b/erc.el
@@ -67,7 +67,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.815 $"
+(defconst erc-version-string "Version 5.1.2 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -3176,12 +3176,6 @@ the message given by REASON."
 			    (erc-modes)))
   t)
 
-(defun erc-cmd-SMV ()
-  "Say the current ERC module versions into channel."
-  (erc-send-message (format "I'm using the following module revisions: %s!"
-			    (erc-version-modules)))
-  t)
-
 (defun erc-cmd-DEOP (&rest people)
   "Remove the operator setting from user(s) given in PEOPLE."
   (when (> (length people) 0)



From MAILER-DAEMON Sun Oct 14 00:52:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSO-0007TX-LR
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSI-0007O0-Mi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOv-0004zu-Mu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOp-0004zj-1u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
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@hcoop.net>) id 1IgvOo-0003vZ-Ns
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOo-00054O-26
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOo-0005fG-4p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOo-0005fG-4p@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:22 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.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: Sun, 14 Oct 2007 04:51:59 -0000

commit a487fc435040b178374135867db6e610f2f06b1a
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Aug 3 04:02:08 2006 +0000

    Merged from erc--rel--5.1
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-31
       Release ERC 5.1.4.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-32
       Bundle erc-backend fix with 5.1.4 release.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-28

diff --git a/ChangeLog b/ChangeLog
index a59c842..eca944d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
 2006-08-02  Michael Olson  <mwolson@gnu.org>
 
+	* erc.el (erc-version-string): Release ERC 5.1.4.
+
+	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
+
 	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 	to the wrong buffer.  Thanks to offby1 for the report.
 
+	* erc-backend.el (erc-coding-system-for-target): Handle case where
+	target is nil.  Thanks to Kai Fan for the patch.
+
 2006-07-29  Michael Olson  <mwolson@gnu.org>
 
 	* erc-log.el (erc-log-setup-logging): Don't offer to save the
diff --git a/Makefile b/Makefile
index 62da9c8..449ff29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-VERSION=5.1.3
+VERSION=5.1.4
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.2-1
+LASTUPLOAD = 5.1.3-2
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
diff --git a/NEWS b/NEWS
index b735089..ec5c217 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,29 @@ ERC NEWS                                                       -*- outline -*-
 
 **** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
+* Changes in ERC 5.1.4
+
+** Make find-function and find-variable work in Emacs 22 for
+names that are constructed by `define-erc-module'.
+
+** Fix bug introduced in ERC 5.1.3 that caused messages to go the
+wrong buffer.
+
+** Changes and additions to modules
+
+*** Highlighting (erc-match.el)
+
+**** Don't activate view-mode.
+
+*** Logging (erc-log.el)
+
+**** When this module is activated, make sure logging is enabled on
+already-opened buffers.  Ditto for disabling logging when the module
+is deactivated.
+
+**** Fix some errors that occur when exiting Emacs without first
+quitting open IRC servers.
+
 * Changes in ERC 5.1.3
 
 ** Fix use of /quote command with no initial whitespace.
diff --git a/erc-backend.el b/erc-backend.el
index 7dce9e4..705ca7a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -563,11 +563,12 @@ action."
   "Return the coding system or cons cell appropriate for TARGET.
 This is determined via `erc-encoding-coding-alist' or
 `erc-server-coding-system'."
-  (or (let ((case-fold-search t))
-        (catch 'match
-          (dolist (pat erc-encoding-coding-alist)
-            (when (string-match (car pat) target)
-              (throw 'match (cdr pat))))))
+  (or (when target
+        (let ((case-fold-search t))
+          (catch 'match
+            (dolist (pat erc-encoding-coding-alist)
+              (when (string-match (car pat) target)
+                (throw 'match (cdr pat)))))))
       (and (functionp erc-server-coding-system)
            (funcall erc-server-coding-system))
       erc-server-coding-system))
diff --git a/erc.el b/erc.el
index bfc8c9e..79fd987 100644
--- a/erc.el
+++ b/erc.el
@@ -67,7 +67,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.3 (devel)"
+(defconst erc-version-string "Version 5.1.4 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
diff --git a/erc.texi b/erc.texi
index cfa7743..ac41ca1 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.1.3.
+This manual is for ERC version 5.1.4.
 
 Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
 



From MAILER-DAEMON Sun Oct 14 00:52:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSO-0007Tu-QZ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00052z-H1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOe-0004nc-3p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004jl-BC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
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@hcoop.net>) id 1IgvOW-0003pX-Ui
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOW-0004y0-65
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOW-0005A7-9j
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOW-0005A7-9j@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:04 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add NEWS item for reconnect and move
	to prompt bugfix.
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, 14 Oct 2007 04:51:59 -0000

commit fca8d0a4200f5b219d6717b7cc8e66dc951eb407
Merge: 52c1aa2... f984125...
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 16 00:51:31 2006 +0000

    Add NEWS item for reconnect and move to prompt bugfix.
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-124




From MAILER-DAEMON Sun Oct 14 00:51:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSI-0007OY-Rm
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSG-0007M8-JE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005D2-4w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPW-0005Ce-Ty
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
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@hcoop.net>) id 1IgvPU-00045q-8x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPT-0005Jf-Bc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPT-0006jv-DJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPT-0006jv-DJ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:03 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-pkg.el: Update description
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, 14 Oct 2007 04:51:57 -0000

commit 46c141aca684cdd8bbb8958048373c1365667232
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jun 17 15:43:48 2007 +0000

    erc-pkg.el: Update description
    
    2007-06-17  Michael Olson  <mwolson@gnu.org>
    
    	* erc-pkg.el: Update description to match what is currently in
    	ELPA.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-150

diff --git a/ChangeLog b/ChangeLog
index f048b8f..2a6cad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-17  Michael Olson  <mwolson@gnu.org>
+
+	* erc-pkg.el: Update description to match what is currently in
+	ELPA.
+
 2007-06-13  Michael Olson  <mwolson@gnu.org>
 
 	* erc-compat.el (erc-with-selected-window): New compatibility
diff --git a/erc-pkg.el b/erc-pkg.el
index 37d1285..23a73a0 100644
--- a/erc-pkg.el
+++ b/erc-pkg.el
@@ -1,4 +1,3 @@
 ;; ELPA package definition for ERC
 
-(define-package "erc" "5.2"
-  "IRC client that is powerful, modular, and extensible")
+(define-package "erc" "5.2" "An Emacs Internet Relay Chat client")



From MAILER-DAEMON Sun Oct 14 00:52:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSP-0007UW-1V
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSJ-0007Ot-Ci
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPv-0005Vc-Vh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPt-0005TA-GH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
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@hcoop.net>) id 1IgvPt-0004EW-AD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPs-0005TD-Ky
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPs-0007Qh-MO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPs-0007Qh-MO@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:28 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fix small typo in erc.texi
	(Special-Features).
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, 14 Oct 2007 04:51:59 -0000

commit 3539cb6db19bfd2bf81f42927867a1c8a74c44a5
Author: Exal de Jesus Garcia Carrillo <exal@gnu.org>
Date:   Tue Sep 18 14:33:56 2007 -0500

    Fix small typo in erc.texi (Special-Features).

diff --git a/ChangeLog b/ChangeLog
index d96d872..9b310b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>
+
+	* erc.texi (Special-Features): Fix small typo.
+
 2007-09-16  Michael Olson  <mwolson@gnu.org>
 
 	* erc-track.el (erc-track-switch-direction): Mention



From MAILER-DAEMON Sun Oct 14 00:52:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSP-0007Ur-Ed
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPy-0005YF-Gn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPq-0005Qf-Sn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPq-0005Qa-OI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
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@hcoop.net>) id 1IgvPq-0004Dk-Fp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:26 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPp-0005SF-Pp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPp-0007Lh-S1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:25 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPp-0007Lh-S1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:25 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Update version string to 5.3 (devel)
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, 14 Oct 2007 04:52:01 -0000

commit b459923cc9aca407744f8e831fb897005806257c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:49:15 2007 -0400

    Update version string to 5.3 (devel)
    
    * erc.el (erc-version-string): Update to 5.3, development version.

diff --git a/ChangeLog b/ChangeLog
index 7342a05..1a495f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-08  Michael Olson  <mwolson@gnu.org>
+
+	* 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
diff --git a/erc.el b/erc.el
index e62df39..222a1e2 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.2"
+(defconst erc-version-string "Version 5.3 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:52:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSP-0007VC-Ma
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00053I-MK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOd-0004mQ-Rn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOZ-0004kY-3t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
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@hcoop.net>) id 1IgvOY-0003qB-Nk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOX-0004yi-W6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOY-0005D7-1i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOY-0005D7-1i@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:01 -0000

commit 47304d40f65acabdd39ecbb252338483dfda049b
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 23 23:19:45 2006 +0000

    Update from CVS
    
    2006-02-20  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-capab.el (erc-capab-send-identify-messages): Fixed comment
       to explain thoughts better.  `erc-server-parameters' is an
       associated list when it's set, not a string.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-130

diff --git a/ChangeLog b/ChangeLog
index cc80019..d9b2875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-20  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
+	to explain thoughts better.  `erc-server-parameters' is an
+	associated list when it's set, not a string.
+
 2006-02-19  Michael Olson  <mwolson@gnu.org>
 
 	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
diff --git a/erc-capab.el b/erc-capab.el
index 15ca9fd..36802f3 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -63,11 +63,17 @@
 
 ;;; Todo:
 
+;; DSM check in modify hook if we should mark, then mark appropriately
+;;     `erc-capab-identify-add-prefix'
+;;     and/or
+;;     `erc-capab-identify-apply-face'
+;; DSM CTCP has `erc-identified' but not `erc-parsed' so can't find out nickname?...
+
 ;;; Code:
 
 (require 'erc)
 
-(defconst erc-capab-version "$Revision: 1.6 $"
+(defconst erc-capab-version "$Revision: 1.7 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -81,6 +87,10 @@
   :group 'erc-capab
   :type '(choice string (const nil)))
 
+(defface erc-capab-unidentified
+  '((t :inherit highlight))
+  "Face for displaying users who haven't identified with NickServ.")
+
 ;;; Define module:
 
 (define-erc-response-handler (290)
@@ -134,9 +144,9 @@ These arguments are sent to this function when called as a hook in
   "Send CAPAB IDENTIFY messages if the server supports it."
   (when (and (stringp erc-server-version)
              (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
-             ;; could possibly check for IRCD=dancer in `erc-server-parameters'
-             ;; instead of looking for specific version names
-             (stringp erc-server-parameters)
+             ;; could possibly check for '("IRCD" . "dancer") in
+             ;; `erc-server-parameters' instead of looking for a specific name
+             ;; in `erc-server-version'
              (assoc "CAPAB" erc-server-parameters))
     (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
     (erc-server-send "CAPAB IDENTIFY-MSG")



From MAILER-DAEMON Sun Oct 14 00:52:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSP-0007Uk-8T
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-000530-Gi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOf-0004pd-UY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOd-0004pA-MQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
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@hcoop.net>) id 1IgvOc-0003rV-SL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOc-00050H-1i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOc-0005Ke-48
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOc-0005Ke-48@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:10 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:00 -0000

commit 6bcf0bb6e39b66630d9262cc92049d6c4f18694f
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 25 18:10:45 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-145

diff --git a/erc.el b/erc.el
index 2340626..c67e8d8 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.810 $"
+(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.811 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:52:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSQ-0007Va-1c
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSN-0007S4-0c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004ta-3I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOi-0004tS-4c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
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@hcoop.net>) id 1IgvOh-0003tU-T9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOh-00052A-6O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOh-0005Td-8L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOh-0005Td-8L@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:15 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-autoaway: Fix an introduced 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: Sun, 14 Oct 2007 04:52:03 -0000

commit 7f75a654ec9717a92a1cbad11c25e5b6b7bb8e55
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Jun 3 19:37:16 2006 +0000

    erc-autoaway: Fix an introduced bug.
    
    * erc-autoaway.el (autoaway): Use a more specific idle reset function.
      (erc-autoaway-reset-idle-user): New function that resets the idle state
      for user idle time.
      (erc-autoaway-reset-idle-irc): Renamed from `erc-autoaway-reset-idle'.
      Don't pass line to `erc-autoaway-set-away', since it is not used.
      (erc-autoaway-set-back): Remove line argument, since it is not used.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-5

diff --git a/ChangeLog b/ChangeLog
index c5af6a7..d63826f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,8 +14,13 @@
 	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 	Docfix.
 	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
-	(erc-autoaway-reset-idletime): Make the first argument optional so
-	that we can safely add this to post-command-hook.
+	(erc-autoaway-reset-idle-irc): Renamed from
+	`erc-autoaway-reset-idle'.  Don't pass line to
+	`erc-autoaway-set-away', since it is not used.
+	(erc-autoaway-reset-idle-user): New function that resets the idle
+	state for user idle time.
+	(erc-autoaway-set-back): Remove line argument, since it is not
+	used.
 
 	* Makefile (upload): Make this work for Savannah uploads.
 
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 518005d..1ce9583 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -87,19 +87,19 @@ set you no longer away.
 Related variables: `erc-public-away-p' and `erc-away-nickname'."
   ;; Enable:
   ((cond ((eq erc-autoaway-idle-method 'irc)
-	  (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
-	  (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime))
+	  (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+	  (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
 	 ((eq erc-autoaway-idle-method 'user)
-	  (add-hook 'post-command-hook 'erc-autoaway-reset-idletime))
+	  (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
 	 ((eq erc-autoaway-idle-method 'emacs)
 	  (erc-autoaway-reestablish-idletimer)))
    (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away))
   ;; Disable:
   ((cond ((eq erc-autoaway-idle-method 'irc)
-	  (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
-	  (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime))
+	  (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+	  (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
 	 ((eq erc-autoaway-idle-method 'user)
-	  (remove-hook 'post-command-hook 'erc-autoaway-reset-idletime))
+	  (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
 	 ((eq erc-autoaway-idle-method 'emacs)
 	  (erc-cancel-timer erc-autoaway-idletimer)
 	  (setq erc-autoaway-idletimer nil)))
@@ -167,17 +167,25 @@ in seconds."
 (defvar erc-autoaway-last-sent-time (erc-current-time)
   "The last time the user sent something.")
 
-(defun erc-autoaway-reset-idletime (&optional line &rest stuff)
-  "Reset the stored idletime for the user.
-This is one global variable since a user talking on one net can talk
-on another net too."
+(defun erc-autoaway-reset-idle-user (&rest stuff)
+  "Reset the stored user idle time.
+This is one global variable since a user talking on one net can
+talk on another net too."
+  (when erc-auto-discard-away
+    (erc-autoaway-set-back))
+  (setq erc-autoaway-last-sent-time (erc-current-time)))
+
+(defun erc-autoaway-reset-idle-irc (line &rest stuff)
+  "Reset the stored IRC idle time.
+This is one global variable since a user talking on one net can
+talk on another net too."
   (when (and erc-auto-discard-away
 	     (stringp line)
 	     (not (string-match erc-autoaway-no-auto-discard-regexp line)))
-    (erc-autoaway-set-back line))
+    (erc-autoaway-set-back))
   (setq erc-autoaway-last-sent-time (erc-current-time)))
 
-(defun erc-autoaway-set-back (line)
+(defun erc-autoaway-set-back ()
   "Discard the away state globally."
   (when (erc-away-p)
     (setq erc-autoaway-last-sent-time (erc-current-time))



From MAILER-DAEMON Sun Oct 14 00:52:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvP1-00053d-NN
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOk-0004vp-O2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOY-0004iX-GN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004hv-TA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003oJ-KP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOT-0004wj-0Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOT-000547-3R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOT-000547-3R@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:48:30 -0000

commit 6bb56606b7035150b68d5e171cd1e0df0739180a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Feb 11 18:31:16 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-112

diff --git a/erc-capab.el b/erc-capab.el
index 9fb1ac9..6c753d5 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -67,7 +67,7 @@
 
 (require 'erc)
 
-(defconst erc-capab-version "$Revision: 1.4 $"
+(defconst erc-capab-version "$Revision: 1.5 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
diff --git a/erc.el b/erc.el
index 7a488d1..a5970d1 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.806 $"
+(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.807 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:52:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSU-0007ZA-48
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSO-0007TE-9w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004ts-JL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOi-0004tg-FH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
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@hcoop.net>) id 1IgvOi-0003tb-74
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOh-00052G-Gl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOh-0005U8-Hc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOh-0005U8-Hc@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:15 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-autoaway: Fix error on startup.
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, 14 Oct 2007 04:52:04 -0000

commit 0d03c66bf1dd15c87998b273374b04e8c7d8944a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jun 4 16:55:18 2006 +0000

    erc-autoaway: Fix error on startup.
    
    * erc-autoaway.el (erc-autoaway-idle-method): Move after the definition
      of the autoaway module.
      (autoaway): Don't do anything if erc-autoaway-idle-method is unbound.
      This prevents an error on startup.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-6

diff --git a/ChangeLog b/ChangeLog
index d63826f..de8539c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-04  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
+	definition of the autoaway module.
+	(autoaway): Don't do anything if erc-autoaway-idle-method is
+	unbound.  This prevents an error on startup.
+
 2006-06-03  Michael Olson  <mwolson@gnu.org>
 
 	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 1ce9583..aac6549 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -43,25 +43,6 @@ yourself back when you type something."
   "The Emacs idletimer.
 This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
 
-(defcustom erc-autoaway-idle-method 'user
-  "*The method used to determine how long you have been idle.
-If 'user, the time of the last command sent to Emacs is used.
-If 'emacs, the idle time in Emacs is used.
-If 'irc, the time of the last IRC command is used.
-
-The time itself is specified by `erc-autoaway-idle-seconds'.
-
-See `erc-autoaway-mode' for more information on the various
-definitions of being idle."
-  :group 'erc-autoaway
-  :type '(choice (const :tag "User idle time" user)
-		 (const :tag "Emacs idle time" emacs)
-		 (const :tag "Last IRC action" irc))
-  :set (lambda (sym val)
-	 (erc-autoaway-disable)
-	 (set-default sym val)
-	 (erc-autoaway-enable)))
-
 ;;;###autoload (autoload 'erc-autoaway-mode "erc-autoaway")
 (define-erc-module autoaway nil
   "In ERC autoaway mode, you can be set away automatically.
@@ -86,24 +67,47 @@ set you no longer away.
 
 Related variables: `erc-public-away-p' and `erc-away-nickname'."
   ;; Enable:
-  ((cond ((eq erc-autoaway-idle-method 'irc)
-	  (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
-	  (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
-	 ((eq erc-autoaway-idle-method 'user)
-	  (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
-	 ((eq erc-autoaway-idle-method 'emacs)
-	  (erc-autoaway-reestablish-idletimer)))
-   (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away))
+  ((when (boundp 'erc-autoaway-idle-method)
+     (cond
+      ((eq erc-autoaway-idle-method 'irc)
+       (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+       (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
+      ((eq erc-autoaway-idle-method 'user)
+       (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
+      ((eq erc-autoaway-idle-method 'emacs)
+       (erc-autoaway-reestablish-idletimer)))
+     (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)))
   ;; Disable:
-  ((cond ((eq erc-autoaway-idle-method 'irc)
-	  (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
-	  (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
-	 ((eq erc-autoaway-idle-method 'user)
-	  (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
-	 ((eq erc-autoaway-idle-method 'emacs)
-	  (erc-cancel-timer erc-autoaway-idletimer)
-	  (setq erc-autoaway-idletimer nil)))
-   (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)))
+  ((when (boundp 'erc-autoaway-idle-method)
+     (cond
+      ((eq erc-autoaway-idle-method 'irc)
+       (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+       (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
+      ((eq erc-autoaway-idle-method 'user)
+       (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
+      ((eq erc-autoaway-idle-method 'emacs)
+       (erc-cancel-timer erc-autoaway-idletimer)
+       (setq erc-autoaway-idletimer nil)))
+     (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away))))
+
+(defcustom erc-autoaway-idle-method 'user
+  "*The method used to determine how long you have been idle.
+If 'user, the time of the last command sent to Emacs is used.
+If 'emacs, the idle time in Emacs is used.
+If 'irc, the time of the last IRC command is used.
+
+The time itself is specified by `erc-autoaway-idle-seconds'.
+
+See `erc-autoaway-mode' for more information on the various
+definitions of being idle."
+  :group 'erc-autoaway
+  :type '(choice (const :tag "User idle time" user)
+		 (const :tag "Emacs idle time" emacs)
+		 (const :tag "Last IRC action" irc))
+  :set (lambda (sym val)
+	 (erc-autoaway-disable)
+	 (set-default sym val)
+	 (erc-autoaway-enable)))
 
 (defcustom erc-auto-set-away t
   "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.



From MAILER-DAEMON Sun Oct 14 00:52:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvST-0007Yq-SM
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-000539-EJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004nE-MK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOb-0004n0-1m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
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@hcoop.net>) id 1IgvOa-0003qz-Nu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOa-0004zU-2b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOa-0005H9-5B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOa-0005H9-5B@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:08 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-bbdb: Make unelectric 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: Sun, 14 Oct 2007 04:52:04 -0000

commit c712df612f7412f695717b9294cfa2ac566894b9
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Mar 21 05:39:23 2006 +0000

    erc-bbdb: Make unelectric by default.
    
    * CREDITS: Add Nelson Ferreira.  Change contact address.
    
    * erc-bbdb.el: Install patch from Nelson Ferreira.
     (erc-bbdb-electric-p): New option that indicates whether to make the
     BBDB buffer electric.  Defaults to "not electric".
     (erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-138

diff --git a/CREDITS b/CREDITS
index c06ea5e..0d915bf 100644
--- a/CREDITS
+++ b/CREDITS
@@ -124,8 +124,11 @@ Luigi Panzeri (matley AT muppetslab DOT org):
 Simon Josefsson  (jas AT extundo DOT com):
   * Changed erc.el to use tls.el instead of ssl.el.
 
+Nelson Ferreira <nelson.ferreira@ieee.org>:
+  * Made BBDB buffers not electric by default (6 lines changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
-forgot. If you aren't listed here, simply write a mail to mlang@delysid.org,
-I'll add you then.
+forgot.  If you aren't listed here and should be, send an email to
+mwolson@gnu.org along with a list of your contributions.
diff --git a/ChangeLog b/ChangeLog
index d5b7cc8..d9007e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-21  Michael Olson  <mwolson@gnu.org>
+
+	* CREDITS: Add Nelson Ferreira.  Change contact address.
+
+	* erc-bbdb.el: Install patch from Nelson Ferreira.
+	(erc-bbdb-electric-p): New option that indicates whether to make
+	the BBDB buffer electric.  Defaults to "not electric".
+	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
+
 2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-button.el (erc-button-keymap): Use <backtab> rather than
diff --git a/erc-bbdb.el b/erc-bbdb.el
index b371121..fddd419 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -113,6 +113,11 @@ their \"displayed name\"."
   :group 'erc-bbdb
   :type 'boolean)
 
+(defcustom erc-bbdb-electric-p nil
+  "*If t, BBDB popup buffer is electric."
+  :group 'erc-bbdb
+  :type 'boolean)
+
 (defun erc-bbdb-search-name-and-create (create-p name nick finger-host silent)
   (let* ((ircnick (cons erc-bbdb-irc-nick-field (concat "^"
 							(regexp-quote nick))))
@@ -133,7 +138,8 @@ their \"displayed name\"."
       record)))
 
 (defun erc-bbdb-show-entry (record channel proc)
-  (let ((bbdb-display-layout (bbdb-grovel-elide-arg erc-bbdb-elide-display)))
+  (let ((bbdb-display-layout (bbdb-grovel-elide-arg erc-bbdb-elide-display))
+	(bbdb-electric-p erc-bbdb-electric-p))
     (when (and record (or (eq erc-bbdb-popup-type t)
 			  (and (eq erc-bbdb-popup-type 'visible)
 			       (and channel



From MAILER-DAEMON Sun Oct 14 00:52:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSU-0007Zj-GD
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-000536-C1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004t4-3u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOg-0004sO-Vc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
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@hcoop.net>) id 1IgvOg-0003tA-Nc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOg-00051m-0o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOg-0005Re-3m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOg-0005Re-3m@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make sure all buffers returned from
	`erc-buffer-filter' are live.
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, 14 Oct 2007 04:52:07 -0000

commit e788189303c0336e79d82025b3c945ba59b4a413
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Jun 1 21:49:50 2006 +0000

    Make sure all buffers returned from `erc-buffer-filter' are live.
    
    * erc.el (erc-buffer-filter): Make sure all buffers returned from this
      are live.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-1

diff --git a/ChangeLog b/ChangeLog
index d7ea2d5..2d6c995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-buffer-filter): Make sure all buffers returned from
+	this are live.
+
 2006-05-15  Michael Olson  <mwolson@gnu.org>
 
 	* README: Add License information.  Permit images to be used,
diff --git a/erc.el b/erc.el
index 8240f10..c3c2a54 100644
--- a/erc.el
+++ b/erc.el
@@ -1595,12 +1595,13 @@ server connection, or nil which means all open connections."
     (delq
      nil
      (mapcar (lambda (buf)
-	       (with-current-buffer buf
-		 (and (eq major-mode 'erc-mode)
-		      (or (not proc)
-			  (eq proc erc-server-process))
-		      (funcall predicate)
-		      buf)))
+	       (when (buffer-live-p buf)
+		 (with-current-buffer buf
+		   (and (eq major-mode 'erc-mode)
+			(or (not proc)
+			    (eq proc erc-server-process))
+			(funcall predicate)
+			buf))))
 	     (buffer-list)))))
 
 (defun erc-buffer-list (&optional predicate proc)



From MAILER-DAEMON Sun Oct 14 00:52:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSU-0007aN-Ve
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSR-0007W0-B6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSO-0007TI-Bo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPB-00054H-NI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
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@hcoop.net>) id 1IgvPB-00041w-F3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPA-0005CC-OV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPA-0006Et-Qi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPA-0006Et-Qi@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:44 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix infinite reconnect bug when
	server error occurs
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, 14 Oct 2007 04:52:08 -0000

commit c343782579602ebd40d02c267ca85823bc6ca846
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jan 22 01:49:04 2007 +0000

    Fix infinite reconnect bug when server error occurs
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-99

diff --git a/ChangeLog b/ChangeLog
index ce29520..2e8d3e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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.
diff --git a/erc-backend.el b/erc-backend.el
index 477354b..8122c8a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -201,6 +201,10 @@ active, use the `erc-server-process-alive' function instead.")
   "Non-nil if the user is denied access because of a server ban.")
 (make-variable-buffer-local 'erc-server-banned)
 
+(defvar erc-server-error-occurred nil
+  "Non-nil if the user triggers some server error.")
+(make-variable-buffer-local 'erc-server-error-occurred)
+
 (defvar erc-server-lines-sent nil
   "Line counter.")
 (make-variable-buffer-local 'erc-server-lines-sent)
@@ -495,6 +499,7 @@ We will store server variables in the buffer given by BUFFER."
         (setq erc-server-quitting nil)
         (setq erc-server-timed-out nil)
         (setq erc-server-banned nil)
+        (setq erc-server-error-occurred nil)
         (let ((time (erc-current-time)))
           (setq erc-server-last-sent-time time)
           (setq erc-server-last-ping-time time)
@@ -570,6 +575,7 @@ Make sure you are in an ERC buffer when running this."
 EVENT is the message received from the closed connection process."
   (and erc-server-auto-reconnect
        (not erc-server-banned)
+       (not erc-server-error-occurred)
        ;; make sure we don't infinitely try to reconnect, unless the
        ;; user wants that
        (or (eq erc-server-reconnect-attempts t)
@@ -1098,6 +1104,7 @@ add things to `%s' instead."
 
 (define-erc-response-handler (ERROR)
   "Handle an ERROR command from the server." nil
+  (setq erc-server-error-occurred t)
   (erc-display-message
    parsed 'error nil 'ERROR
    ?s (erc-response.sender parsed) ?c (erc-response.contents parsed)))



From MAILER-DAEMON Sun Oct 14 00:52:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSU-0007Zw-Ox
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00053D-GN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004oW-LC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOc-0004oH-EY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
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@hcoop.net>) id 1IgvOc-0003rK-5r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOb-000505-Eu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOb-0005Je-Hc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOb-0005Je-Hc@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:09 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:08 -0000

commit ebe9dc6b6539e7012c0ae7703f2bfefde37d5a1a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 25 06:18:46 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-143

diff --git a/erc.el b/erc.el
index dcdb57a..86901a9 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.809 $"
+(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.810 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:52:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSX-0007cT-78
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvST-0007Ye-K4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSQ-0007Wc-Ng
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPB-00054G-DT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
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@hcoop.net>) id 1IgvPB-00041n-6P
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPA-0005C6-FF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPA-0006EP-H6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPA-0006EP-H6@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:44 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-services: Add Ars
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, 14 Oct 2007 04:52:10 -0000

commit 1c418d505aca452c20a007bb54d4d15c0f76b250
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jan 22 01:22:40 2007 +0000

    erc-services: Add Ars
    
    * erc-services.el (erc-nickserv-passwords, erc-nickserv-alist): Add Ars.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-98

diff --git a/ChangeLog b/ChangeLog
index f0bf9c3..ce29520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 2007-01-22  Michael Olson  <mwolson@gnu.org>
 
-	* erc-services.el (erc-nickserv-alist): Alphabetize and add
-	QuakeNet.  Standardize look of entries.  Fix type mismatch error
-	in customize interface.
+	* 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.
 
diff --git a/erc-services.el b/erc-services.el
index 8b59181..213f41e 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -168,6 +168,7 @@ Example of use:
   :type '(repeat
 	  (list :tag "Network"
 		(choice :tag "Network name"
+			(const Ars)
 			(const Austnet)
 			(const Azzurra)
 			(const BitlBee)
@@ -188,7 +189,11 @@ Example of use:
 ;; Variables:
 
 (defcustom erc-nickserv-alist
-  '((Austnet
+  '((Ars
+     nil nil
+     "Census"
+     "IDENTIFY" nil nil)
+    (Austnet
      "NickOP!service@austnet.org"
      "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
      "nickop@austnet.org"



From MAILER-DAEMON Sun Oct 14 00:52:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSW-0007cD-VM
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00052I-HO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004vZ-Js
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOk-0004uv-04
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
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@hcoop.net>) id 1IgvOj-0003u7-Nz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOj-00052k-0T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOj-0005Wf-2c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOj-0005Wf-2c@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merge changes that were pending in
	the 5.1 release branch.
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, 14 Oct 2007 04:52:08 -0000

commit 578064a4f2c1ea639b49ca0eccd2b0397c45e3db
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Jun 27 07:07:12 2006 +0000

    Merge changes that were pending in the 5.1 release branch.
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-11

diff --git a/ChangeLog b/ChangeLog
index 4153c64..353f2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -291,6 +291,11 @@
 	* erc.el (erc-modules): Added `capab-identify' to options.
 	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 	(erc-get-parsed-vector-type): Moved here from erc-match.el.
+	(erc-version-string): Remove "(CVS)".
+	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
+	connections work as expected.  Connecting with `open-tls-stream'
+	only seems to work (if at all?) when using the tls.el located in
+	lisp/net/ in Emacs22.
 
 	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 	(erc-get-parsed-vector-type): Moved these functions to erc.el
@@ -299,7 +304,7 @@
 	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 	erc-services.el since the file name has changed.
 
-	* NEWS: Added erc-capab.el.
+	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 
 	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 	to "ERC".
diff --git a/NEWS b/NEWS
index 3f8e955..6887a94 100644
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,10 @@ to make the BBDB buffer electric.  This defaults to not electric.
 
 * Changes in ERC 5.1.2
 
+** Go back to using ssl.el so that SSL connections work as expected.
+Connecting with `open-tls-stream' only seems to work (if at all?) when
+using the tls.el located in lisp/net/ in Emacs22.
+
 ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
 
 ** Move to end of prompt when ERC reconnects to a server.



From MAILER-DAEMON Sun Oct 14 00:52:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSX-0007co-D1
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00053B-Fp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOb-0004mH-UQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOa-0004m6-NQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
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@hcoop.net>) id 1IgvOa-0003qt-FY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOZ-0004zO-Pk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOZ-0005Gd-Sa
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOZ-0005Gd-Sa@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:12 -0000

commit bc885f6f11106916c25c5aae14546707a6d83b8b
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Mar 13 21:11:03 2006 +0000

    Update from CVS
    
    2006-03-09  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-button.el (erc-button-keymap): Use <backtab> rather than
       <C-tab> for `erc-button-previous' as it is a more standard key
       binding for this type of function.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-137

diff --git a/ChangeLog b/ChangeLog
index f0dde21..d5b7cc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-09  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-keymap): Use <backtab> rather than
+	<C-tab> for `erc-button-previous' as it is a more standard key
+	binding for this type of function.
+
 2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-capab.el: Removed things that were accidentally committed on
diff --git a/erc-button.el b/erc-button.el
index e37ca00..9445e35 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -68,7 +68,7 @@
 
 ;;; Variables
 
-(defconst erc-button-version "$Revision: 1.74 $"
+(defconst erc-button-version "$Revision: 1.75 $"
   "ERC button mode revision.")
 
 (defface erc-button '((t (:bold t)))
@@ -219,7 +219,7 @@ PAR is a number of a regexp grouping whose text will be passed to
         (define-key map (kbd "<button2>") 'erc-button-click-button)
       (define-key map (kbd "<mouse-2>") 'erc-button-click-button))
     (define-key map (kbd "TAB") 'erc-button-next)
-    (define-key map (kbd "<C-tab>") 'erc-button-previous)
+    (define-key map (kbd "<backtab>") 'erc-button-previous)
     (set-keymap-parent map erc-mode-map)
     map)
   "Local keymap for ERC buttons.")



From MAILER-DAEMON Sun Oct 14 00:52:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSX-0007cJ-1n
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvST-0007YY-JL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSS-0007XZ-1w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP1-00053X-4e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
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@hcoop.net>) id 1IgvP0-0003z5-RA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOz-000582-SV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOz-0005xO-Va
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOz-0005xO-Va@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:33 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-dcc: Fix wrong type argument 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: Sun, 14 Oct 2007 04:52:10 -0000

commit c1f17cf8477168f8b2963b239bfd2d0f30947cc8
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Nov 21 02:16:07 2006 +0000

    erc-dcc: Fix wrong type argument bug
    
    2006-11-20  Andrea Russo  <rastandy@inventati.org>
    
    	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
    	before calling `erc-display-prompt'.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-64

diff --git a/ChangeLog b/ChangeLog
index 60a9e66..74c9b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-20  Andrea Russo  <rastandy@inventati.org>
+
+	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
+	before calling `erc-display-prompt'.
+
 2006-11-20  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-update-modules): Display better error message when
diff --git a/erc-dcc.el b/erc-dcc.el
index 26d4557..9d5a8e9 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -1035,6 +1035,7 @@ other client."
     (setq erc-dcc-entry-data entry)
     (setq erc-dcc-unprocessed-output "")
     (setq erc-insert-marker (set-marker (make-marker) (point-max)))
+    (setq erc-input-marker (make-marker))
     (erc-display-prompt buffer (point-max))
     (set-process-buffer proc buffer)
     (add-hook 'kill-buffer-hook 'erc-dcc-chat-buffer-killed nil t)



From MAILER-DAEMON Sun Oct 14 00:52:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSY-0007du-Gs
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSW-0007ar-1T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSU-0007ZX-Bv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPB-00054I-TD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
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@hcoop.net>) id 1IgvPB-000421-NZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPB-0005CI-1l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPB-0006FP-3y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPB-0006FP-3y@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:45 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Added OFTC network and fixed its
	NickServ message regexp.
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, 14 Oct 2007 04:52:12 -0000

commit 8d667fc63f40b94e5866d3ec8511318afc23d6bb
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 25 03:27:46 2007 +0000

    Added OFTC network and fixed its NickServ message regexp.
    
    * erc-networks.el (erc-server-alist, erc-networks-alist): Added
    definitions for oftc.net.
    
    * erc-services.el (erc-nickserv-alist): Fixed OFTC message regexp.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-100

diff --git a/ChangeLog b/ChangeLog
index 2e8d3e5..37bb704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-25  Diane Murray  <disumu@x3y2z1.net>
+
+	* 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
diff --git a/erc-networks.el b/erc-networks.el
index b5c13d8..8b88614 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -317,6 +317,8 @@
   ("Novernet: Random server" Novernet "irc.novernet.com" ((6665 6669) 7000 ))
   ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 ))
   ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667)
+  ("OFTC: Random server" OFTC "irc.oftc.net" ((6667 6670) 7000))
+  ("OFTC: SSL enabled server" OFTC "ircs.oftc.net" (6697 9999))
   ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669)))
   ("Othernet: Random server" Othernet "irc.othernet.org" 6667)
   ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667)
@@ -611,6 +613,7 @@ PORTS is either a number, a list of numbers, or a list of port ranges."
     (Novernet "novernet.com")
     (Nullrouted "nullrouted.org")
     (NullusNet "nullus.net")
+    (OFTC "oftc.net")
     (OpChat "opchat.org")
     (Openprojects "openprojects.net")
     (Othernet "othernet.org")
diff --git a/erc-services.el b/erc-services.el
index 213f41e..74cfeb4 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -234,7 +234,7 @@ Example of use:
      "IDENTIFY" nil "SQUERY")
     (OFTC
      "NickServ!services@services.oftc.net"
-     "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
+     "type\\s-/msg\\s-NickServ\\s-IDENTIFY\\s-password."
      "NickServ"
      "IDENTIFY" nil nil)
     (QuakeNet



From MAILER-DAEMON Sun Oct 14 00:52:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSY-0007e7-Oz
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSV-0007b6-Ur
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSS-0007Y1-H4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPA-00054B-1Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
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@hcoop.net>) id 1IgvP9-00041C-Nx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP8-0005Bc-W3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP9-0006Bt-2M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP9-0006Bt-2M@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:43 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Made left-side whitespace invisible.
	Added erc-toggle-timestamps.
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, 14 Oct 2007 04:52:13 -0000

commit cc9891a23357885ebaeb6be0b83b505a9406fc2c
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Tue Jan 16 21:03:02 2007 +0000

    Made left-side whitespace invisible.  Added erc-toggle-timestamps.
    
    * 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'.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-93

diff --git a/ChangeLog b/ChangeLog
index bc6b1c9..6d40830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
 
diff --git a/erc-stamp.el b/erc-stamp.el
index 6b03713..9edc40d 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -203,6 +203,7 @@ space before a right timestamp in any saved logs."
 	 (s (if ignore-p (make-string len ? ) string)))
     (unless ignore-p (setq erc-timestamp-last-inserted string))
     (erc-put-text-property 0 len 'field 'erc-timestamp s)
+    (erc-put-text-property 0 len 'invisible 'timestamp s)
     (insert s)))
 
 (defun erc-insert-aligned (string pos)
@@ -319,6 +320,21 @@ set, and timestamping is already active."
   (setq erc-hide-timestamps nil)
   (erc-munge-invisibility-spec))
 
+(defun erc-toggle-timestamps ()
+  "Hide or show timestamps in ERC buffers.
+
+Note that timestamps can only be shown for a message using this
+function if `erc-timestamp-format' was set and timestamping was
+enabled when the message was inserted."
+  (interactive)
+  (if erc-hide-timestamps
+      (setq erc-hide-timestamps nil)
+    (setq erc-hide-timestamps t))
+  (mapc (lambda (buffer)
+	  (with-current-buffer buffer
+	    (erc-munge-invisibility-spec)))
+	(erc-buffer-list)))
+
 (defun erc-echo-timestamp (before now)
   "Print timestamp text-property of an IRC message.
 Argument BEFORE is where point was before it got moved and



From MAILER-DAEMON Sun Oct 14 00:52:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSa-0007fM-04
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-000537-DO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOa-0004m5-OL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOa-0004le-GN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
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@hcoop.net>) id 1IgvOa-0003qp-7w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOZ-0004zI-GL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOZ-0005G9-Jj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOZ-0005G9-Jj@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Remove spurious arch tag in
	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: Sun, 14 Oct 2007 04:52:14 -0000

commit c99996fdc2da7b01918d6942cfb94c740c4ab5b0
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Mar 13 18:52:21 2006 +0000

    Remove spurious arch tag in ChangeLog.
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-136

diff --git a/ChangeLog b/ChangeLog
index 7471b1d..f0dde21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -612,5 +612,3 @@ See ChangeLog.05 for earlier changes.
 ;; End:
 
 ;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
-
-;; arch-tag: cceaf370-9880-4031-842b-223ab2bb597d



From MAILER-DAEMON Sun Oct 14 00:52:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSa-0007gE-OW
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSY-0007dk-5R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSW-0007bQ-8b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPB-00054F-2H
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
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@hcoop.net>) id 1IgvPA-00041j-RD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPA-0005C0-6K
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPA-0006Du-7m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPA-0006Du-7m@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:44 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-services: Add entry for QuakeNet
	and fix customization
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, 14 Oct 2007 04:52:15 -0000

commit cfff5f755bf9d43509696630b899e39b99505b90
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jan 22 01:15:52 2007 +0000

    erc-services: Add entry for QuakeNet and fix customization
    
    2007-01-22  Michael Olson  <mwolson@gnu.org>
    
    	* erc-services.el (erc-nickserv-alist): Alphabetize and add
    	QuakeNet.  Standardize look of entries.  Fix type mismatch error
    	in customize interface.
    	(erc-nickserv-passwords): Alphabetize and add missing entries from
    	erc-nickserv-alist.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-97

diff --git a/ChangeLog b/ChangeLog
index 25b8e58..f0bf9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-22  Michael Olson  <mwolson@gnu.org>
+
+	* erc-services.el (erc-nickserv-alist): Alphabetize and add
+	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
diff --git a/erc-services.el b/erc-services.el
index ce505f5..8b59181 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -168,15 +168,17 @@ Example of use:
   :type '(repeat
 	  (list :tag "Network"
 		(choice :tag "Network name"
-			(const freenode)
-			(const OFTC)
+			(const Austnet)
+			(const Azzurra)
+			(const BitlBee)
+			(const BRASnet)
 			(const DALnet)
+			(const freenode)
 			(const GalaxyNet)
-			(const SlashNET)
-			(const BRASnet)
 			(const iip)
-			(const Austnet)
-			(const Azzurra)
+			(const OFTC)
+			(const QuakeNet)
+			(const SlashNET)
 			(symbol :tag "Network name"))
 		(repeat :tag "Nickname and password"
 			(cons :tag "Identity"
@@ -186,68 +188,59 @@ Example of use:
 ;; Variables:
 
 (defcustom erc-nickserv-alist
-  '((BitlBee
-     nil
-     nil
+  '((Austnet
+     "NickOP!service@austnet.org"
+     "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
+     "nickop@austnet.org"
+     "identify" nil nil)
+    (Azzurra
+     "NickServ!service@azzurra.org"
+     "/ns\\s-IDENTIFY\\s-password"
+     "NickServ"
+     "IDENTIFY" nil nil)
+    (BitlBee
+     nil nil
      "&bitlbee"
-     "identify"
-     nil)
+     "identify" nil nil)
+    (BRASnet
+     "NickServ!services@brasnet.org"
+     "/NickServ\\s-IDENTIFY\\s-senha"
+     "NickServ"
+     "IDENTIFY" nil "")
     (DALnet
      "NickServ!service@dal.net"
      "/msg\\s-NickServ@services.dal.net\\s-IDENTIFY\\s-<password>"
      "NickServ@services.dal.net"
-     "IDENTIFY"
-     nil)
+     "IDENTIFY" nil nil)
     (freenode
      "NickServ!NickServ@services."
      "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
      "NickServ"
-     "IDENTIFY"
-     nil)
+     "IDENTIFY" nil nil)
     (GalaxyNet
      "NS!nickserv@galaxynet.org"
      "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
      "NS@services.galaxynet.org"
-     "AUTH"
-     t)
-    (SlashNET
-     "NickServ!services@services.slashnet.org"
-     "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
-     "NickServ@services.slashnet.org"
-     "IDENTIFY"
-     nil)
+     "AUTH" t nil)
     (iip
      "Trent@anon.iip"
      "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"
      "Trent@anon.iip"
-     "IDENTIFY"
-     nil
-     "SQUERY")
-    (BRASnet
-     "NickServ!services@brasnet.org"
-     "/NickServ\\s-IDENTIFY\\s-senha"
-     "NickServ"
-     "IDENTIFY"
-     nil
-     "")
-    (Austnet
-     "NickOP!service@austnet.org"
-     "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
-     "nickop@austnet.org"
-     "identify"
-     nil)
-    (Azzurra
-     "NickServ!service@azzurra.org"
-     "/ns\\s-IDENTIFY\\s-password"
-     "NickServ"
-     "IDENTIFY"
-     nil)
+     "IDENTIFY" nil "SQUERY")
     (OFTC
      "NickServ!services@services.oftc.net"
      "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
      "NickServ"
-     "IDENTIFY"
-     nil))
+     "IDENTIFY" nil nil)
+    (QuakeNet
+     nil nil
+     "Q@CServe.quakenet.org"
+     "auth" t nil)
+    (SlashNET
+     "NickServ!services@services.slashnet.org"
+     "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
+     "NickServ@services.slashnet.org"
+     "IDENTIFY" nil nil))
    "Alist of NickServer details, sorted by network.
 Every element in the list has the form
   \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER)
@@ -265,8 +258,10 @@ ANSWER is the command to use for the answer.  The default is 'privmsg.
    :type '(repeat
 	   (list :tag "Nickserv data"
 		 (symbol :tag "Network name")
-		 (string :tag "Nickserv's nick!user@host")
-		 (regexp :tag "Identify request sent by Nickserv")
+		 (choice (string :tag "Nickserv's nick!user@host")
+			 (const :tag "No message sent by Nickserv" nil))
+		 (choice (regexp :tag "Identify request sent by Nickserv")
+			 (const :tag "No message sent by Nickserv" nil))
 		 (string :tag "Identify to")
 		 (string :tag "Identify keyword")
 		 (boolean :tag "Use current nick in identify message?")



From MAILER-DAEMON Sun Oct 14 00:52:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSa-0007fq-Ds
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00052q-H0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOW-0004iM-AM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004ht-Sa
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003oZ-L1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOT-0004x3-QQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOT-00055c-TG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOT-00055c-TG@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix compiler error in erc-dcc.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, 14 Oct 2007 04:52:15 -0000

commit 741418146eeb37237bde7fc98e1c37ebbe1ee5c5
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Feb 14 05:04:23 2006 +0000

    Fix compiler error in erc-dcc.el.
    
    * erc-dcc.el: Use (eval-when-compile (require 'cl)).
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-115

diff --git a/ChangeLog b/ChangeLog
index 6022f52..427e81e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
+
 2006-02-11  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-update-modules): Handle erc-capab-identify
diff --git a/erc-dcc.el b/erc-dcc.el
index 53fc3e4..8275bff 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -55,7 +55,8 @@
 
 (require 'erc)
 (eval-when-compile
- (require 'pcomplete))
+  (require 'cl)
+  (require 'pcomplete))
 
 (defconst erc-dcc-version "$Revision: 1.97 $"
   "ERC DCC revision")



From MAILER-DAEMON Sun Oct 14 00:52:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSa-0007fb-7y
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00053M-PE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOg-0004rU-2j
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOf-0004r4-V7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
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@hcoop.net>) id 1IgvOf-0003si-JH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOe-00051N-Tw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOe-0005Pe-W2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOe-0005Pe-W2@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:12 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:14 -0000

commit 141df54ee4984ebb120172652718ea47fd99b999
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Apr 25 00:37:04 2006 +0000

    Update from CVS
    
    2006-04-18  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
       argument IGNORE-SELF.  If this is non-nil, don't return the user's
       current nickname.  Doc fix.
       (pcomplete/erc-mode/complete-command): Don't complete the current
       nickname.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-155

diff --git a/ChangeLog b/ChangeLog
index cf57ab4..1e401b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-18  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
+	argument IGNORE-SELF.  If this is non-nil, don't return the user's
+	current nickname.  Doc fix.
+	(pcomplete/erc-mode/complete-command): Don't complete the current
+	nickname.
+
 2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index 5dc7256..695138b 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -46,7 +46,7 @@
 (require 'time-date)
 (eval-when-compile (require 'cl))
 
-(defconst erc-pcomplete-version "$Revision: 1.34 $"
+(defconst erc-pcomplete-version "$Revision: 1.35 $"
   "ERC pcomplete mode revision")
 
 (defgroup erc-pcomplete nil
@@ -109,7 +109,7 @@ the most recent speakers are listed first."
   (pcomplete-here
    (append
     (pcomplete-erc-commands)
-    (pcomplete-erc-nicks erc-pcomplete-nick-postfix))))
+    (pcomplete-erc-nicks erc-pcomplete-nick-postfix t))))
 
 (defvar erc-pcomplete-ctcp-commands
   '("ACTION" "CLIENTINFO" "ECHO" "FINGER" "PING" "TIME" "USERINFO" "VERSION"))
@@ -215,13 +215,21 @@ the most recent speakers are listed first."
     not-ops))
 
 
-(defun pcomplete-erc-nicks (&optional postfix)
-  "Returns a list of nicks in the current channel."
-  (let ((users (erc-get-channel-user-list)))
-    (if erc-pcomplete-order-nickname-completions
-        (setq users (erc-sort-channel-users-by-activity users)))
-  (mapcar (lambda (x)
-              (concat (erc-server-user-nickname (car x)) postfix))
+(defun pcomplete-erc-nicks (&optional postfix ignore-self)
+  "Returns a list of nicks in the current channel.
+Optional argument POSTFIX is something to append to the nickname.
+If optional argument IGNORE-SELF is non-nil, don't return the current nick."
+  (let ((users (if erc-pcomplete-order-nickname-completions
+                   (erc-sort-channel-users-by-activity
+                    (erc-get-channel-user-list))
+                 (erc-get-channel-user-list))))
+    (mapcar (lambda (x)
+              (cond (ignore-self
+                     (if (string= (erc-server-user-nickname (car x))
+                                  (erc-current-nick))
+                         nil
+                       (concat (erc-server-user-nickname (car x)) postfix)))
+                    (t (concat (erc-server-user-nickname (car x)) postfix))))
             users)))
 
 (defun pcomplete-erc-all-nicks (&optional postfix)



From MAILER-DAEMON Sun Oct 14 00:52:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSc-0007iO-SR
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00053G-IR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOi-0004lw-Mz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOZ-0004kf-MI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
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@hcoop.net>) id 1IgvOZ-0003qW-FR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOY-0004z0-P8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOY-0005Ee-RK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOY-0005Ee-RK@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-capab.el: Use (eval-when-compile
	(require 'cl)).
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, 14 Oct 2007 04:52:15 -0000

commit 9812f50f2370640a27039451683463a6701dbee6
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Feb 26 07:15:44 2006 +0000

    erc-capab.el: Use (eval-when-compile (require 'cl)).
    
    * erc-capab.el: Use (eval-when-compile (require 'cl)).
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-133

diff --git a/ChangeLog b/ChangeLog
index 2638057..26162a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2006-02-26  Michael Olson  <mwolson@gnu.org>
 
-	* erc-capab.el (erc-capab-unidentified): Fix compiler warning by
-	specifying group.
+	* erc-capab.el: Use (eval-when-compile (require 'cl)).
+	(erc-capab-unidentified): Fix compiler warning by specifying
+	group.
 
 2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 
diff --git a/erc-capab.el b/erc-capab.el
index 5e91442..402872a 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -72,6 +72,7 @@
 ;;; Code:
 
 (require 'erc)
+(eval-when-compile (require 'cl))
 
 (defconst erc-capab-version "$Revision: 1.8 $"
   "ERC CAPAB revision number.")



From MAILER-DAEMON Sun Oct 14 00:52:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSd-0007if-4w
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPy-0005YQ-I0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPv-0005U7-Iz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPu-0005Tw-DC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
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@hcoop.net>) id 1IgvPu-0004Ej-6l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPt-0005TW-Fr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPt-0007SC-H8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPt-0007SC-H8@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:29 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] CREDITS: Bookkeeping
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, 14 Oct 2007 04:52:16 -0000

commit baa09bfb137c78809ef91d0c22c71da6dbf18ff0
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 21 06:29:36 2007 -0400

    CREDITS: Bookkeeping

diff --git a/CREDITS b/CREDITS
index d7f9ba9..37ba59a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -164,6 +164,8 @@ Vivek Dasmohapatra <vivek AT etla DOT org>:
 Ivan Kanis <apple AT kanis DOT eu>:
   * Fixed window ordering bug in erc-goodies.el (1 line changed).
 
+Exal de Jesus Garcia Carrillo  <exal AT gmx DOT de>:
+  * Fixed some typos in the documentation.
 
 ----
 



From MAILER-DAEMON Sun Oct 14 00:52:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSd-0007j7-Aw
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSZ-0007eu-Ie
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSX-0007dH-Vu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPA-00054C-CU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
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@hcoop.net>) id 1IgvPA-00041H-0F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP9-0005Bi-9g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP9-0006CP-BM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP9-0006CP-BM@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:43 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Manual: Document menu 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, 14 Oct 2007 04:52:16 -0000

commit f31e6baa7f8798bc8d58fe73003add945798a775
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Jan 19 05:43:51 2007 +0000

    Manual: Document menu module
    
    2007-01-19  Michael Olson  <mwolson@gnu.org>
    
    	* erc.texi (Modules): Document new menu module.  Thanks to Leo
              for noticing.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-94

diff --git a/ChangeLog b/ChangeLog
index 6d40830..2e0a22d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/erc.texi b/erc.texi
index a1347b0..bf04099 100644
--- a/erc.texi
+++ b/erc.texi
@@ -448,6 +448,10 @@ Save buffers in logs
 @item match
 Highlight pals, fools, and other keywords
 
+@cindex modules, menu
+@item menu
+Display a menu in ERC buffers
+
 @cindex modules, netsplit
 @item netsplit
 Detect netsplits



From MAILER-DAEMON Sun Oct 14 00:52:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSU-0007ZR-93
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPy-0005YS-Jp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPv-0005UO-71
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPt-0005T1-7i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:30 -0400
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@hcoop.net>) id 1IgvPt-0004ER-1Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPs-0005T7-BZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPs-0007QC-DQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPs-0007QC-DQ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:28 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Fixed small typo.
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, 14 Oct 2007 04:52:05 -0000

commit da759ad4bf859d6f1a1a30becb2abb31161a5752
Author: Exal de Jesus Garcia Carrillo <exal@gnu.org>
Date:   Tue Sep 18 13:35:10 2007 -0500

    Fixed small typo.

diff --git a/erc.texi b/erc.texi
index 405082e..f56afc2 100644
--- a/erc.texi
+++ b/erc.texi
@@ -386,7 +386,7 @@ buffers in Emacs.  We call these ``query buffers''.
 
 @item highlighting
 
-Some occurences of words can be highlighted, which makes it easier to
+Some occurrences of words can be highlighted, which makes it easier to
 track different kinds of conversations.
 
 @item notification



From MAILER-DAEMON Sun Oct 14 00:52:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSP-0007V4-ID
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSK-0007Po-9G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOv-000505-BT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOp-0004zy-L3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
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@hcoop.net>) id 1IgvOp-0003ve-6F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOo-00054U-GO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOo-0005fl-GU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOo-0005fl-GU@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:22 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--emacs--22
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, 14 Oct 2007 04:52:01 -0000

commit dfe18d3065bcb5c788966779cf0dc961fd55249e
Merge: a487fc4... e593332... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Aug 3 04:14:45 2006 +0000

    Merged from erc--emacs--22
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-5
       Integrate properly with url.el.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-29

diff --cc ChangeLog
index eca944d,7607418,cef3944..fb704aa
--- a/ChangeLog
+++ b/ChangeLog
@@@@ -1,647 -1,210 -1,12 +1,650 @@@@
 ++2006-08-02  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el (erc-version-string): Release ERC 5.1.4.
 ++
 ++	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
 ++
 ++	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 ++	to the wrong buffer.  Thanks to offby1 for the report.
 ++
 ++	* erc-backend.el (erc-coding-system-for-target): Handle case where
 ++	target is nil.  Thanks to Kai Fan for the patch.
 ++
 ++2006-07-29  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 ++	buffer.  It will be saved automatically killed.  Thanks to Johan
 ++	Bockgård and Tassilo Horn for pointing this out.
 ++
 ++2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 ++
 ++	* erc.el (define-erc-module): Make find-function and find-variable
 ++	find the names constructed by `define-erc-module' in Emacs 22.
 ++
 ++2006-07-14  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-log.el (log): Make sure that we enable logging on
 ++	already-opened buffers as well, in case the user toggles this
 ++	module after loading ERC.  Also be sure to remove logging ability
 ++	from all ERC buffers when the module is disabled.
 ++	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 ++	the empty string.  This should fix some errors that occur when
 ++	quitting Emacs without first killing all ERC buffers.
 ++	(erc-log-disable-logging): New function that removes the logging
 ++	ability from the current buffer.
 ++
 ++	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
 ++
 ++2006-07-12  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 ++	than call toggle-read-only.
 ++
 ++	* Makefile (debrelease-mwolson): Remove and consolidate with the
 ++	`debrelease' target.
 ++	(debrevision): Rename from `debrevision-mwolson'.
 ++
+++	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
+++	add autoload cookie.
+++
 ++2006-07-09  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el (erc-version-string): Release ERC 5.1.3.
 ++
 ++	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
 ++
 ++	* servers.pl: Add copyright notice.
 ++
 ++	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 ++	from being set automatically away and current buffer is not an ERC
 ++	buffer.
 ++
 ++	* erc-identd.el: Fix compiler error.
 ++
 ++	* erc.texi (Development): Use @subheading instead of @subsection.
 ++	(Advanced Usage): Add menu.
 ++	(Connecting): Fully document how to connect to an IRC server.
 ++	(Options, Tips and Tricks, Sample Configuration): New unwritten
 ++	sections.
 ++
 ++	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 ++	(erc-user-full-name, erc-password): Docfixes and customization
 ++	interface tweaks.
 ++	(erc-try-new-nick-p): Rename from
 ++	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 ++	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 ++	of `erc-nick-uniquifier', in case someone wants multiple
 ++	characters.
 ++	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 ++	(erc-compute-port): Docfixes.
 ++
 ++	* FOR-RELEASE: Put in future-first order.
 ++
 ++	* erc-log.el (log): Move all add-hook calls here, rather than
 ++	executing them immediately, and also cause them to be un-hooked
 ++	when the module is removed.
 ++	(erc-save-buffer-on-part): Move next to
 ++	`erc-save-queries-on-quit'.
 ++	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 ++	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 ++	nil.  This makes things fast, but reasonably failsafe, by default.
 ++
 ++2006-07-08  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 ++	default, since most IRC clients don't do this.
 ++	(erc-log-write-after-send): New option that determines whether the
 ++	log file will be written to after every sent message.
 ++	(erc-log-write-after-insert): New option that determines whether
 ++	the log file will be written to when new text is added to a logged
 ++	ERC buffer.
 ++	(log): Use the aforementioned options.
 ++
 ++	* erc.texi (Modules): Document the "completion" module.
 ++
 ++	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 ++	have a nil element in the list when ignore-self is non-nil.
 ++
 ++2006-07-05  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el (erc-modules): Add the `page' module to the list.
 ++
 ++	* erc.texi (Modules): Add entries for `list' and `page' modules.
 ++	Change "spell" to "spelling".
 ++	(History): Use past tense throughout.
 ++
 ++2006-07-02  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 ++	can happen when doing /PART.
 ++
 ++	* erc.el (erc-quit-reason-various-alist)
 ++	(erc-part-reason-various-alist): In the example, use "^$" as an
 ++	example, since "" matches anything.
 ++	(erc-quit-reason-various, erc-part-reason-various): If no argument
 ++	is given, and no matches are found, use our default reason instead
 ++	of "nil".
 ++
 ++2006-07-01  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-identd.el (erc-identd-start): XEmacs defines neither
 ++	`make-network-process' nor `open-network-stream-server', so just
 ++	fail silently.
 ++
 ++2006-06-30  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* HISTORY: Update.
 ++
 ++	* erc.texi (Modules): Mention identd.
 ++	(Releases): Update mailing list address and download location.
 ++	(Development): Refactor.  Provide updated directions for Arch.
 ++	Make URLs clickable.
 ++	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 ++	(Getting Started): Give simpler example.  We do not need to
 ++	explicitly load every module.
 ++	(History): Update.
 ++
 ++	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 ++	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 ++	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 ++	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 ++	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 ++	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 ++	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 ++	erc.el: Remove version strings.
 ++
 ++	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 ++	module versions anymore.
 ++	(erc-version-modules): Remove, since we do not use this function
 ++	anymore.
 ++	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 ++	was only useful back when ERC consisted of one file.
 ++	(erc-modules): Add line for identd.
 ++	(erc-get-channel-mode-from-keypress): Typo fix.
 ++
 ++	* erc-imenu.el: Remove unnecessary lines in header.
 ++
 ++	* erc-goodies.el (erc-handle-irc-url): Docfix.
 ++
 ++	* erc-identd.el: Define an ERC module for this.
 ++	(erc-identd-start): Don't create a process buffer if possible.
 ++	Otherwise, use conventional hidden names for process buffers.
 ++
 ++2006-06-29  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-backend.el (erc-coding-system-for-target): Match
 ++	case-insensitively.  Use a pattern match instead of `assoc', as
 ++	per the documentation for `erc-encoding-coding-alist'.
 ++
 ++	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 ++
 ++2006-06-27  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el: Update maintainer information and URLs.
 ++
 ++2006-06-21  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* Makefile (upload): Make this work with the GNU upload system.
 ++
 ++2006-06-14  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el (erc-active-buffer): If the active buffer has been
 ++	deleted, default to the server buffer.
 ++	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 ++	control really toggle, not unconditionally turn off.
 ++
 ++2006-06-12  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* NEWS: Add items since the 5.1.2 release.
 ++
 ++	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 ++	indicates whether the current away status was caused by this
 ++	module.
 ++	(erc-autoaway-set-back): Only set back if this module set the user
 ++	away.
 ++	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 ++	(erc-autoaway-reset-indicators): New function that resets some
 ++	indicators when the user is no longer away.
 ++	(autoaway): Add the above function to the 305 hook.
 ++
 ++2006-06-05  Romain Francoise  <romain@orebokech.com>
 ++
 ++	* erc.texi (History): Fix various typos.
 ++
 ++2006-06-04  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 ++	definition of the autoaway module.
 ++	(autoaway): Don't do anything if erc-autoaway-idle-method is
 ++	unbound.  This prevents an error on startup.
 ++
 ++2006-06-03  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 ++	(erc-autoaway-idle-method): Renamed from
 ++	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 ++	how to do this, so it's best to make this take symbol values.
 ++	Improve documentation.  Remove warning against Emacs idle-time;
 ++	the point is moot now that we get user idle time via a different
 ++	method.  Make sure we disable and re-enable the module when
 ++	changing this value.
 ++	(autoaway): Conditionalize on the above option.  If using the idle
 ++	timer or user idle methods, don't add anything to the
 ++	send-completed or server-001 hooks, since it is unnecessary.
 ++	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 ++	Docfix.
 ++	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 ++	(erc-autoaway-reset-idle-irc): Renamed from
 ++	`erc-autoaway-reset-idle'.  Don't pass line to
 ++	`erc-autoaway-set-away', since it is not used.
 ++	(erc-autoaway-reset-idle-user): New function that resets the idle
 ++	state for user idle time.
 ++	(erc-autoaway-set-back): Remove line argument, since it is not
 ++	used.
 ++
 ++	* Makefile (upload): Make this work for Savannah uploads.
 ++
 ++	* AUTHORS: Update for Savannah move.  No old entries have been
 ++	removed, in case people have not registered yet on Savannah.
 ++
 ++2006-06-01  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 ++	this are live.
 ++
 ++2006-05-15  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* README: Add License information.  Permit images to be used,
 ++	distributed, and modified without restriction.
 ++
 ++2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 ++
 ++	* erc-goodies.el: (erc-handle-irc-url): New function, suitable as
 ++	a value for `url-irc-function'.
 ++
 ++2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 ++	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 ++	current nickname.  Doc fix.
 ++	(pcomplete/erc-mode/complete-command): Don't complete the current
 ++	nickname.
 ++
 ++2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 ++	build date as it's shown in `emacs-version'.
 ++
 ++	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 ++	with the same face property as the previous character.
 ++
 ++2006-04-02  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 ++	erc.el: Make sure to include a newline inside of negated classes,
 ++	so that a newline is not matched.
 ++
 ++2006-04-01  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-backend.el (erc-server-connect-function): Don't try to
 ++	detect the existence of the `open-network-stream-nowait' function,
 ++	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 ++
 ++2006-03-27  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.texi: Update direntry.  Remove unneeded local variables.
 ++
 ++2006-03-26  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el (erc-header-line): New face that will be used to colorize
 ++	the text of the header-line, provided that
 ++	`erc-header-line-face-method' is non-nil.
 ++	(erc-prompt-face): Fix formatting.
 ++	(erc-header-line-face-method): New option that determines the
 ++	method used for colorizing header-line text.  This may be a
 ++	function, nil, or non-nil.
 ++	(erc-update-mode-line-buffer): Use the aforementioned option and
 ++	face to colorize the header-line text, if that is what the user
 ++	wants.
 ++	(erc-send-input): If flood control is not activated, don't split
 ++	the input line.
 ++
 ++2006-03-25  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 ++	that fixes the case where there is no leading whitespace.  Only
 ++	remove the first space character, though.
 ++
 ++	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 ++	erc-identd-process is set properly.
 ++	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 ++	(erc-identd-start): Pass :host parameter so this works with Emacs
 ++	22.
 ++
  +2006-03-21  Michael Olson  <mwolson@gnu.org>
  +
  +	* CREDITS: Add Nelson Ferreira.  Change contact address.
  +
  +	* erc-bbdb.el: Install patch from Nelson Ferreira.
  +	(erc-bbdb-electric-p): New option that indicates whether to make
  +	the BBDB buffer electric.  Defaults to "not electric".
  +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
  +
  +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
  +	<C-tab> for `erc-button-previous' as it is a more standard key
  +	binding for this type of function.
  +
 ++2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* erc-capab.el: Removed things that were accidentally committed on
 ++	2006-02-20.  Removed Todo section.
 ++	(erc-capab-unidentified): Removed.
 ++
 ++2006-02-26  Michael Olson  <mwolson@gnu.org>
 ++
 ++	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 ++	(erc-capab-unidentified): Fix compiler warning by specifying
 ++	group.
 ++
 ++2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 ++	to explain thoughts better.  `erc-server-parameters' is an
 ++	associated list when it's set, not a string.
 ++
  +2006-02-19  Michael Olson  <mwolson@gnu.org>
  +
 ++	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 ++	parameters are strings before using them.  Thanks to Alejandro
 ++	Benitez for the report.
 ++
  +	* erc.el (erc-version-string): Release ERC 5.1.2.
  +
  +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
  +
  +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
  +	<C-tab>.
  +	(erc-button-previous): New function.
  +
  +2006-02-15  Michael Olson  <mwolson@gnu.org>
  +
 ++	* NEWS: Add category for ERC 5.2.
 ++
  +	* erc.el (erc): Move to the end of the buffer when a continued
  +	session is detected.  Thanks to e1f and indio for the report and
  +	testing a potential fix.
  +
  +2006-02-14  Michael Olson  <mwolson@gnu.org>
  +
  +	* debian/changelog: Prepare a new Debian package.
  +
  +	* Makefile (debprepare): New rule that creates an ERC snapshot
  +	directory for use in both new Debian releases and revisions for
  +	Debian packages.
  +	(debrelease, debrevision-mwolson): Use debprepare.
  +
  +	* NEWS: Bring up-to-date.
  +
  +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
  +	timestamps before rather than after erc-fill-column when
  +	erc-timestamp-right-column is nil.  This way we won't surprise
  +	anyone unpleasantly, or so it is hoped.
  +
  +2006-02-13  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
  +
  +2006-02-11  Michael Olson  <mwolson@gnu.org>
  +
 ++	* erc.el (erc-update-modules): Handle erc-capab-identify
 ++	correctly.  Make some requirements shorter, so that it's easier to
 ++	see why they are needed.
 ++
 ++	* erc-capab.el: Add autoload cookie for capab-identify.
 ++	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 ++	Minor whitespace fix in code.
 ++
  +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
  +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
  +	whether we are in Emacs 22, and using X.  Improve documentation.
  +	(erc-insert-aligned): Remove calculation of offset, since
  +	:align-to pos works after all.  Unlike the previous solution, this
  +	one works when erc-stamp.el is compiled.
  +	(erc-insert-timestamp-right): Don't add length of string, and then
  +	later remove its displayed width.  This puts timestamps after
  +	erc-fill-column when erc-timestamp-right-column is nil, rather
  +	than before it.  It also fixes a subtle bug.  Remove use of
  +	`current-window', since there is no variable by that name in
  +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
  +	`erc-fill-column' is non-nil before using it.
  +
  +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
  +
 ++	* erc-list.el: Define `list' module which sets the alias
 ++	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 ++	`erc-list-channels-simple' when disabled.
 ++	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 ++	(erc-list-channels-simple): New function.
 ++
 ++	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 ++	`capab-identify' description.  Moved customization options left in
 ++	source code.
 ++
 ++	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 ++
 ++	* erc-capab.el: Put a little more detail into Usage section.
 ++	(define-erc-module): Run `erc-capab-identify-setup' in all open
 ++	server buffers when enabling.
 ++	(erc-capab-identify-setup): Make PROC and PARSED optional
 ++	arguments.
 ++	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 ++	should now also match nicknames that are formatted differently
 ++	than the default.
 ++
  +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
  +	before calling `with-current-buffer'.
  +
  +2006-02-10  Michael Olson  <mwolson@gnu.org>
  +
  +	* Makefile (debbuild): Split from debrelease.
  +	(debrevision-mwolson): New rule that causes a Debian revision to
  +	be built.
  +
 - 2006-02-08  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc.el (erc-version-string): Remove "(CVS)".
 ++	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 ++	Johan Bockgård.
 ++	(erc-modules): Change use of 'pcomplete to 'completion.
 ++
 ++2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* erc-capab.el: Require erc.
 ++	(erc-capab-send-identify-messages): Use `erc-server-send'.
 ++	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 ++	the flags so we can also check whether the `erc-identified' text
 ++	property is there at all.
 ++	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 ++	This fixes a bug where the prefix wasn't inserted when timestamps
 ++	are inserted on the right.  Tweaked nickname regexp.
 ++	(erc-capab-find-parsed): New function.
 ++	(erc-capab-get-unidentified-nickname): Updated to check for 0
 ++	flag.  Only get nickname if there's a nickuserhost associated with
 ++	this message.
 ++
 ++	* erc-capab.el: New file.  Adds the new module
 ++	`erc-capab-identify', which allows flagging of unidentified users
 ++	on servers running an ircd based on dancer - irc.freenode.net, for
 ++	example.
 ++
 ++	* erc.el (erc-modules): Added `capab-identify' to options.
 ++	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 ++	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 ++	(erc-version-string): Remove "(CVS)".
  +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
  +	connections work as expected.  Connecting with `open-tls-stream'
  +	only seems to work (if at all?) when using the tls.el located in
  +	lisp/net/ in Emacs22.
  +
 - 	* NEWS: Added tls.el -> ssl.el change.
 ++	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 ++	(erc-get-parsed-vector-type): Moved these functions to erc.el
 ++	since they can be useful outside of the text matching module.
 ++
 ++	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 ++	erc-services.el since the file name has changed.
 ++
 ++	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 ++
 ++	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 ++	to "ERC".
  +
  +2006-02-07  Michael Olson  <mwolson@gnu.org>
  +
 ++	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 ++	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 ++	the filenames in DOS.
 ++
 ++	* erc-goodies.el: Comment fix.
 ++
 ++	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 ++	commentary.  Use define-erc-module so that it's possible to
 ++	actually use this.
 ++	(erc-hecomplete): Rename function from `erc-complete'.
 ++	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 ++
 ++	* erc-join.el: Rename from erc-autojoin.el.
 ++
 ++	* erc-networks.el: Rename from erc-nets.el.
 ++
 ++	* erc-services.el: Rename from erc-nickserv.el.
 ++
  +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
  +	the simpler `indent-to' function when
  +	`erc-timestamp-right-align-by-pixel' is nil.
  +	(erc-insert-timestamp-right): If the timestamp goes on the
  +	following line, don't add timestamp properties to the spaces in
  +	front of it.
  +
 ++	* erc.el (erc-migrate-modules): New function that eases migration
 ++	of module names.
 ++	(erc-modules): Call erc-migrate-modules in the :get accessor.
 ++	(erc-modules, erc-update-modules): Update for new modules names.
 ++
 ++2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 ++
 ++	* FOR-RELEASE: Added two things to do before the next release of
 ++	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 ++	the `C-c C-SPC' and `C-c C-@' global keybindings.
 ++
  +2006-02-05  Michael Olson  <mwolson@gnu.org>
  +
  +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
  +	directory correctly.
  +
  +	* debian/changelog: Update for 5.1.1 release.
  +
  +	* debian/control (Suggests): Suggest emacs-chess instead of
  +	Recommending it.  Thanks to Era Eriksson for the report.
  +
  +	* debian/maint/postinst: Install the Info documentation.
  +
  +	* debian/maint/prerm: Handle removing of Info documentation.
  +
  +	* debian/rules (configure, configure-stamp, build, build-stamp):
  +	Generate HTML and Info documentation.
  +	(binary-erc): Install HTML and Info documentation.
  +
  +	* erc-spelling.el (erc-spelling-init): If
  +	`erc-spelling-dictionaries' is nil, do not set
  +	ispell-local-dictionary.  Before, it was being set to nil, which
  +	was causing a long delay while the ispell process restarted.
  +	(erc-spelling-unhighlight-word): New function that removes
  +	flyspell properties from a spell-checked word.
  +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
  +	that have '/' before them.
  +
  +2006-02-04  Michael Olson  <mwolson@gnu.org>
  +
  +	* Makefile (VERSION): Update to 5.1.1.
  +
  +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
  +	that Emacs does in its NEWS file.
  +
  +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
  +
  +	* erc-complete.el (erc-nick-completion-exclude-myself)
  +	(erc-try-complete-nick): Use better function for getting list of
  +	channel users.
  +
  +	* erc-goodies.el: Docfix.
  +
  +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
  +	being treated properly.
  +
  +	* erc.texi (History): Note that ERC is now included with Emacs.
  +
  +	* erc.el (erc-version-string): Release ERC 5.1.1.
  +
  +2006-01-31  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-stamp.el: Update copyright years.
  +
  +2006-01-30  Simon Josefsson  <jas@extundo.com>
  +
  +	* erc.el (erc-open-ssl-stream): Use tls.el.
  +
  +2006-01-30  Michael Olson  <mwolson@gnu.org>
  +
  +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
  +	that determines whether to use pixel values to align right
  +	timestamps.  The default is not to do so, since it only works with
  +	Emacs22 on X, and even then some people have trouble.
  +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
  +
  +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
  +
  +	* erc-viper.el: Ensure we only alter Viper's configuration when
  +	necessary, as Viper may already take ERC into account.
  +
  +2006-01-29  Michael Olson  <mwolson@gnu.org>
  +
  +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
  +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
  +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
  +
  +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
  +	variable.
  +	(erc-speedbar-goto-buffer): Fix compiler warning.
  +
  +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
  +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
  +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
  +	work without compiler warnings.
  +
  +	* man/erc.texi (Obtaining ERC, Installation): Note that these
  +	sections may be skipped if using the version of ERC that comes
  +	with Emacs.
  +
   2006-01-28  Michael Olson  <mwolson@gnu.org>
   
  -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
  -	Space out copyright years like the rest of Emacs.  Use the Emacs
  -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
  -	IRC Client", since there are now several IRC clients for Emacs.
  +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
  +	guidelines.
  +
  +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
  +	the Emacs copyright statement.  Refer to ourselves as ERC rather
  +	than "Emacs IRC Client", since there are now several IRC clients
  +	for Emacs.
  +
  +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
   
  -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
  -	insert spaces instead of using special text property.
  +	* erc-ibuffer.el: Require 'erc.
  +
  +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
  +	it exists.
  +
  +	* erc-stamp.el (erc-insert-aligned): Only use the special text
  +	property when window-system is X.
  +
  +	* erc.texi (History): Note that ERC 5.1 is released.
   
   2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
   
@@@@ -945,10 -508,10 -309,6 +948,10 @@@@
   	* erc-track.el (erc-track-remove-from-mode-line): Handle case
   	where global-mode-string is not a list.  Emacs22 permits this.
   
 - See ChangeLog.2005 for earlier changes.
  -    Copyright (C) 2006 Free Software Foundation, Inc.
  -  Copying and distribution of this file, with or without modification,
  -  are permitted provided the copyright notice and this notice are preserved.
 ++See ChangeLog.05 for earlier changes.
  +
  +;; Local Variables:
  +;; coding: utf-8
  +;; End:
  +
  +;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --cc erc.el
index 79fd987,eb12ad5,98a369f..fd9ca09
--- a/erc.el
+++ b/erc.el
@@@@ -67,7 -66,7 -66,7 +67,7 @@@@
   
   ;;; Code:
   
 - (defconst erc-version-string "Version 5.1.2 $Revision: 1.796.2.4 $"
  -(defconst erc-version-string "Version 5.1 (CVS) $Revision: 1.799 $"
 ++(defconst erc-version-string "Version 5.1.4 (devel)"
     "ERC version.  This is used by function `erc-version'.")
   
   (eval-when-compile (require 'cl))
@@@@ -6155,26 -6127,6 -6126,6 +6155,49 @@@@ This function should be on `erc-kill-ch
   			       (funcall erc-part-reason nil))
   		       nil tgt))))
   
 ++;;; Dealing with `erc-parsed'
 ++
 ++(defun erc-get-parsed-vector (point)
 ++  "Return the whole parsed vector on POINT."
 ++  (get-text-property point 'erc-parsed))
 ++
 ++(defun erc-get-parsed-vector-nick (vect)
 ++  "Return nickname in the parsed vector VECT."
 ++  (let* ((untreated-nick (and vect (erc-response.sender vect)))
 ++	 (maybe-nick (when untreated-nick
 ++		       (car (split-string untreated-nick "!")))))
 ++    (when (and (not (null maybe-nick))
 ++	       (erc-is-valid-nick-p maybe-nick))
 ++      untreated-nick)))
 ++
 ++(defun erc-get-parsed-vector-type (vect)
 ++  "Return message type in the parsed vector VECT."
 ++  (and vect
 ++       (erc-response.command vect)))
 ++
+++;; Teach url.el how to open irc:// URLs with ERC.
+++;; To activate, customize `url-irc-function' to `url-irc-erc'.
+++
+++;;;###autoload
+++(defun erc-handle-irc-url (host port channel user password)
+++  "Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD.
+++If ERC is already connected to HOST:PORT, simply /join CHANNEL.
+++Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
+++  (let ((server-buffer
+++	 (car (erc-buffer-filter
+++	       (lambda ()
+++		 (and (string-equal erc-session-server host)
+++		      (= erc-session-port port)
+++		      erc-server-connected
+++		      (eq (erc-server-buffer) (current-buffer))))))))
+++    (with-current-buffer (or server-buffer (current-buffer))
+++      (if (and server-buffer channel)
+++	  (erc-cmd-JOIN channel)
+++	(erc host port (or user (erc-compute-nick)) (erc-compute-full-name)
+++	     (not server-buffer) password nil channel
+++	     (when server-buffer
+++	       (get-buffer-process server-buffer)))))))
+++
   (provide 'erc)
   
   ;;; Deprecated. We might eventually stop requiring the goodies automatically.



From MAILER-DAEMON Sun Oct 14 00:52:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSl-0007rW-Ve
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSb-0007h5-St
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSZ-0007fF-Sm
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPA-00054E-QF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
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@hcoop.net>) id 1IgvPA-00041X-KM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP9-0005Bu-Sh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP9-0006DP-V7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP9-0006DP-V7@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:43 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix bug introduced in last patch
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, 14 Oct 2007 04:52:18 -0000

commit a1f302f80d5344e466307469759748508f7e25bc
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jan 21 23:32:29 2007 +0000

    Fix bug introduced in last patch
    
    * erc.el (erc-header-line-format): Fix bug that caused ERC not to load
      properly.  The customize interface needs to be less fragile!
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-96

diff --git a/erc.el b/erc.el
index 9ff164d..9721839 100644
--- a/erc.el
+++ b/erc.el
@@ -5720,9 +5720,10 @@ displayed.
 
 See `erc-mode-line-format' for which characters are can be used."
   :group 'erc-mode-line-and-header
-  :set #'(lambda (sym val)
-	   (set sym val)
-	   (erc-update-mode-line nil))
+  :set (lambda (sym val)
+	 (set sym val)
+	 (when (fboundp 'erc-update-mode-line)
+	   (erc-update-mode-line nil)))
   :type '(choice (const :tag "Disabled" nil)
 		 string))
 



From MAILER-DAEMON Sun Oct 14 00:52:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSm-0007rs-8M
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSd-0007iu-6m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSa-0007g4-Ow
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOy-000531-8x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
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@hcoop.net>) id 1IgvOy-0003yL-1j
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOx-00057G-80
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOx-0005tM-7f
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOx-0005tM-7f@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:31 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Change default port. Minor /names
	fix.
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, 14 Oct 2007 04:52:19 -0000

commit 973f9882fb0547f0716767aa43f970f00293fb0c
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Oct 15 19:15:21 2006 +0000

    Change default port.  Minor /names fix.
    
    2006-10-10  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-default-port): Make the default be 6667 instead of
    	ircd. since Mac OS X apparently has problems with looking up that
    	port name.
    
    	* erc-backend.el (353): Receive names after displaying the initial
    	message, instead of before.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-56

diff --git a/ChangeLog b/ChangeLog
index a7a9320..1e50a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-10  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-default-port): Make the default be 6667 instead of
+	ircd. since Mac OS X apparently has problems with looking up that
+	port name.
+
+	* erc-backend.el (353): Receive names after displaying the initial
+	message, instead of before.
+
 2006-10-05  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el (erc-my-nick-face): New face.
diff --git a/erc-backend.el b/erc-backend.el
index 622248e..c12e9b3 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1630,11 +1630,11 @@ See `erc-display-server-message'." nil
   "NAMES notice." nil
   (let ((channel (third (erc-response.command-args parsed)))
         (users (erc-response.contents parsed)))
-    (erc-with-buffer (channel proc)
-      (erc-channel-receive-names users))
     (erc-display-message parsed 'notice (or (erc-get-buffer channel proc)
                                             'active)
-                         's353 ?c channel ?u users)))
+                         's353 ?c channel ?u users)
+    (erc-with-buffer (channel proc)
+      (erc-channel-receive-names users))))
 
 (define-erc-response-handler (366)
   "End of NAMES." nil
diff --git a/erc.el b/erc.el
index e7f4d39..82ba1f0 100644
--- a/erc.el
+++ b/erc.el
@@ -1455,7 +1455,7 @@ Turning on `erc-mode' runs the hook `erc-mode-hook'."
 (defconst erc-default-server "irc.freenode.net"
   "IRC server to use if it cannot be detected otherwise.")
 
-(defconst erc-default-port "ircd"
+(defconst erc-default-port "6667"
   "IRC port to use if it cannot be detected otherwise.")
 
 (defcustom erc-join-buffer 'buffer



From MAILER-DAEMON Sun Oct 14 00:52:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSm-0007sO-IC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSd-0007ja-P9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSb-0007hS-OJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPA-00054D-Jc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
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@hcoop.net>) id 1IgvPA-00041T-C1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:44 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP9-0005Bo-Jh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP9-0006Cu-Ld
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:43 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP9-0006Cu-Ld@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:43 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make disabling header-line easier
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, 14 Oct 2007 04:52:20 -0000

commit 3317db7e910610cdca33779a99e2325660cad3c3
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jan 21 19:17:46 2007 +0000

    Make disabling header-line easier
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-95

diff --git a/ChangeLog b/ChangeLog
index 2e0a22d..25b8e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/erc.el b/erc.el
index bdbb9ff..9ff164d 100644
--- a/erc.el
+++ b/erc.el
@@ -5715,9 +5715,16 @@ The following characters are replaced:
   "A string to be formatted and shown in the header-line in `erc-mode'.
 Only used starting in Emacs 21.
 
+Set this to nil if you do not want the header line to be
+displayed.
+
 See `erc-mode-line-format' for which characters are can be used."
   :group 'erc-mode-line-and-header
-  :type 'string)
+  :set #'(lambda (sym val)
+	   (set sym val)
+	   (erc-update-mode-line nil))
+  :type '(choice (const :tag "Disabled" nil)
+		 string))
 
 (defcustom erc-header-line-uses-help-echo-p t
   "Show the contents of the header line in the echo area or as a tooltip



From MAILER-DAEMON Sun Oct 14 00:52:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSm-0007sk-QZ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSe-0007kc-E6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSd-0007jL-Lp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOy-00053A-El
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
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@hcoop.net>) id 1IgvOy-0003yV-85
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOx-00057M-It
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOx-0005tr-KP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOx-0005tr-KP@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:31 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix iswitchb 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: Sun, 14 Oct 2007 04:52:20 -0000

commit 2f86e5d98756d80fab1c3ea72d227ee0886dca36
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Oct 21 23:27:44 2006 +0000

    Fix iswitchb bug
    
    2006-10-21  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
    	first loading iswitchb.  Thanks to Leo for the report.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-57

diff --git a/ChangeLog b/ChangeLog
index 1e50a33..e0e700a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-21  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
+	first loading iswitchb.  Thanks to Leo for the report.
+
 2006-10-10  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-default-port): Make the default be 6667 instead of
diff --git a/erc.el b/erc.el
index 82ba1f0..38dc628 100644
--- a/erc.el
+++ b/erc.el
@@ -1686,7 +1686,7 @@ If `erc-track-mode' is in enabled, put the last element of
 Due to some yet unresolved reason, global function `iswitchb-mode'
 needs to be active for this function to work."
   (interactive "P")
-  (eval-when-compile
+  (eval-and-compile
     (require 'iswitchb))
   (let ((iswitchb-make-buflist-hook
 	 (lambda ()



From MAILER-DAEMON Sun Oct 14 00:52:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSn-0007tG-4B
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-000535-Ay
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOb-0004mq-0U
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004k2-6n
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
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@hcoop.net>) id 1IgvOX-0003pa-CG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOV-0004xw-PG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOV-000597-R4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOV-000597-R4@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:03 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add category for ERC 5.2.
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, 14 Oct 2007 04:52:20 -0000

commit a12c64de18eb2fa90e98fc0b588b82c173e2c317
Merge: 9d157e3... 05bcaf3...
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 16 00:44:34 2006 +0000

    Add category for ERC 5.2.
    
    * NEWS: Add category for ERC 5.2.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-122

diff --cc ChangeLog
index f3d0d06,cbb9e1d..63c92ea
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,3 +1,11 @@@
 +2006-02-15  Michael Olson  <mwolson@gnu.org>
 +
++	* NEWS: Add category for ERC 5.2.
++
 +	* erc.el (erc): Move to the end of the buffer when a continued
 +	session is detected.  Thanks to e1f and indio for the report and
 +	testing a potential fix.
 +
  2006-02-14  Michael Olson  <mwolson@gnu.org>
  
  	* debian/changelog: Prepare a new Debian package.
diff --cc NEWS
index d3a318e,af787c0..953daa9
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,11 +1,15 @@@
  ERC NEWS                                                       -*- outline -*-
  
- * Changes since ERC 5.1.1
 -* Changes in ERC 5.1.2
++* Changes in ERC 5.2 (unreleased)
  
 -** Go back to using ssl.el so that SSL connections work as expected.
 -Connecting with `open-tls-stream' only seems to work (if at all?) when
 -using the tls.el located in lisp/net/ in Emacs22.
 +** New modules
 +
 +*** Capab identify (erc-capab.el)
 +
 +**** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 +
++* Changes in ERC 5.1.2 (unreleased)
+ 
  ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
  
  ** Changes and additions to modules



From MAILER-DAEMON Sun Oct 14 00:52:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSn-0007u7-Ow
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSg-0007mH-0F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOr-0004y2-4I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOm-0004xq-Jc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
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@hcoop.net>) id 1IgvOm-0003ul-3V
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOl-00053W-BT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOl-0005af-E2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOl-0005af-E2@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:19 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.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: Sun, 14 Oct 2007 04:52:22 -0000

commit aebff1d14bafe43c5c611ec7656fc443a609bc5d
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Jul 10 04:25:50 2006 +0000

    Merged from erc--rel--5.1.
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-9
       Remove some unusable functions.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-10
       Turn erc-identd into a real module.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-11
       erc-identd: Improve header documentation.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-12
       Manual: Update instructions for Savannah and GNU Arch.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-13
       Update history information.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-14
       erc-identd: Avoid XEmacs error message.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-16
       Document `list' and `page' modules.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-18
       Document the "completion" module.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-19

diff --git a/ChangeLog b/ChangeLog
index 6e741a3..97e20ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,9 +15,19 @@
 	ERC buffer.
 	(log): Use the aforementioned options.
 
+	* erc.texi (Modules): Document the "completion" module.
+
 	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 	have a nil element in the list when ignore-self is non-nil.
 
+2006-07-05  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-modules): Add the `page' module to the list.
+
+	* erc.texi (Modules): Add entries for `list' and `page' modules.
+	Change "spell" to "spelling".
+	(History): Use past tense throughout.
+
 2006-07-02  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
@@ -30,8 +40,25 @@
 	is given, and no matches are found, use our default reason instead
 	of "nil".
 
+2006-07-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc-identd.el (erc-identd-start): XEmacs defines neither
+	`make-network-process' nor `open-network-stream-server', so just
+	fail silently.
+
 2006-06-30  Michael Olson  <mwolson@gnu.org>
 
+	* HISTORY: Update.
+
+	* erc.texi (Modules): Mention identd.
+	(Releases): Update mailing list address and download location.
+	(Development): Refactor.  Provide updated directions for Arch.
+	Make URLs clickable.
+	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
+	(Getting Started): Give simpler example.  We do not need to
+	explicitly load every module.
+	(History): Update.
+
 	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
@@ -43,13 +70,20 @@
 
 	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 	module versions anymore.
+	(erc-version-modules): Remove, since we do not use this function
+	anymore.
+	(erc-latest-version, erc-ediff-latest-version): Remove, since this
+	was only useful back when ERC consisted of one file.
+	(erc-modules): Add line for identd.
+	(erc-get-channel-mode-from-keypress): Typo fix.
 
 	* erc-imenu.el: Remove unnecessary lines in header.
 
 	* erc-goodies.el (erc-handle-irc-url): Docfix.
 
-	* erc-identd.el (erc-identd-start): Do not prompt the user about
-	killing the identd process on exit.
+	* erc-identd.el: Define an ERC module for this.
+	(erc-identd-start): Don't create a process buffer if possible.
+	Otherwise, use conventional hidden names for process buffers.
 
 2006-06-29  Michael Olson  <mwolson@gnu.org>
 
diff --git a/HISTORY b/HISTORY
index e4481a4..655e3b1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,23 +3,31 @@ History of ERC development:
 
 ERC was originally written by Alexander L. Belikoff (abel@bfr.co.il) and
 Sergey Berezin (sergey.berezin@cs.cmu.edu).  They stopped development
-around december 1999. Their last released version was ERC 2.0.
+around December 1999.  Their last released version was ERC 2.0.
 
 In June 2001, Mario Lang (mlang@delysid.org) and Alex Schroeder (alex@gnu.org)
 took over development and created a ERC Project at sourceforge.net.
 
-In reaction to a mail about the new erc development,
+In reaction to a mail about the new ERC development effort,
 Sergey Berezin said, "First of all, I'm glad that my version of ERC is
-being used out there. The thing is, I do not have free time and
+being used out there.  The thing is, I do not have free time and
 enough incentive anymore to work on ERC, so I would be happy if
 you guys take over the project entirely."
 
-So we happily hacked away on ERC, and soon after (september 2001)
+So we happily hacked away on ERC, and soon after (September 2001)
 released the next "stable" version, 2.1.
 
 Most of the development of the new ERC happend on #emacs on
-irc.openprojects.net. Over time, many people contributed
-code, ideas, bugfixes. And not to forget alot of alpha/beta/gamma testing.
+irc.openprojects.net.  Over time, many people contributed code, ideas,
+bugfixes, and a lot of alpha/beta/gamma testing.
+
+In 2005, Michael Olson (mwolson@gnu.org) became the release manager,
+and later, the maintainer.  After some discussion between him and the
+Emacs developers, it was decided to include ERC in Emacs.
+
+With the release of ERC 5.1, ERC was included with Emacs 22.  It
+became an official GNU project, and development moved to Savannah
+(http://sv.gnu.org/projects/erc).
 
 See the file CREDITS for a list of contributors.
 
diff --git a/erc-identd.el b/erc-identd.el
index e93b495..9e4a1f5 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -24,16 +24,30 @@
 
 ;;; Commentary:
 
-;; You can have a local identd server (running on port 8113; I use DNAT
-;; to bind 113->8113) if you add this to .emacs.el:
+;; This module allows you to run a local identd server on port 8113.
+;; You will need to set up DNAT to bind 113->8113, or use a proxy.
 
-;;    (add-hook 'erc-connect-pre-hook 'erc-identd-start)
-;;    (add-hook 'erc-disconnected-hook 'erc-identd-stop)
+;; To use this module, add identd to `erc-modules' and run
+;; `erc-update-modules'.
+
+;; Here is an example /etc/inetd.conf rule that forwards identd
+;; traffic to port 8113.  You will need simpleproxy installed for it
+;; to work.
+
+;; 113 stream tcp nowait nobody /usr/sbin/tcpd /usr/bin/simpleproxy simpleproxy -i -R 127.0.0.1:8113
 
 ;;; Code:
 
 (defvar erc-identd-process nil)
 
+;;;###autoload (autoload 'erc-identd-mode "erc-identd")
+(define-erc-module identd nil
+  "This mode launches an identd server on port 8113."
+  ((add-hook 'erc-connect-pre-hook 'erc-identd-start)
+   (add-hook 'erc-disconnected-hook 'erc-identd-stop))
+  ((remove-hook 'erc-connect-pre-hook 'erc-identd-start)
+   (remove-hook 'erc-disconnected-hook 'erc-identd-stop)))
+
 (defun erc-identd-filter (proc string)
   "This filter implements RFC1413 (identd authentication protocol)."
   (let ((erc-identd-process proc))
@@ -46,10 +60,6 @@
 			     system-type (user-login-name)))
 	(process-send-eof erc-identd-process)))))
 
-;; Ignore useless byte-compile warning
-(eval-when-compile
-  (put 'process-kill-without-query 'byte-compile nil))
-
 ;;;###autoload
 (defun erc-identd-start (&optional port)
   "Start an identd server listening to port 8113.
@@ -68,15 +78,14 @@ system."
   (setq erc-identd-process
 	(if (fboundp 'make-network-process)
 	    (make-network-process :name "identd"
-				  :buffer (generate-new-buffer "identd")
+				  :buffer nil
 				  :host 'local :service port
-				  :server t :noquery t
+				  :server t :noquery t :nowait t
 				  :filter 'erc-identd-filter)
-	  (open-network-stream-server "identd" (generate-new-buffer "identd")
-				      port nil 'erc-identd-filter)))
-  (if (fboundp 'set-process-query-on-exit-flag)
-      (set-process-query-on-exit-flag erc-identd-process nil)
-    (process-kill-without-query erc-identd-process)))
+	  (and (fboundp 'open-network-stream-server)
+	       (open-network-stream-server
+		"identd" (generate-new-buffer " *erc-identd*")
+		port nil 'erc-identd-filter)))))
 
 ;;;###autoload
 (defun erc-identd-stop (&rest ignore)
diff --git a/erc.el b/erc.el
index f67dfaa..1bc71d6 100644
--- a/erc.el
+++ b/erc.el
@@ -1772,6 +1772,7 @@ removed from the list will be disabled."
      "Mark unidentified users on freenode and other servers supporting CAPAB"
      capab-identify)
     (const :tag "Wrap long lines" fill)
+    (const :tag "Launch an identd server on port 8113" identd)
     (const :tag "Highlight or remove IRC control characters"
 	   irccontrols)
     (const :tag "List channels in a separate buffer" list)
@@ -1786,6 +1787,7 @@ removed from the list will be disabled."
     (const :tag "Complete nicknames and commands (programmable)"
 	   completion)
     (const :tag "Complete nicknames and commands (old)" hecomplete)
+    (const :tag "Process CTCP PAGE requests from IRC" page)
     (const :tag "Make displayed lines read-only" readonly)
     (const :tag "Replace text in messages" replace)
     (const :tag "Enable an input history" ring)
@@ -5145,10 +5147,10 @@ This command is sent even if excess flood is detected."
 
 (defun erc-get-channel-mode-from-keypress (key)
   "Read a key sequence and call the corresponding channel mode function.
-After doing C-c C-o type in a channel mode letter.
+After doing C-c C-o, type in a channel mode letter.
 
 C-g means quit.
-RET let's you type more than one mode at a time.
+RET lets you type more than one mode at a time.
 If \"l\" is pressed, `erc-set-channel-limit' gets called.
 If \"k\" is pressed, `erc-set-channel-key' gets called.
 Anything else will be sent to `erc-toggle-channel-mode'."
@@ -5833,26 +5835,6 @@ If optional argument HERE is non-nil, insert version number at point."
 	  (message "%s" version-string)
 	version-string))))
 
-(defun erc-version-modules (&optional here)
-  "Show the version numbers of all loaded ERC modules in the minibuffer.
-If optional argument HERE is non-nil, insert version number at point."
-  (interactive "P")
-  (let ((version-string
-	 (mapconcat 'identity
-		    (let (versions (case-fold-search nil))
-		      (dolist (var (apropos-internal "^erc-.*version$"))
-			(when (and (boundp var)
-				   (stringp (symbol-value var)))
-			  (setq versions (cons (format "%S: %s"
-						       var (symbol-value var))
-					       versions))))
-		      versions) ", ")))
-    (if here
-	(insert version-string)
-      (if (interactive-p)
-	  (message "%s" version-string)
-	version-string))))
-
 (defun erc-modes (&optional here)
   "Show the active ERC modes in the minibuffer.
 If optional argument HERE is non-nil, insert version number at point."
@@ -5873,32 +5855,6 @@ If optional argument HERE is non-nil, insert version number at point."
 	  (message "%s" string)
 	string))))
 
-(defun erc-latest-version ()
-  "Retrieve the latest erc.el version from CVS."
-  (interactive)
-  (if (ignore-errors (require 'url))
-      (progn
-	(switch-to-buffer (get-buffer-create "*erc.el latest version*"))
-	(delete-region (point-min) (point-max))
-	(kill-all-local-variables)
-	(url-insert-file-contents (concat
-				   "http://cvs.sourceforge.net/viewcvs.py/"
-				   "*checkout*/erc/erc/erc.el?content-type"
-				   "=text%2Fplain&rev=HEAD"))
-	(emacs-lisp-mode)
-	(current-buffer))
-    (error "URL needs to be installed")))
-
-(defun erc-ediff-latest-version ()
-  "Ediff your installed erc.el with the latest CVS version.
-See also `erc-latest-version'."
-  (interactive)
-  (let ((current (locate-library "erc.el")))
-    (if current
-	(ediff-buffers (find-file current)
-		       (erc-latest-version))
-      (error "You do not appear to have the uncompiled erc.el file"))))
-
 (defun erc-trim-string (s)
   "Trim leading and trailing spaces off S."
   (cond
diff --git a/erc.texi b/erc.texi
index 2ce3095..ee2f699 100644
--- a/erc.texi
+++ b/erc.texi
@@ -119,7 +119,7 @@ comes with Emacs.
 Choose to install a release if you want to minimize risk.
 
 Errors are corrected in development first.  User-visible changes will be
-announced on the @email{erc-help@@lists.sourceforge.net} mailing list.
+announced on the @email{erc-discuss@@gnu.org} mailing list.
 @pxref{Getting Help and Reporting Bugs}.
 
 @cindex releases, Debian package
@@ -129,7 +129,7 @@ available in the official Debian repository.
 
 @cindex releases, from source
 Alternatively, you can download the latest release from
-@uref{http://sourceforge.net/project/showfiles.php?group_id=30118}.
+@uref{http://ftp.gnu.org/gnu/erc}.
 
 @node Development,  , Releases, Obtaining ERC
 @comment  node-name,  next,  previous,  up
@@ -139,43 +139,13 @@ 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.
 
-@subsection Using CVS
-@cindex CVS, using
+@subsection GNU Arch
 
-ERC is primarily developed using a CVS repository on sourceforge.net.
-To check out a copy of the latest changes, do the following.
-
-@example
-cvs -d:pserver:anonymous@@cvs.sourceforge.net:/cvsroot/erc login
-cvs -z3 -d:pserver:anonymous@@cvs.sourceforge.net:/cvsroot/erc co -P erc
-@end example
-
-@cindex CVS snapshot
-Alternatively, the latest CVS snapshot may be downloaded in the
-following forms.
-
-@itemize @bullet
-@item http://mwolson.org/static/dist/erc-latest.tar.gz
-@item http://mwolson.org/static/dist/erc-latest.zip
-@end itemize
-
-@subsection Using the GNU Arch Revision Control System
-@cindex arch revision control system, using
-The Arch revision control system allows you to retrieve previous
-versions and select specific features and bug fixes.
-
-Michael Olson maintains an official Arch branch for ERC which stays
-current with the CVS repository for ERC.  If you would like to
-contribute to ERC development, and would prefer to use a modern Revision
-Control System, feel free to make your own branch.
-
-If you are new to Arch, you might find this tutorial helpful:
-@uref{http://www.mwolson.org/projects/ArchTutorial.html}.
-
-Downloading ERC with Arch and staying up-to-date involves the following
-steps.
+ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
+up-to-date involves the following steps.
 
 @enumerate
+@cindex GNU Arch, installing
 @item Install arch
 
 @itemize @bullet
@@ -183,15 +153,16 @@ steps.
 @item Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
 @end itemize
 
+@cindex GNU Arch, downloading ERC
 @item Register the archive.
 @example
-tla register-archive -f http://www.mwolson.org/archives/2006
+tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
 @end example
 
 @item Download the ERC source code.
 @example
 # Download ERC into the @file{erc} directory.
-tla get mwolson@@gnu.org--2006/erc--cvs--0 erc
+tla get erc@@sv.gnu.org/erc--main--0 erc
 @end example
 
 @item List upstream changes that are missing from your local copy.
@@ -206,24 +177,29 @@ cd erc/
 tla missing --summary
 @end example
 
-@cindex updating ERC with Arch
+@cindex GNU Arch, updating ERC
 @item Update to the latest version by replaying missing changes.
 @example
 cd erc
-tla replay
+tla update
 @end example
 
 @end enumerate
 
-There are other ways to interact with the ERC archive.
+If you are new to Arch and want to learn more about developing with it,
+you might find this tutorial helpful:
+@uref{http://www.mwolson.org/projects/ArchTutorial.html}.
+
+@subsection Development snapshots
 
-@itemize
-@item Browse arch repository: @uref{http://www.mwolson.org/archives/}
-@item Latest development snapshot: @uref{http://www.mwolson.org/static/dist/erc-latest.tar.gz}
-@end itemize
+@cindex development snapshot
+Alternatively, the latest development snapshot may be downloaded in both
+``.tar.gz'' and ``.zip'' forms.
 
-The latest development snapshot will be kept up-to-date since it is
-updated at the same time as the Arch repository.
+@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
 
 
 @node Installation, Getting Started, Obtaining ERC, Top
@@ -287,15 +263,13 @@ locations that require this.
 
 To use ERC, add the directory containing its files to your
 @code{load-path} variable, in your @file{.emacs} file.  Then, load ERC
-itself along with any extra modules you desire.  An example follows.
+itself.  An example follows.
 
 @lisp
 (require 'erc)
-
-(require 'erc-spelling)
 @end lisp
 
-Once this is loaded, the command @kbd{M-x erc-select} will start ERC and
+Once ERC is loaded, the command @kbd{M-x erc-select} will start ERC and
 prompt for the server to connect to.
 
 @c PRE5_2: Sample session, including:
@@ -367,12 +341,12 @@ Run "/names #channel" in the current channel.
 
 @item C-c C-o (`erc-get-channel-mode-from-keypress')
 Read a key sequence and call the corresponding channel mode function.
-After doing C-c C-o type in a channel mode letter.
+After doing @kbd{C-c C-o}, type in a channel mode letter.
 
-C-g means quit.
-RET let's you type more than one mode at a time.
-If "l" is pressed, `erc-set-channel-limit' gets called.
-If "k" is pressed, `erc-set-channel-key' gets called.
+@kbd{C-g} means quit.
+@kbd{RET} lets you type more than one mode at a time.
+If @kbd{l} is pressed, @code{erc-set-channel-limit} gets called.
+If @kbd{k} is pressed, @code{erc-set-channel-key} gets called.
 Anything else will be sent to `erc-toggle-channel-mode'.
 
 @item C-c C-p (`erc-part-from-channel')
@@ -411,7 +385,7 @@ The following is a list of available modules.
 
 @cindex modules, autoaway
 @item autoaway
-Set away status automatically.
+Set away status automatically
 
 @cindex modules, autojoin
 @item autojoin
@@ -425,14 +399,31 @@ Integrate with the Big Brother Database
 @item button
 Buttonize URLs, nicknames, and other text
 
+@cindex modules, completion
+@item pcomplete
+Complete nicknames and commands (programmable)
+
 @cindex modules, fill
 @item fill
 Wrap long lines
 
+@cindex modules, hecomplete
+@item completion
+Complete nicknames and commands (old).  This is the old module---you
+might prefer the ``completion'' module instead.
+
+@cindex modules, identd
+@item identd
+Launch an identd server on port 8113
+
 @cindex modules, irccontrols
 @item irccontrols
 Highlight or remove IRC control characters
 
+@cindex modules, list
+@item list
+List channels nicely in a separate buffer
+
 @cindex modules, log
 @item log
 Save buffers in logs
@@ -453,9 +444,9 @@ Don't display non-IRC commands after evaluation
 @item notify
 Notify when the online status of certain users changes
 
-@cindex modules, pcomplete
-@item pcomplete
-Complete nicknames and commands (programmable)
+@cindex modules, page
+@item page
+Process CTCP PAGE requests from IRC
 
 @cindex modules, readonly
 @item readonly
@@ -485,9 +476,9 @@ Convert smileys to pretty icons
 @item sound
 Play sounds when you receive CTCP SOUND requests
 
-@cindex modules, spell
-@item spell
-Check spelling
+@cindex modules, spelling
+@item spelling
+Check spelling of messages
 
 @cindex modules, stamp
 @item stamp
@@ -541,14 +532,24 @@ emacswiki.org page for ERC.  Anyone may add tips, hints, or bug
 descriptions to it.
 
 @item
-You can join the mailing list at @email{erc-help@@lists.sourceforge.net}
-using the subscription form at
-@uref{http://lists.sourceforge.net/lists/listinfo/erc-help}.
+There are several mailing lists for ERC.  To subscribe, visit
+@uref{http://savannah.gnu.org/mail/?group=erc}.
+
+The mailing lists are also available on Gmane.
+(@url{http://gmane.org/}).  Gmane provides additional methods for
+accessing the mailing lists, adding content to them, and searching them.
+
+@enumerate
+@item gmane.emacs.erc.announce
+Announcements
 
-This mailing list is also available via Gmane
-(@url{http://gmane.org/}). The group is called
-@samp{gmane.emacs.erc.general}.  This provides additional methods for
-accessing the mailing list, adding content to it, and searching it.
+@item gmane.emacs.erc.discuss
+General discussion
+
+@item gmane.emacs.erc.cvs
+Log messages for changes to the ERC source code
+
+@end enumerate
 
 @item
 You can visit the IRC Freenode channel @samp{#emacs}. Many of the
@@ -566,7 +567,7 @@ questions.
 ERC was originally written by Alexander L. Belikoff
 @email{abel@@bfr.co.il} and Sergey Berezin
 @email{sergey.berezin@@cs.cmu.edu}.  They stopped development around
-December 1999. Their last released version was ERC 2.0.
+December 1999.  Their last released version was ERC 2.0.
 
 P.S.: If one of the original developers of ERC reads this, we'd like to
 receive additional information for this file and hear comments in
@@ -577,42 +578,46 @@ general.
 
 In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder
 @email{alex@@gnu.org} took over development and created a ERC Project at
-sourceforge.net.
+@uref{http://sourceforge.net/projects/erc}.
 
-In reaction to a mail about the new erc development, Sergey Berezin
-said, "First of all, I'm glad that my version of ERC is being used out
-there. The thing is, I do not have free time and enough incentive
-anymore to work on ERC, so I would be happy if you guys take over the
-project entirely."
+In reaction to a mail about the new ERC development effort, Sergey
+Berezin said, ``First of all, I'm glad that my version of ERC is being
+used out there.  The thing is, I do not have free time and enough
+incentive anymore to work on ERC, so I would be happy if you guys take
+over the project entirely.''
 
 So we happily hacked away on ERC, and soon after (September 2001)
 released the next "stable" version, 2.1.
 
 Most of the development of the new ERC happened on #emacs on
-irc.openprojects.net. Over time, many people contributed code, ideas,
-bugfixes. And not to forget a lot of alpha/beta/gamma testing.
+irc.openprojects.net.  Over time, many people contributed code, ideas,
+bugfixes, and a lot of alpha/beta/gamma testing.
 
 See the @file{CREDITS} file for a list of contributors.
 
 @item 2003
 
-ERC 3.0 is released.
+ERC 3.0 was released.
 
 @item 2004
 
-ERC 4.0 is released.
+ERC 4.0 was released.
 
 @item 2005
 
-ERC 5.0 is released.  Michael Olson @email{mwolson@@gnu.org} becomes
+ERC 5.0 was released.  Michael Olson @email{mwolson@@gnu.org} became
 the release manager and eventually the maintainer.
 
-After some discussion between him and the Emacs developers, it is
+After some discussion between him and the Emacs developers, it was
 decided to include ERC in Emacs.
 
 @item 2006
 
-ERC 5.1 is released.  It is subsequently included in Emacs 22.
+ERC 5.1 was released.  It was subsequently included in Emacs 22.
+
+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.
 
 @end itemize
 



From MAILER-DAEMON Sun Oct 14 00:52:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSn-0007tl-II
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00052v-7D
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004rA-HV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOe-0004qA-QU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
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@hcoop.net>) id 1IgvOe-0003s8-FT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOd-00050z-PU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOd-0005Ne-SL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOd-0005Ne-SL@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:11 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make erc-server-connect-function
	definition simpler.
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, 14 Oct 2007 04:52:21 -0000

commit aea132d40c73053d2e4ce4980729a228a8fef574
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Apr 1 19:03:42 2006 +0000

    Make erc-server-connect-function definition simpler.
    
    * erc-backend.el (erc-server-connect-function): Don't try to detect the
      existence of the `open-network-stream-nowait' function, since I can't
      find it in Emacs21, XEmacs21, or Emacs22.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-151

diff --git a/ChangeLog b/ChangeLog
index f41fedc..05a7266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-connect-function): Don't try to
+	detect the existence of the `open-network-stream-nowait' function,
+	since I can't find it in Emacs21, XEmacs21, or Emacs22.
+
 2006-03-27  Michael Olson  <mwolson@gnu.org>
 
 	* erc.texi: Update direntry.  Remove unneeded local variables.
diff --git a/erc-backend.el b/erc-backend.el
index 8c4b915..5d2903e 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -314,13 +314,7 @@ alist."
   :type '(repeat (cons (string :tag "Target")
                        coding-system)))
 
-(defcustom erc-server-connect-function
-  (if (and (fboundp 'open-network-stream-nowait)
-           ;; CVS Emacs claims to define open-network-stream-nowait on
-           ;; windows, however, it does, in fact, not work.
-           (not (memq system-type '(windows-nt cygwin ms-dos darwin))))
-      'open-network-stream-nowait
-    'open-network-stream)
+(defcustom erc-server-connect-function 'open-network-stream
   "Function used to initiate a connection.
 It should take same arguments as `open-network-stream' does."
   :group 'erc-server



From MAILER-DAEMON Sun Oct 14 00:52:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSo-0007v0-A9
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSh-0007n4-1N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSg-0007mN-7k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOy-00053N-Tn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
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@hcoop.net>) id 1IgvOy-0003ya-K8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOx-00057S-Uk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOx-0005uO-VW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOx-0005uO-VW@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:31 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix stringp error when trying to
	connect to a 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: Sun, 14 Oct 2007 04:52:23 -0000

commit dd1437674a380be4c34d15177fa754a00fc7ede7
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Nov 9 00:02:44 2006 +0000

    Fix stringp error when trying to connect to a server
    
    2006-11-08  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-string-to-port): Avoid error when a numerical port
    	is passed.  Thanks to Zekeriya KOÇ for the report.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-58

diff --git a/ChangeLog b/ChangeLog
index e0e700a..b79043d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-string-to-port): Avoid error when a numerical port
+	is passed.  Thanks to Zekeriya KOÇ for the report.
+
 2006-10-21  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
diff --git a/erc.el b/erc.el
index 38dc628..64438fe 100644
--- a/erc.el
+++ b/erc.el
@@ -5877,10 +5877,12 @@ P may be an integer or a service name."
 
 (defun erc-string-to-port (s)
   "Convert string S to either an integer port number or a service name."
-  (let ((n (string-to-number s)))
-    (if (= n 0)
-	s
-      n)))
+  (if (numberp s)
+      s
+    (let ((n (string-to-number s)))
+      (if (= n 0)
+	  s
+	n))))
 
 (defun erc-version (&optional here)
   "Show the version number of ERC in the minibuffer.



From MAILER-DAEMON Sun Oct 14 00:52:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSo-0007uZ-2w
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSg-0007mf-Kq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOr-0004we-3x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOl-0004wW-49
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
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@hcoop.net>) id 1IgvOk-0003uS-R6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOk-000538-4t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOk-0005Yf-6n
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOk-0005Yf-6n@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:18 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.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: Sun, 14 Oct 2007 04:52:23 -0000

commit a4a667c6df7437f91e5584f09be8ba95bc74abe1
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jul 9 03:54:15 2006 +0000

    Merged from erc--rel--5.1.
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-17
       erc-pcomplete: Fix nil element issue.
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-19
       erc-log: Add a few options for times to save logs.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-15

diff --git a/ChangeLog b/ChangeLog
index 9345e9a..9bfa4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-07-08  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
+	default, since most IRC clients don't do this.
+	(erc-log-write-after-send): New option that determines whether the
+	log file will be written to after every sent message.
+	(erc-log-write-after-insert): New option that determines whether
+	the log file will be written to when new text is added to a logged
+	ERC buffer.
+	(log): Use the aforementioned options.
+
+	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
+	have a nil element in the list when ignore-self is non-nil.
+
 2006-07-02  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
diff --git a/erc-log.el b/erc-log.el
index 42695b0..2454a2a 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -153,7 +153,7 @@ directory should not end with a trailing slash."
   :type '(choice directory
 		 (const nil)))
 
-(defcustom erc-log-insert-log-on-open t
+(defcustom erc-log-insert-log-on-open nil
   "*Insert log file contents into the buffer if a log file exists."
   :group 'erc-log
   :type 'boolean)
@@ -164,6 +164,23 @@ See the variable `erc-save-buffer-on-part' for details."
   :group 'erc-log
   :type 'boolean)
 
+(defcustom erc-log-write-after-send t
+  "*If non-nil, write to log file after every message you send.
+
+If you set this to nil, you may want to enable both
+`erc-save-buffer-on-part' and `erc-save-queries-on-quit'."
+  :group 'erc-log
+  :type 'boolean)
+
+(defcustom erc-log-write-after-insert t
+  "*If non-nil, write to log file when new text is added to a
+logged ERC buffer.
+
+If you set this to nil, you may want to enable both
+`erc-save-buffer-on-part' and `erc-save-queries-on-quit'."
+  :group 'erc-log
+  :type 'boolean)
+
 (defcustom erc-log-file-coding-system (if (featurep 'xemacs)
 					  'binary
 					'emacs-mule)
@@ -190,10 +207,12 @@ also be a predicate function. To only log when you are not set away, use:
 	(with-current-buffer buffer
 	  (not erc-away))))"
   ;; enable
-  ((add-hook 'erc-insert-post-hook
-	     'erc-save-buffer-in-logs)
-   (add-hook 'erc-send-post-hook
-	     'erc-save-buffer-in-logs))
+  ((when erc-log-write-after-insert
+     (add-hook 'erc-insert-post-hook
+	       'erc-save-buffer-in-logs))
+   (when erc-log-write-after-send
+     (add-hook 'erc-send-post-hook
+	       'erc-save-buffer-in-logs)))
   ;; disable
   ((remove-hook 'erc-insert-post-hook
 		'erc-save-buffer-in-logs)
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index 695138b..33494bf 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -222,15 +222,16 @@ If optional argument IGNORE-SELF is non-nil, don't return the current nick."
   (let ((users (if erc-pcomplete-order-nickname-completions
                    (erc-sort-channel-users-by-activity
                     (erc-get-channel-user-list))
-                 (erc-get-channel-user-list))))
-    (mapcar (lambda (x)
-              (cond (ignore-self
-                     (if (string= (erc-server-user-nickname (car x))
-                                  (erc-current-nick))
-                         nil
-                       (concat (erc-server-user-nickname (car x)) postfix)))
-                    (t (concat (erc-server-user-nickname (car x)) postfix))))
-            users)))
+                 (erc-get-channel-user-list)))
+        (nicks nil))
+    (dolist (user users)
+      (unless (and ignore-self
+                   (string= (erc-server-user-nickname (car user))
+                            (erc-current-nick)))
+        (setq nicks (cons (concat (erc-server-user-nickname (car user))
+                                  postfix)
+                          nicks))))
+    (nreverse nicks)))
 
 (defun pcomplete-erc-all-nicks (&optional postfix)
   "Returns a list of all nicks on the current server."



From MAILER-DAEMON Sun Oct 14 00:52:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSo-0007vO-Hk
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSh-0007nO-GS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSg-0007mn-OS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOr-00050a-LZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
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@hcoop.net>) id 1IgvOr-0003wI-1a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOq-00054x-9L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOq-0005im-Aj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOq-0005im-Aj@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Kill hung IRC processes.
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, 14 Oct 2007 04:52:23 -0000

commit 287dc8e8408d52c8bdcffe73d35138ba224db077
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 6 07:03:00 2006 +0000

    Kill hung IRC processes.
    
    * erc-backend.el (erc-server-ping-timer-alist): New variable that keeps
      track of ping timers according to their associated server.
      (erc-server-last-received-time): New variable that specifies the time
      of the last message we received from the server.  This is used to
      detect hung processes.
      (erc-server-setup-periodical-server-ping): If the server buffer no
      longer exists, cancel the timer.  If the server process has not given
      us a message, including PING responses, since the last PING, kill it.
      This is necessary to deal with some aberrant freenode behavior.  Idea
      taken from rcirc.
    
    * erc.el (erc-select-startup-file): Fix bug introduced by recent change.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-35

diff --git a/ChangeLog b/ChangeLog
index 8892366..42b6daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,20 @@
 
 	* erc-backend.el (erc-server-send-queue): Update from Circe
 	version of this function.
+	(erc-server-ping-timer-alist): New variable that keeps track of
+	ping timers according to their associated server.
+	(erc-server-last-received-time): New variable that specifies the
+	time of the last message we received from the server.  This is
+	used to detect hung processes.
+	(erc-server-setup-periodical-server-ping): If the server buffer no
+	longer exists, cancel the timer.  If the server process has not
+	given us a message, including PING responses, since the last PING,
+	kill it.  This is necessary to deal with some aberrant freenode
+	behavior.  Idea taken from rcirc.
 
 	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 	multi-tty Emacs.
+	(erc-select-startup-file): Fix bug introduced by recent change.
 
 2006-08-05  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc-backend.el b/erc-backend.el
index 81ab0b8..b73433c 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -174,6 +174,9 @@ WALLCHOPS - supports sending messages to all operators in a channel")
 
 ;;; Server and connection state
 
+(defvar erc-server-ping-timer-alist nil
+  "Mapping of server buffers to their specific ping timer.")
+
 (defvar erc-server-connected nil
   "Non-nil if the `current-buffer' is associated with an open IRC connection.
 This variable is buffer-local.")
@@ -202,6 +205,11 @@ This is useful for flood protection.")
 This is useful for flood protection.")
 (make-variable-buffer-local 'erc-server-last-ping-time)
 
+(defvar erc-server-last-received-time nil
+  "Time the last message was received from the server.
+This is useful for detecting hung connections.")
+(make-variable-buffer-local 'erc-server-last-received-time)
+
 (defvar erc-server-lag nil
   "Calculated server lag time in seconds.
 This variable is only set in a server buffer.")
@@ -407,12 +415,25 @@ Currently this is called by `erc-send-input'."
           (run-with-timer
            4 erc-server-send-ping-interval
            (lambda (buf)
-             (when (buffer-live-p buf)
-               (with-current-buffer buf
-                 (erc-server-send
-                  (format "PING %.0f"
-                          (erc-current-time))))))
-           (current-buffer)))))
+             (if (buffer-live-p buf)
+                 (with-current-buffer buf
+                   (if (> (erc-time-diff (erc-current-time)
+                                         erc-server-last-received-time)
+                          erc-server-send-ping-interval)
+                       ;; if the process is hung, kill it
+                       (kill-process erc-server-process)
+                     (erc-server-send
+                      (format "PING %.0f"
+                              (erc-current-time)))))
+               ;; remove timer if the server buffer has been killed
+               (let ((timer (assq buf erc-server-ping-timer-alist)))
+                 (when timer
+                   (erc-cancel-timer (cdr timer))
+                   (setcar timer nil)))))
+           (current-buffer)))
+    (setq erc-server-ping-timer-alist (cons (cons (current-buffer)
+                                                  erc-server-ping-handler)
+                                            erc-server-ping-timer-alist))))
 
 (defun erc-server-process-alive ()
   "Return non-nil when `erc-server-process' is open or running."
@@ -434,8 +455,10 @@ We will store server variables in the current buffer."
     (message "%s...done" msg))
   ;; Misc server variables
   (setq erc-server-quitting nil)
-  (setq erc-server-last-sent-time (erc-current-time))
-  (setq erc-server-last-ping-time (erc-current-time))
+  (let ((time (erc-current-time)))
+    (setq erc-server-last-sent-time time)
+    (setq erc-server-last-ping-time time)
+    (setq erc-server-last-received-time time))
   (setq erc-server-lines-sent 0)
   ;; last peers (sender and receiver)
   (setq erc-server-last-peers '(nil . nil))
@@ -460,6 +483,7 @@ We will store server variables in the current buffer."
 (defun erc-server-filter-function (process string)
   "The process filter for the ERC server."
   (with-current-buffer (process-buffer process)
+    (setq erc-server-last-received-time (current-time))
     ;; If you think this is written in a weird way - please refer to the
     ;; docstring of `erc-server-processing-p'
     (if erc-server-processing-p
diff --git a/erc.el b/erc.el
index 2c177a5..e237003 100644
--- a/erc.el
+++ b/erc.el
@@ -5250,7 +5250,7 @@ If FILE is found, return the path to it."
 See also `erc-startup-file-list'."
   (catch 'found
     (dolist (f erc-startup-file-list)
-      (setq f (convert-standard-file-name f))
+      (setq f (convert-standard-filename f))
       (when (file-readable-p f)
 	(throw 'found f)))))
 



From MAILER-DAEMON Sun Oct 14 00:52:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSp-0007wK-6F
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00053L-NW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOj-0004qM-36
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOf-0004qD-40
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
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@hcoop.net>) id 1IgvOe-0003sJ-Q5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOe-000515-3N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOe-0005O9-5R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOe-0005O9-5R@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:12 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Be careful with negated classes and
	newlines.
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, 14 Oct 2007 04:52:25 -0000

commit e7075eae5d500a6e60fc7e828edfed2cf8b63697
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 2 18:37:06 2006 +0000

    Be careful with negated classes and newlines.
    
    * erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el, erc.el:
      Make sure to include a newline inside of negated classes, so that a
      newline is not matched.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-152

diff --git a/ChangeLog b/ChangeLog
index 05a7266..f610603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-02  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
+	erc.el: Make sure to include a newline inside of negated classes,
+	so that a newline is not matched.
+
 2006-04-01  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-server-connect-function): Don't try to
diff --git a/erc-backend.el b/erc-backend.el
index 5d2903e..634e1cc 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -758,10 +758,10 @@ PROCs `process-buffer' is `current-buffer' when this function is called."
                 (substring string 1 posn)))
 
         (setf (erc-response.command msg)
-              (let* ((bposn (string-match "[^ ]" string posn))
+              (let* ((bposn (string-match "[^ \n]" string posn))
                      (eposn (string-match " " string bposn)))
                 (setq posn (and eposn
-                                (string-match "[^ ]" string eposn)))
+                                (string-match "[^ \n]" string eposn)))
                 (substring string bposn eposn)))
 
         (while (and posn
@@ -769,7 +769,7 @@ PROCs `process-buffer' is `current-buffer' when this function is called."
           (push (let* ((bposn posn)
                        (eposn (string-match " " string bposn)))
                   (setq posn (and eposn
-                                  (string-match "[^ ]" string eposn)))
+                                  (string-match "[^ \n]" string eposn)))
                   (substring string bposn eposn))
                 (erc-response.command-args msg)))
         (when posn
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index e6f359b..518fc73 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -142,7 +142,7 @@ in the alist is `nil', prompt for the appropriate values."
 (defun erc-ezb-add-session (message)
   "Add an EZBounce session to the session list."
   (when (and erc-ezb-inside-session-listing
-	     (string-match "^\\([^ ]+\\) +\\([^ ]+\\) +\\([^ ]+\\) +\\([^ ]+\\)$" message))
+	     (string-match "^\\([^ \n]+\\) +\\([^ \n]+\\) +\\([^ \n]+\\) +\\([^ \n]+\\)$" message))
     (let ((id (match-string 1 message))
 	  (nick (match-string 2 message))
 	  (to   (match-string 3 message)))
diff --git a/erc-join.el b/erc-join.el
index 8c861e4..02a7d4d 100644
--- a/erc-join.el
+++ b/erc-join.el
@@ -95,7 +95,7 @@ servers, presumably in the same domain."
 		   (or erc-server-announced-name erc-session-server))))
     (when (erc-current-nick-p nick)
       (when (and erc-autojoin-domain-only
-		 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server))
+		 (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server))
 	(setq server (match-string 1 server)))
       (let ((elem (assoc server erc-autojoin-channels-alist)))
 	(if elem
@@ -118,7 +118,7 @@ servers, presumably in the same domain."
 		   (or erc-server-announced-name erc-session-server))))
     (when (erc-current-nick-p nick)
       (when (and erc-autojoin-domain-only
-		 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server))
+		 (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server))
 	(setq server (match-string 1 server)))
       (let ((elem (assoc server erc-autojoin-channels-alist)))
 	(when elem
diff --git a/erc-netsplit.el b/erc-netsplit.el
index c372d61..5ef9d9e 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -67,7 +67,8 @@ sever buffer."
   :group 'erc-netsplit
   :type 'boolean)
 
-(defcustom erc-netsplit-regexp "^[^ @!\"]+\\.[^ @!]+ [^ @!]+\\.[^ @!\"]+$"
+(defcustom erc-netsplit-regexp
+  "^[^ @!\"\n]+\\.[^ @!\n]+ [^ @!\n]+\\.[^ @!\"\n]+$"
   "This regular expression should match quit reasons produced
 by netsplits."
   :group 'erc-netsplit
@@ -134,7 +135,7 @@ join from that split has been detected or not.")
 (defun erc-netsplit-MODE (proc parsed)
   "Hide mode changes from servers."
   ;; regexp matches things with a . in them, and no ! or @ in them.
-  (when (string-match "^[^@!]+\\.[^@!]+$" (erc-response.sender parsed))
+  (when (string-match "^[^@!\n]+\\.[^@!\n]+$" (erc-response.sender parsed))
     (and erc-netsplit-debug
 	 (erc-display-message
 	  parsed 'notice (process-buffer proc)
diff --git a/erc.el b/erc.el
index 6ec06bf..f076d20 100644
--- a/erc.el
+++ b/erc.el
@@ -3503,7 +3503,7 @@ If FACE is non-nil, it will be used to propertize the prompt.  If it is nil,
 If `point' is at the beginning of a channel name, use that as default."
   (interactive
    (list
-    (let ((chnl (if (looking-at "\\([&#+!][^ ]+\\)") (match-string 1) ""))
+    (let ((chnl (if (looking-at "\\([&#+!][^ \n]+\\)") (match-string 1) ""))
 	  (table (when (erc-server-buffer-live-p)
 		   (set-buffer (process-buffer erc-server-process))
 		   erc-channel-list)))
@@ -4747,12 +4747,12 @@ EmacsSpeak support."
 
 Return a list of the three separate tokens."
   (cond
-   ((string-match "^\\([^!]*\\)!\\([^@]*\\)@\\(.*\\)$" string)
+   ((string-match "^\\([^!\n]*\\)!\\([^@\n]*\\)@\\(.*\\)$" string)
     (list (match-string 1 string)
 	  (match-string 2 string)
 	  (match-string 3 string)))
    ;; Some bogus bouncers send Nick!(null), try to live with that.
-   ((string-match "^\\([^!]*\\)!\\(.*\\)$" string)
+   ((string-match "^\\([^!\n]*\\)!\\(.*\\)$" string)
     (list (match-string 1 string)
 	  ""
 	  (match-string 2 string)))
@@ -5066,7 +5066,7 @@ user matches any regexp in `erc-ignore-reply-list'."
   "Return the addressed target in MSG.
 
 The addressed target is the string before the first colon in MSG."
-  (if (string-match "^\\([^: ]*\\):" msg)
+  (if (string-match "^\\([^: \n]*\\):" msg)
       (match-string 1 msg)
     nil))
 



From MAILER-DAEMON Sun Oct 14 00:52:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSp-0007w0-0X
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOy-00053K-NI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOg-0004rl-75
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOg-0004rb-3s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
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@hcoop.net>) id 1IgvOf-0003so-TE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOf-00051T-5T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOf-0005Q9-8d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOf-0005Q9-8d@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:13 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:24 -0000

commit 40aae05017bdc69e569a6d45a035f913d32b80f8
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu May 4 00:51:52 2006 +0000

    Update from CVS
    
    2006-05-01  Edward O'Connor  <ted@oconnor.cx>
    
       * erc-goodies.el: (erc-handle-irc-url): New function, suitable as
       a value for `url-irc-function'.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-156

diff --git a/ChangeLog b/ChangeLog
index 1e401b2..ede6139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-01  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc-goodies.el: (erc-handle-irc-url): New function, suitable as
+	a value for `url-irc-function'.
+
 2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
diff --git a/erc-goodies.el b/erc-goodies.el
index c844af5..d50a8d9 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -516,6 +516,28 @@ servers.  If called from a program, PROC specifies the server process."
       (multi-occur (erc-buffer-list nil proc) string)
     (error "`multi-occur' is not defined as a function")))
 
+;; Teach url.el how to open irc:// URLs with ERC.
+;; To activate, customize `url-irc-function'.
+
+(defun erc-handle-irc-url (host port channel user password)
+  "Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD.
+If ERC is already connected to HOST:PORT, simly /join CHANNEL.
+Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
+  (let ((server-buffer
+         (car (erc-buffer-filter
+               (lambda ()
+                 (and (string-equal erc-session-server host)
+                      (= erc-session-port port)
+                      erc-server-connected
+                      (eq (erc-server-buffer) (current-buffer))))))))
+    (with-current-buffer (or server-buffer (current-buffer))
+      (if (and server-buffer channel)
+          (erc-cmd-JOIN channel)
+        (erc host port (or user (erc-compute-nick)) (erc-compute-full-name)
+             (not server-buffer) password nil channel
+             (when server-buffer
+               (get-buffer-process server-buffer)))))))
+
 (provide 'erc-goodies)
 
 ;; arch-tag: d987ae26-9e28-4c72-9596-e617309fb582



From MAILER-DAEMON Sun Oct 14 00:52:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSp-0007wu-Gp
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPy-0005XF-Es
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPs-0005SN-Sn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPs-0005S3-Et
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
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@hcoop.net>) id 1IgvPs-0004E8-5l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:28 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPr-0005Sp-FH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPr-0007Oh-Ig
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:27 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPr-0007Oh-Ig@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:27 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][master] Add .gitignore file
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, 14 Oct 2007 04:52:25 -0000

commit 258ee30b8c253be8e6b52b95a216f9760d6fe38d
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Sep 10 13:45:19 2007 -0400

    Add .gitignore file
    
    Also add forgotten ChangeLog entry.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9581394
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+*.elc
+*.info
+/++xgit-log-edit
+erc-auto.el
diff --git a/ChangeLog b/ChangeLog
index b332c3c..c0a9eab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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



From MAILER-DAEMON Sun Oct 14 00:52:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSp-0007xO-Tf
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSk-0007pW-6P
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOr-0004tm-B9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOh-0004tK-SV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
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@hcoop.net>) id 1IgvOh-0003tQ-JO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOg-000524-Th
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOg-0005T9-Va
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOg-0005T9-Va@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-autoaway: Add user idle method
	and re-organize.
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, 14 Oct 2007 04:52:26 -0000

commit 61b416429317b0384e6c552ff09ea01506018fa2
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Jun 3 18:25:39 2006 +0000

    erc-autoaway: Add user idle method and re-organize.
    
    * erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
     (erc-autoaway-idle-method): Renamed from
     `erc-autoaway-use-emacs-idle'.  We have more than two choices for how to
     do this, so it's best to make this take symbol values.  Improve
     documentation.  Remove warning against Emacs idle-time; the point is
     moot now that we get user idle time via a different method.  Make sure
     we disable and re-enable the module when changing this value.
     (autoaway): Conditionalize on the above option.  If using the idle timer
     or user idle methods, don't add anything to the send-completed or
     server-001 hooks, since it is unnecessary.
     (erc-autoaway-reestablish-idletimer, erc-autoaway-message): Docfix.
     (erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
     (erc-autoaway-reset-idletime): Make the first argument optional so that
     we can safely add this to post-command-hook.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-4

diff --git a/CREDITS b/CREDITS
index 5172ffc..9e8e910 100644
--- a/CREDITS
+++ b/CREDITS
@@ -131,6 +131,9 @@ Aravind Gottipati <aravind@freeshell.org>:
   * Made /quote work with lines that don't have leading whitespace (1
     line changed).
 
+Mark Plaksin (happy AT mcplaksin DOT org):
+  * Made a last-keystroke method for erc-autoaway.el.
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index 1dcc503..c5af6a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2006-06-03  Michael Olson  <mwolson@gnu.org>
 
+	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
+	(erc-autoaway-idle-method): Renamed from
+	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
+	how to do this, so it's best to make this take symbol values.
+	Improve documentation.  Remove warning against Emacs idle-time;
+	the point is moot now that we get user idle time via a different
+	method.  Make sure we disable and re-enable the module when
+	changing this value.
+	(autoaway): Conditionalize on the above option.  If using the idle
+	timer or user idle methods, don't add anything to the
+	send-completed or server-001 hooks, since it is unnecessary.
+	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
+	Docfix.
+	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
+	(erc-autoaway-reset-idletime): Make the first argument optional so
+	that we can safely add this to post-command-hook.
+
 	* Makefile (upload): Make this work for Savannah uploads.
 
 	* AUTHORS: Update for Savannah move.  No old entries have been
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 810f0b6..518005d 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
@@ -43,18 +43,24 @@ yourself back when you type something."
   "The Emacs idletimer.
 This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
 
-(defcustom erc-autoaway-use-emacs-idle nil
-  "*If non-nil, the idle time refers to idletime in Emacs.
-If nil, the idle time refers to idletime on IRC only.
+(defcustom erc-autoaway-idle-method 'user
+  "*The method used to determine how long you have been idle.
+If 'user, the time of the last command sent to Emacs is used.
+If 'emacs, the idle time in Emacs is used.
+If 'irc, the time of the last IRC command is used.
+
 The time itself is specified by `erc-autoaway-idle-seconds'.
-See `erc-autoaway-mode' for more information on the various
-definitions of being idle.
 
-Note that using Emacs idletime is currently broken for most versions,
-since process activity (as happens all the time on IRC) makes Emacs
-non-idle.  Emacs idle-time and user idle-time are just not the same."
+See `erc-autoaway-mode' for more information on the various
+definitions of being idle."
   :group 'erc-autoaway
-  :type 'boolean)
+  :type '(choice (const :tag "User idle time" user)
+		 (const :tag "Emacs idle time" emacs)
+		 (const :tag "Last IRC action" irc))
+  :set (lambda (sym val)
+	 (erc-autoaway-disable)
+	 (set-default sym val)
+	 (erc-autoaway-enable)))
 
 ;;;###autoload (autoload 'erc-autoaway-mode "erc-autoaway")
 (define-erc-module autoaway nil
@@ -64,35 +70,40 @@ the number of seconds specified in `erc-autoaway-idle-seconds'.
 
 There are several kinds of being idle:
 
-IRC idle time measures how long since you last sent something (see
-`erc-autoaway-last-sent-time').  This is the default.
+User idle time measures how long you have not been sending any
+commands to Emacs.  This is the default.
 
 Emacs idle time measures how long Emacs has been idle.  This is
 currently not useful, since Emacs is non-idle when it handles
-ping-pong with IRC servers.  See `erc-autoaway-use-emacs-idle' for
-more information.
+ping-pong with IRC servers.  See `erc-autoaway-idle-method'
+for more information.
 
-User idle time measures how long you have not been sending any
-commands to Emacs, or to your system.  Emacs currently provides no way
-to measure user idle time.
+IRC idle time measures how long since you last sent something (see
+`erc-autoaway-last-sent-time').
 
 If `erc-auto-discard-away' is set, then typing anything, will
 set you no longer away.
 
 Related variables: `erc-public-away-p' and `erc-away-nickname'."
   ;; Enable:
-  ((add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
-   (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime)
-   (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
-   (when erc-autoaway-use-emacs-idle
-     (erc-autoaway-reestablish-idletimer)))
+  ((cond ((eq erc-autoaway-idle-method 'irc)
+	  (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
+	  (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime))
+	 ((eq erc-autoaway-idle-method 'user)
+	  (add-hook 'post-command-hook 'erc-autoaway-reset-idletime))
+	 ((eq erc-autoaway-idle-method 'emacs)
+	  (erc-autoaway-reestablish-idletimer)))
+   (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away))
   ;; Disable:
-  ((remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
-   (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime)
-   (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
-   (when erc-autoaway-idletimer
-     (erc-cancel-timer erc-autoaway-idletimer)
-     (setq erc-autoaway-idletimer nil))))
+  ((cond ((eq erc-autoaway-idle-method 'irc)
+	  (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idletime)
+	  (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idletime))
+	 ((eq erc-autoaway-idle-method 'user)
+	  (remove-hook 'post-command-hook 'erc-autoaway-reset-idletime))
+	 ((eq erc-autoaway-idle-method 'emacs)
+	  (erc-cancel-timer erc-autoaway-idletimer)
+	  (setq erc-autoaway-idletimer nil)))
+   (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)))
 
 (defcustom erc-auto-set-away t
   "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.
@@ -123,8 +134,8 @@ See `erc-auto-discard-away'."
 
 (defun erc-autoaway-reestablish-idletimer ()
   "Reestablish the emacs idletimer.
-You have to call this function each time you change
-`erc-autoaway-idle-seconds', if `erc-autoaway-use-emacs-idle' is set."
+If `erc-autoaway-idle-method' is 'emacs, you must call this
+function each time you change `erc-autoaway-idle-seconds'."
   (interactive)
   (when erc-autoaway-idletimer
     (erc-cancel-timer erc-autoaway-idletimer))
@@ -141,22 +152,22 @@ you have to run `erc-autoaway-reestablish-idletimer' afterwards."
   :group 'erc-autoaway
   :set (lambda (sym val)
 	 (set-default sym val)
-	 (when erc-autoaway-use-emacs-idle
+	 (when (eq erc-autoaway-idle-method 'emacs)
 	   (erc-autoaway-reestablish-idletimer)))
   :type 'number)
 
 (defcustom erc-autoaway-message
   "I'm gone (autoaway after %i seconds of idletime)"
-  "*Message ERC will use when he sets you automatically away.
-It is used as a `format' string with the argument of the idletime in
-seconds."
+  "*Message ERC will use when setting you automatically away.
+It is used as a `format' string with the argument of the idletime
+in seconds."
   :group 'erc-autoaway
   :type 'string)
 
 (defvar erc-autoaway-last-sent-time (erc-current-time)
   "The last time the user sent something.")
 
-(defun erc-autoaway-reset-idletime (line &rest stuff)
+(defun erc-autoaway-reset-idletime (&optional line &rest stuff)
   "Reset the stored idletime for the user.
 This is one global variable since a user talking on one net can talk
 on another net too."



From MAILER-DAEMON Sun Oct 14 00:52:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSq-0007xV-16
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSl-0007qa-9p
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005Fa-9i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Ew-PE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPX-00045S-GA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPW-0005LS-M9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPW-0006pR-Nz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPW-0006pR-Nz@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix error in erc-command-no-process-p
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, 14 Oct 2007 04:52:27 -0000

commit c4a6e3578e2cb9780d69f3a3dce2ea394eaa8e41
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 21:23:57 2007 -0400

    Fix error in erc-command-no-process-p
    
    * 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.

diff --git a/ChangeLog b/ChangeLog
index ef5a24d..4c602d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-14  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
 2007-08-12  Michael Olson  <mwolson@gnu.org>
 
 	* erc-identd.el (erc-identd-filter): Instead of sending an EOF
diff --git a/erc.el b/erc.el
index 324a820..fd709ed 100644
--- a/erc.el
+++ b/erc.el
@@ -2496,7 +2496,8 @@ See also `erc-server-send'."
 is not alive, nil otherwise."
   (let ((fun (erc-extract-command-from-line str)))
     (and fun
-	 (get fun 'process-not-needed))))
+	 (symbolp (car fun))
+	 (get (car fun) 'process-not-needed))))
 
 (defun erc-command-name (cmd)
   "For CMD being the function name of a ERC command, something like



From MAILER-DAEMON Sun Oct 14 00:52:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSt-000801-3q
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSl-0007ql-Df
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSk-0007q1-Nf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOr-00050Y-KK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
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@hcoop.net>) id 1IgvOr-0003wG-4J
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOq-00054v-9I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOq-0005iH-2L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:24 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOq-0005iH-2L@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:24 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Take small update from Circe.
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, 14 Oct 2007 04:52:28 -0000

commit caf849bafadd2998d6e74fb8440f065f0be17af1
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 6 06:16:22 2006 +0000

    Take small update from Circe.
    
    * erc-backend.el (erc-server-send-queue): Update from Circe version of
      this function.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-34

diff --git a/ChangeLog b/ChangeLog
index abf1d2f..8892366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-06  Michael Olson  <mwolson@gnu.org>
 
+	* erc-backend.el (erc-server-send-queue): Update from Circe
+	version of this function.
+
 	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 	multi-tty Emacs.
 
diff --git a/erc-backend.el b/erc-backend.el
index 705ca7a..81ab0b8 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -680,7 +680,8 @@ protection algorithm."
               (error nil)))))
       (when erc-server-flood-queue
         (setq erc-server-flood-timer
-              (run-at-time 2 nil #'erc-server-send-queue buffer))))))
+              (run-at-time (+ 0.2 erc-server-flood-penalty)
+                           nil #'erc-server-send-queue buffer))))))
 
 (defun erc-message (message-command line &optional force)
   "Send LINE to the server as a privmsg or a notice.



From MAILER-DAEMON Sun Oct 14 00:52:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSt-00080C-7z
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSm-0007rZ-6m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005FL-G4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Eo-P9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPX-00045e-Q9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPX-0005Lb-0B
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPX-0006pw-1q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPX-0006pw-1q@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Try to fix bug with /reconnect and a
	killed server buffer
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, 14 Oct 2007 04:52:28 -0000

commit 75373f6d2bfb8a2245d4848a402bc6e42f6784ea
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Aug 13 21:54:48 2007 -0400

    Try to fix bug with /reconnect and a killed server buffer
    
    * 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.el (erc-cmd-RECONNECT): Use simpler logic, and use buffer-live-p
      rather than bufferp.

diff --git a/ChangeLog b/ChangeLog
index 4c602d6..50b8dd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
 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.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.
 
 2007-08-12  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc-backend.el b/erc-backend.el
index d0ec812..75bef89 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -550,11 +550,12 @@ We will store server variables in the buffer given by BUFFER."
 (defun erc-server-reconnect ()
 "Reestablish the current IRC connection.
 Make sure you are in an ERC buffer when running this."
-  (let ((server (erc-server-buffer)))
-    (unless (and server
-                 (buffer-live-p server))
-      (error "Couldn't switch to server buffer"))
-    (with-current-buffer server
+  (let ((buffer (erc-server-buffer)))
+    (unless (buffer-live-p buffer)
+      (if (eq major-mode 'erc-mode)
+          (error "Reconnect must be run from an ERC buffer")
+        (setq buffer (current-buffer))))
+    (with-current-buffer buffer
       (erc-update-mode-line)
       (erc-set-active-buffer (current-buffer))
       (setq erc-server-last-sent-time 0)
diff --git a/erc.el b/erc.el
index fd709ed..5d29ace 100644
--- a/erc.el
+++ b/erc.el
@@ -3256,9 +3256,11 @@ the message given by REASON."
 
 (defun erc-cmd-RECONNECT ()
   "Try to reconnect to the current IRC server."
-  (let ((buffer (or (erc-server-buffer) (current-buffer)))
+  (let ((buffer (erc-server-buffer))
 	(process nil))
-    (with-current-buffer (if (bufferp buffer) buffer (current-buffer))
+    (unless (buffer-live-p buffer)
+      (setq buffer (current-buffer)))
+    (with-current-buffer buffer
       (setq erc-server-quitting nil)
       (setq erc-server-reconnecting t)
       (setq erc-server-reconnect-count 0)



From MAILER-DAEMON Sun Oct 14 00:52:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSt-00080T-E5
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSm-0007sG-Ig
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005Ff-64
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Eu-IW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPX-00045M-QD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPP-0005Hr-Jn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPP-0006dR-MG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPP-0006dR-MG@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:59 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix bug with pcomplete and Slashnet
	"hops"
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, 14 Oct 2007 04:52:29 -0000

commit d814c1b0ee36867df6b44b35d46b698425b25abc
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Apr 19 04:35:19 2007 +0000

    Fix bug with pcomplete and Slashnet "hops"
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-141

diff --git a/ChangeLog b/ChangeLog
index 157824b..efe62c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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.
diff --git a/erc.el b/erc.el
index 83b23b4..d0d84d0 100644
--- a/erc.el
+++ b/erc.el
@@ -4412,33 +4412,65 @@ See also `erc-channel-begin-receiving-names'."
 	   erc-channel-users)
   (setq erc-channel-new-member-names nil))
 
+(defun erc-parse-prefix ()
+  "Return an alist of valid prefix character types and their representations.
+Example: (operator) o => @, (voiced) v => +."
+  (let ((str (or (cdr (assoc "PREFIX" (erc-with-server-buffer
+					erc-server-parameters)))
+		 ;; provide a sane default
+		 "(ov)@+"))
+	types chars)
+    (when (string-match "^(\\([^)]+\\))\\(.+\\)$" str)
+      (setq types (match-string 1 str)
+	    chars (match-string 2 str))
+      (let ((len (min (length types) (length chars)))
+	    (i 0)
+	    (alist nil))
+	(while (< i len)
+	  (setq alist (cons (cons (elt types i) (elt chars i))
+			    alist))
+	  (setq i (1+ i)))
+	alist))))
+
 (defun erc-channel-receive-names (names-string)
   "This function is for internal use only.
 
 Update `erc-channel-users' according to NAMES-STRING.
 NAMES-STRING is a string listing some of the names on the
 channel."
-  (let (names name op voice)
-      ;; We need to delete "" because in XEmacs, (split-string "a ")
-      ;; returns ("a" "").
-      (setq names (delete "" (split-string names-string)))
-      (let ((erc-channel-members-changed-hook nil))
-	(dolist (item names)
-	  (cond ((string-match "^@\\(.*\\)$" item)
-		 (setq name (match-string 1 item)
-		       op 'on
-		       voice 'off))
-		((string-match "^+\\(.*\\)$" item)
-		 (setq name (match-string 1 item)
-		       op 'off
-		       voice 'on))
-		(t (setq name item
-			 op 'off
-			 voice 'off)))
-	(puthash (erc-downcase name) t
-		 erc-channel-new-member-names)
-	(erc-update-current-channel-member
-	 name name t op voice)))
+  (let (prefix op-ch voice-ch names name op voice)
+    (setq prefix (erc-parse-prefix))
+    (setq op-ch (cdr (assq ?o prefix))
+	  voice-ch (cdr (assq ?v prefix)))
+    ;; We need to delete "" because in XEmacs, (split-string "a ")
+    ;; returns ("a" "").
+    (setq names (delete "" (split-string names-string)))
+    (let ((erc-channel-members-changed-hook nil))
+      (dolist (item names)
+	(let ((updatep t)
+	      ch)
+	  (if (rassq (elt item 0) prefix)
+	      (cond ((= (length item) 1)
+		     (setq updatep nil))
+		    ((eq (elt item 0) op-ch)
+		     (setq name (substring item 1)
+			   op 'on
+			   voice 'off))
+		    ((eq (elt item 0) voice-ch)
+		     (setq name (substring item 1)
+			   op 'off
+			   voice 'on))
+		    (t (setq name (substring item 1)
+			     op 'off
+			     voice 'off)))
+	    (setq name item
+		  op 'off
+		  voice 'off))
+	  (when updatep
+	    (puthash (erc-downcase name) t
+		     erc-channel-new-member-names)
+	    (erc-update-current-channel-member
+	     name name t op voice)))))
     (run-hooks 'erc-channel-members-changed-hook)))
 
 (defcustom erc-channel-members-changed-hook nil
@@ -4530,15 +4562,15 @@ See also: `erc-update-user' and `erc-update-channel-member'."
 	      (setq changed t)
 	    (setf (erc-channel-user-op cuser)
 		  (cond ((eq op 'on) t)
-				   ((eq op 'off) nil)
-				   (t op))))
+			((eq op 'off) nil)
+			(t op))))
 	  (when (and voice
 		     (not (eq (erc-channel-user-voice cuser) voice)))
 	      (setq changed t)
 	    (setf (erc-channel-user-voice cuser)
 		  (cond ((eq voice 'on) t)
-				      ((eq voice 'off) nil)
-				      (t voice))))
+			((eq voice 'off) nil)
+			(t voice))))
 	  (when update-message-time
 	    (setf (erc-channel-user-last-message-time cuser) (current-time)))
 	  (setq user-changed
@@ -4560,11 +4592,11 @@ See also: `erc-update-user' and `erc-update-channel-member'."
 		      (erc-server-user-buffers user))))
 	(setq cuser (make-erc-channel-user
 		     :op (cond ((eq op 'on) t)
-				       ((eq op 'off) nil)
-				       (t op))
+			       ((eq op 'off) nil)
+			       (t op))
 		     :voice (cond ((eq voice 'on) t)
-				       ((eq voice 'off) nil)
-				       (t voice))
+				  ((eq voice 'off) nil)
+				  (t voice))
 		     :last-message-time
 		     (if update-message-time (current-time))))
 	(puthash (erc-downcase nick) (cons user cuser)



From MAILER-DAEMON Sun Oct 14 00:52:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSt-00080o-L7
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSn-0007uO-Um
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005Fr-EK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005E6-3v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPV-00045M-KA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPU-0005K0-6C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPU-0006lQ-8q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPU-0006lQ-8q@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:04 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add explicit tls connection function
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, 14 Oct 2007 04:52:30 -0000

commit bd8cdbf8c8745956c373ded818601924c1925294
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Jun 20 23:55:13 2007 +0000

    Add explicit tls connection function
    
    2007-06-20  Michael Olson  <mwolson@gnu.org>
    
    	* 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-153

diff --git a/ChangeLog b/ChangeLog
index ea81e0f..72d7445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,12 @@
 	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.
diff --git a/erc.el b/erc.el
index 08cda2e..66153d5 100644
--- a/erc.el
+++ b/erc.el
@@ -2158,7 +2158,11 @@ Arguments are the same as for `erc'."
   "Open an SSL stream to an IRC server.
 The process will be given the name NAME, its target buffer will be
 BUFFER.  HOST and PORT specify the connection target."
-  (when (require 'ssl)
+  (when (condition-case nil
+	    (require 'ssl)
+	  (error (message "You don't have ssl.el.  %s"
+			  "Try using `erc-tls' instead.")
+		 nil))
     (let ((proc (open-ssl-stream name buffer host port)))
       ;; Ugly hack, but it works for now. Problem is it is
       ;; very hard to detect when ssl is established, because s_client
@@ -2167,6 +2171,24 @@ BUFFER.  HOST and PORT specify the connection target."
       (sit-for 5)
       proc)))
 
+(defun erc-tls (&rest r)
+  "Interactively select TLS connection parameters and run ERC.
+Arguments are the same as for `erc'."
+  (interactive (erc-select-read-args))
+  (let ((erc-server-connect-function 'erc-open-tls-stream))
+    (apply 'erc r)))
+
+(defun erc-open-tls-stream (name buffer host port)
+  "Open an TLS stream to an IRC server.
+The process will be given the name NAME, its target buffer will be
+BUFFER.  HOST and PORT specify the connection target."
+  (when (condition-case nil
+	    (require 'tls)
+	  (error (message "You don't have tls.el.  %s"
+			  "Try using `erc-ssl' instead.")
+		 nil))
+    (open-tls-stream name buffer host port)))
+
 ;;; Debugging the protocol
 
 (defvar erc-debug-irc-protocol nil



From MAILER-DAEMON Sun Oct 14 00:52:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSt-000817-S5
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSo-0007vv-Sh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005FR-88
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Et-PB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPX-00045m-Q5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPQ-0005IM-V0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPR-0006fv-1S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPR-0006fv-1S@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-nicklist: Use locate-library to
	find images dir
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, 14 Oct 2007 04:52:31 -0000

commit 8d16a493b1cc369e4299b7202a7b013fd72aac27
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon May 21 00:45:40 2007 +0000

    erc-nicklist: Use locate-library to find images dir
    
    2007-05-21  Michael Olson  <mwolson@gnu.org>
    
    	* 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.
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-21

diff --git a/ChangeLog b/ChangeLog
index f628f71..8c304d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@
 	(deb): New rule that chains together the stages in building a
 	Debian package.
 
+	* 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
diff --git a/erc-nicklist.el b/erc-nicklist.el
index f37b8ea..2787fe2 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -93,7 +93,9 @@ By \"chat medium\", we mean IRC, AOL, MSN, ICQ, etc."
   :type 'boolean)
 
 (defcustom erc-nicklist-icons-directory
-  (concat default-directory "images/")
+  (let ((dir (locate-library "erc-nicklist.el")))
+    (when dir
+      (concat (file-name-directory dir) "images/")))
   "*Directory of the PNG files for chat icons.
 Icons are displayed if `erc-nicklist-use-icons' is non-nil."
   :group 'erc-nicklist



From MAILER-DAEMON Sun Oct 14 00:52:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSu-00081O-3D
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSq-0007xk-5v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005FW-8d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005El-F4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPX-00045q-9y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPW-0005LJ-B3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPW-0006ow-Ds
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPW-0006ow-Ds@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-ident: Fix buggy interaction
	with Freenode
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, 14 Oct 2007 04:52:32 -0000

commit 80e200e8a7ca8d27a712251627277f7c481382a1
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Aug 11 21:27:27 2007 -0400

    erc-ident: Fix buggy interaction with Freenode
    
    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.

diff --git a/ChangeLog b/ChangeLog
index 79e5f54..ef5a24d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/erc-identd.el b/erc-identd.el
index 8fab26d..dcbe463 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -74,7 +74,8 @@ This can be either a string or a number."
 		     (format "%s, %s : USERID : %s : %s\n"
 			     port-on-server port-on-client
 			     system-type (user-login-name)))
-	(process-send-eof erc-identd-process)))))
+	(stop-process erc-identd-process)
+	(delete-process proc)))))
 
 ;;;###autoload
 (defun erc-identd-start (&optional port)



From MAILER-DAEMON Sun Oct 14 00:52:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSu-00081i-72
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSr-0007ye-EO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005FF-Lg
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Eq-HW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPX-00045I-Kx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPR-0005In-Rf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPR-0006hP-U1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPR-0006hP-U1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-button: Allow parentheses in URLs
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, 14 Oct 2007 04:52:33 -0000

commit 5f865e1c1f2d56c97a2f5003ed937d4c3c01d714
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon May 28 20:53:49 2007 +0000

    erc-button: Allow parentheses in URLs
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-145

diff --git a/ChangeLog b/ChangeLog
index 514a73b..4869e92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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-21  Michael Olson  <mwolson@gnu.org>
 
 	* Makefile (SOURCE): Remove erc-pkg.el.
diff --git a/erc-button.el b/erc-button.el
index 435c72b..3210dd3 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -99,7 +99,7 @@ above them."
   (concat "\\(www\\.\\|\\(s?https?\\|"
           "ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\)"
           "\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?"
-          "[-a-zA-Z0-9_=!?#$@~`%&*+\\/:;.,]+[-a-zA-Z0-9_=#$@~`%&*+\\/]")
+          "[-a-zA-Z0-9_=!?#$@~`%&*+\\/:;.,()]+[-a-zA-Z0-9_=#$@~`%&*+\\/()]")
   "Regular expression that matches URLs."
   :group 'erc-button
   :type 'regexp)



From MAILER-DAEMON Sun Oct 14 00:52:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSo-0007vf-PT
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSh-0007nh-VM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOr-0004ww-49
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOl-0004wq-Cp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
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@hcoop.net>) id 1IgvOl-0003uU-4l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:19 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOk-00053E-DB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOk-0005ZA-Fh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOk-0005ZA-Fh@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:18 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.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: Sun, 14 Oct 2007 04:52:24 -0000

commit 485392251c6576f9402d98126399b65f98e5513f
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jul 9 04:20:19 2006 +0000

    Merged from erc--rel--5.1.
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.1--patch-20
       erc-log: Do not immediately insinuate when the file is loaded.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-16

diff --git a/ChangeLog b/ChangeLog
index 9bfa4bc..2cc0745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-09  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (log): Move all add-hook calls here, rather than
+	executing them immediately, and also cause them to be un-hooked
+	when the module is removed.
+
 2006-07-08  Michael Olson  <mwolson@gnu.org>
 
 	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
diff --git a/erc-log.el b/erc-log.el
index 2454a2a..8328881 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -208,30 +208,27 @@ also be a predicate function. To only log when you are not set away, use:
 	  (not erc-away))))"
   ;; enable
   ((when erc-log-write-after-insert
-     (add-hook 'erc-insert-post-hook
-	       'erc-save-buffer-in-logs))
+     (add-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs))
    (when erc-log-write-after-send
-     (add-hook 'erc-send-post-hook
-	       'erc-save-buffer-in-logs)))
+     (add-hook 'erc-send-post-hook 'erc-save-buffer-in-logs))
+   (add-hook 'erc-kill-buffer-hook 'erc-save-buffer-in-logs)
+   (add-hook 'erc-kill-channel-hook 'erc-save-buffer-in-logs)
+   (add-hook 'erc-quit-hook 'erc-conditional-save-queries)
+   (add-hook 'erc-part-hook 'erc-conditional-save-buffer)
+   ;; append, so that 'erc-initialize-log-marker runs first
+   (add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append))
   ;; disable
-  ((remove-hook 'erc-insert-post-hook
-		'erc-save-buffer-in-logs)
-   (remove-hook 'erc-send-post-hook
-		'erc-save-buffer-in-logs)))
-
-(when erc-enable-logging
-  (add-hook 'erc-kill-buffer-hook
-	    'erc-save-buffer-in-logs)
-  (add-hook 'erc-kill-channel-hook
-	    'erc-save-buffer-in-logs)
-  (add-hook 'erc-quit-hook
-	    'erc-conditional-save-queries)
-  (add-hook 'erc-part-hook
-	    'erc-conditional-save-buffer))
+  ((remove-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-send-post-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-kill-buffer-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-kill-channel-hook 'erc-save-buffer-in-logs)
+   (remove-hook 'erc-quit-hook 'erc-conditional-save-queries)
+   (remove-hook 'erc-part-hook 'erc-conditional-save-buffer)
+   (remove-hook 'erc-connect-pre-hook 'erc-log-setup-logging)))
 
 (define-key erc-mode-map "\C-c\C-l" 'erc-save-buffer-in-logs)
 
-;;;functionality referenced from erc.el
+;;; functionality referenced from erc.el
 (defun erc-log-setup-logging ()
   "Setup the buffer-local logging variables in the current buffer.
 This function is destined to be run from `erc-connect-pre-hook'."
@@ -252,9 +249,6 @@ This function is destined to be run from `erc-connect-pre-hook'."
 		     (move-marker erc-last-saved-position
 				  (1- (point-max)))))))
 
-;;; Append, so that 'erc-initialize-log-marker keeps running first.
-(add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append)
-
 (defun erc-log-all-but-server-buffers (buffer)
   "Returns t if logging should be enabled in BUFFER.
 Returns nil iff `erc-server-buffer-p' returns t."



From MAILER-DAEMON Sun Oct 14 00:52:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSp-0007wU-As
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSj-0007oO-0q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSi-0007nm-3x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOr-00050Z-LG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
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@hcoop.net>) id 1IgvOr-0003wE-1g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOp-00054s-NM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOp-0005hm-Pq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:23 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOp-0005hm-Pq@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:23 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix multi-tty emacs 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: Sun, 14 Oct 2007 04:52:25 -0000

commit c3ad025129e82263689cede9782b71b675cb304e
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 6 05:08:36 2006 +0000

    Fix multi-tty emacs bug.
    
    * erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
      multi-tty Emacs.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-33

diff --git a/ChangeLog b/ChangeLog
index 0d54e14..abf1d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-06  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
+	multi-tty Emacs.
+
 2006-08-05  Michael Olson  <mwolson@gnu.org>
 
 	* erc-log.el (erc-log-standardize-name): New function that returns
diff --git a/erc.el b/erc.el
index 4d28ce5..2c177a5 100644
--- a/erc.el
+++ b/erc.el
@@ -5899,7 +5899,8 @@ All windows are opened in the current frame."
       (setq bufs (cdr bufs))
       (while bufs
 	(split-window)
-	(switch-to-buffer-other-window (car bufs))
+	(other-window 1)
+	(switch-to-buffer (car bufs))
 	(setq bufs (cdr bufs))
 	(balance-windows)))))
 



From MAILER-DAEMON Sun Oct 14 00:52:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSp-0007xD-P1
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSj-0007ot-HZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOr-0004ye-90
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOn-0004yU-RM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
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@hcoop.net>) id 1IgvOn-0003v5-C2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOm-00053u-HV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOm-0005ck-Jp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOm-0005ck-Jp@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:20 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Try to fix error when
	quitting 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: Sun, 14 Oct 2007 04:52:26 -0000

commit 76ffbcc90116d2eaec824467aaf42c75c846222a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Jul 15 00:48:35 2006 +0000

    erc-log: Try to fix error when quitting Emacs.
    
    * erc-log.el (log): Make sure that we enable logging on already-opened
      buffers as well, in case the user toggles this module after loading
      ERC.  Also be sure to remove logging ability from all ERC buffers when
      the module is disabled.
      (erc-log-setup-logging): Set buffer-file-name to nil rather than the
      empty string.  This should fix some errors that occur when quitting
      Emacs without first killing all ERC buffers.
      (erc-log-disable-logging): New function that removes the logging
      ability from the current buffer.
    
    * erc-spelling.el (spelling): Use dolist and buffer-live-p.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-23

diff --git a/ChangeLog b/ChangeLog
index 38b0520..7f04ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-07-14  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (log): Make sure that we enable logging on
+	already-opened buffers as well, in case the user toggles this
+	module after loading ERC.  Also be sure to remove logging ability
+	from all ERC buffers when the module is disabled.
+	(erc-log-setup-logging): Set buffer-file-name to nil rather than
+	the empty string.  This should fix some errors that occur when
+	quitting Emacs without first killing all ERC buffers.
+	(erc-log-disable-logging): New function that removes the logging
+	ability from the current buffer.
+
+	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
+
 2006-07-12  Michael Olson  <mwolson@gnu.org>
 
 	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
diff --git a/erc-log.el b/erc-log.el
index dc5ba7d..18b2e3b 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -218,7 +218,10 @@ also be a predicate function. To only log when you are not set away, use:
    (add-hook 'erc-quit-hook 'erc-conditional-save-queries)
    (add-hook 'erc-part-hook 'erc-conditional-save-buffer)
    ;; append, so that 'erc-initialize-log-marker runs first
-   (add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append))
+   (add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append)
+   (dolist (buffer (erc-buffer-list))
+     (when (buffer-live-p buffer)
+       (with-current-buffer buffer (erc-log-setup-logging)))))
   ;; disable
   ((remove-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs)
    (remove-hook 'erc-send-post-hook 'erc-save-buffer-in-logs)
@@ -226,7 +229,10 @@ also be a predicate function. To only log when you are not set away, use:
    (remove-hook 'erc-kill-channel-hook 'erc-save-buffer-in-logs)
    (remove-hook 'erc-quit-hook 'erc-conditional-save-queries)
    (remove-hook 'erc-part-hook 'erc-conditional-save-buffer)
-   (remove-hook 'erc-connect-pre-hook 'erc-log-setup-logging)))
+   (remove-hook 'erc-connect-pre-hook 'erc-log-setup-logging)
+   (dolist (buffer (erc-buffer-list))
+     (when (buffer-live-p buffer)
+       (with-current-buffer buffer (erc-log-disable-logging))))))
 
 (define-key erc-mode-map "\C-c\C-l" 'erc-save-buffer-in-logs)
 
@@ -237,7 +243,7 @@ This function is destined to be run from `erc-connect-pre-hook'."
   (when (erc-logging-enabled)
     (auto-save-mode -1)
     (setq buffer-offer-save t
-	  buffer-file-name "")
+	  buffer-file-name nil)
     (cond ((boundp 'write-file-functions)
 	   (set (make-local-variable 'write-file-functions)
 		'(erc-save-buffer-in-logs)))
@@ -251,6 +257,12 @@ This function is destined to be run from `erc-connect-pre-hook'."
 		     (move-marker erc-last-saved-position
 				  (1- (point-max)))))))
 
+(defun erc-log-disable-logging ()
+  "Disable logging in the current buffer."
+  (when (erc-logging-enabled)
+    (setq buffer-offer-save nil
+	  erc-enable-logging nil)))
+
 (defun erc-log-all-but-server-buffers (buffer)
   "Returns t if logging should be enabled in BUFFER.
 Returns nil iff `erc-server-buffer-p' returns t."
diff --git a/erc-spelling.el b/erc-spelling.el
index 528668f..ed49758 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -40,15 +40,13 @@
   ;; Use erc-connect-pre-hook instead of erc-mode-hook as pre-hook is
   ;; called AFTER the server buffer is initialized.
   ((add-hook 'erc-connect-pre-hook 'erc-spelling-init)
-   (mapc (lambda (buffer)
-           (when buffer
-             (with-current-buffer buffer (erc-spelling-init))))
-         (erc-buffer-list)))
+   (dolist (buffer (erc-buffer-list))
+     (when (buffer-live-p buffer)
+       (with-current-buffer buffer (erc-spelling-init)))))
   ((remove-hook 'erc-connect-pre-hook 'erc-spelling-init)
-   (mapc (lambda (buffer)
-           (when buffer
-             (with-current-buffer buffer (flyspell-mode 0))))
-         (erc-buffer-list))))
+   (dolist (buffer (erc-buffer-list))
+     (when (buffer-live-p buffer)
+       (with-current-buffer buffer (flyspell-mode 0))))))
 
 (defcustom erc-spelling-dictionaries nil
   "An alist mapping buffer names to dictionaries.



From MAILER-DAEMON Sun Oct 14 00:52:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvSz-00086I-21
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSw-000840-F6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSv-00083W-Tp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPC-00054J-8I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
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@hcoop.net>) id 1IgvPC-000425-1b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPB-0005CO-BJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPB-0006Fu-D8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPB-0006Fu-D8@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:45 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Removed OFTC's SSL server from
	erc-server-alist.
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, 14 Oct 2007 04:52:38 -0000

commit 93c5a1fad1293a6b2945842edc6d6a59f0b44213
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Jan 25 13:18:16 2007 +0000

    Removed OFTC's SSL server from erc-server-alist.
    
    * erc-networks.el (erc-server-alist): Removed SSL server for now
    since `erc-server-select' doesn't know to use `erc-ssl'.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-101

diff --git a/ChangeLog b/ChangeLog
index 37bb704..46d42d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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.
 
diff --git a/erc-networks.el b/erc-networks.el
index 8b88614..267e40c 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -318,7 +318,6 @@
   ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 ))
   ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667)
   ("OFTC: Random server" OFTC "irc.oftc.net" ((6667 6670) 7000))
-  ("OFTC: SSL enabled server" OFTC "ircs.oftc.net" (6697 9999))
   ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669)))
   ("Othernet: Random server" Othernet "irc.othernet.org" 6667)
   ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667)



From MAILER-DAEMON Sun Oct 14 00:52:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvT1-00087l-Ac
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSz-00086G-0o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSy-00085d-C8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPd-0005IQ-MH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
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@hcoop.net>) id 1IgvPc-00048w-UD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPb-0005NZ-Oc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPb-0006y3-R8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPb-0006y3-R8@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:11 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merge from emacs22 (manually)
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, 14 Oct 2007 04:52:41 -0000

commit 9e2c66bef12240661f225a22deca116ff5cab536
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 2 22:25:21 2007 -0400

    Merge from emacs22 (manually)

diff --git a/ChangeLog b/ChangeLog
index f62931f..0a1e009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,7 +26,7 @@
 	(erc-track-get-active-buffer): Make 'oldest a rough opposite of
 	'importance.
 
-2007-08-14  Jeremy Maitin-Shepard <jbms@cmu.edu>
+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
@@ -176,6 +176,10 @@
 	* 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
@@ -190,6 +194,11 @@
 	* 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,
diff --git a/erc-goodies.el b/erc-goodies.el
index c92c33d..9131ce6 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -77,7 +77,7 @@ You can control which line is recentered to by customizing the
 variable `erc-input-line-position'.
 
 DISPLAY-START is ignored."
-  (if (and window (window-live-p window))
+  (if (window-live-p window)
       ;; Temporarily bind resize-mini-windows to nil so that users who have it
       ;; set to a non-nil value will not suffer from premature minibuffer
       ;; shrinkage due to the below recenter call.  I have no idea why this
diff --git a/erc.el b/erc.el
index 325e2d9..f14ea52 100644
--- a/erc.el
+++ b/erc.el
@@ -843,7 +843,7 @@ See `erc-server-flood-margin' for other flood-related parameters.")
 The first existent and readable one will get executed.
 
 If the filename ends with `.el' it is presumed to be an Emacs Lisp
-script and it gets (load)ed.  Otherwise is is treated as a bunch of
+script and it gets (load)ed.  Otherwise it is treated as a bunch of
 regular IRC commands."
   :group 'erc-scripts
   :type '(repeat file))
@@ -5861,7 +5861,7 @@ Otherwise, use the `erc-header-line' face."
 		 (function :tag "Call a function")))
 
 (defcustom erc-show-channel-key-p t
-  "Show the the channel key in the header line."
+  "Show the channel key in the header line."
   :group 'erc-paranoia
   :type 'boolean)
 



From MAILER-DAEMON Sun Oct 14 00:52:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvT7-0008Bt-Nc
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOu-0004vg-VH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004mX-Ao
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOZ-0004ks-Rr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
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@hcoop.net>) id 1IgvOZ-0003qb-MA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOZ-0004z6-0d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOZ-0005F9-36
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOZ-0005F9-36@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:48 -0000

commit 29b7e2f1ea2662d6f0e6ec919e84d0ebd86a98c2
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Feb 26 07:17:59 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-134

diff --git a/erc-capab.el b/erc-capab.el
index 402872a..191643c 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -74,7 +74,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-capab-version "$Revision: 1.8 $"
+(defconst erc-capab-version "$Revision: 1.9 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:



From MAILER-DAEMON Sun Oct 14 00:52:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvT8-0008D0-UQ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvT6-0008BH-SA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOu-0004z3-Il
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOo-0004yy-3s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
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@hcoop.net>) id 1IgvOn-0003vK-TB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOn-000546-6G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOn-0005dj-8N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOn-0005dj-8N@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:21 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-log: Don't offer to save buffer;
	this happens automatically.
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, 14 Oct 2007 04:52:49 -0000

commit 6f7da42f0c1288338275bd56a1a77dd54f7a99dd
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Jul 30 02:43:09 2006 +0000

    erc-log: Don't offer to save buffer; this happens automatically.
    
    * erc-log.el (erc-log-setup-logging): Don't offer to save the buffer.  It
      will be saved automatically killed.  Thanks to Johan Bockgård and
      Tassilo Horn for pointing this out.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-25

diff --git a/erc-log.el b/erc-log.el
index 18b2e3b..78fab79 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -242,8 +242,7 @@ also be a predicate function. To only log when you are not set away, use:
 This function is destined to be run from `erc-connect-pre-hook'."
   (when (erc-logging-enabled)
     (auto-save-mode -1)
-    (setq buffer-offer-save t
-	  buffer-file-name nil)
+    (setq buffer-file-name nil)
     (cond ((boundp 'write-file-functions)
 	   (set (make-local-variable 'write-file-functions)
 		'(erc-save-buffer-in-logs)))



From MAILER-DAEMON Sun Oct 14 00:52:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvT9-0008DB-31
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOu-00051U-Uz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOf-0004po-JU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOd-0004pG-Ov
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
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@hcoop.net>) id 1IgvOd-0003rX-5M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOc-00050N-BP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOc-0005L9-DY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOc-0005L9-DY@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:10 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add ability to customize face used
	for header-line 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: Sun, 14 Oct 2007 04:52:49 -0000

commit 0598241feeba5d1c8a55597ac1ce7715dce41a6a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Mar 26 18:17:50 2006 +0000

    Add ability to customize face used for header-line text.
    
    * erc.el (erc-header-line): New face that will be used to colorize the
      text of the header-line, provided that `erc-header-line-face-method' is
      non-nil.
      (erc-prompt-face): Fix formatting.
      (erc-header-line-face-method): New option that determines the method
      used for colorizing header-line text.  This may be a function, nil, or
      non-nil.
      (erc-update-mode-line-buffer): Use the aforementioned option and face
      to colorize the header-line text, if that is what the user wants.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-146

diff --git a/ChangeLog b/ChangeLog
index 6b176e6..ae4a3ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-03-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-header-line): New face that will be used to colorize
+	the text of the header-line, provided that
+	`erc-header-line-face-method' is non-nil.
+	(erc-prompt-face): Fix formatting.
+	(erc-header-line-face-method): New option that determines the
+	method used for colorizing header-line text.  This may be a
+	function, nil, or non-nil.
+	(erc-update-mode-line-buffer): Use the aforementioned option and
+	face to colorize the header-line text, if that is what the user
+	wants.
+
 2006-03-25  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
diff --git a/erc.el b/erc.el
index c67e8d8..a400287 100644
--- a/erc.el
+++ b/erc.el
@@ -1116,12 +1116,19 @@ which the local user typed."
   "ERC face used for messages you receive in the main erc buffer."
   :group 'erc-faces)
 
+(defface erc-header-line
+  '((t (:foreground "grey20" :background "grey90")))
+  "ERC face used for the header line.
+
+This will only be used if `erc-header-line-face-method' is non-nil."
+  :group 'erc-faces)
+
 (defface erc-input-face '((t (:foreground "brown")))
   "ERC face used for your input."
   :group 'erc-faces)
 
 (defface erc-prompt-face
-  '((t (:bold t :foreground "Black" :background"lightBlue2")))
+  '((t (:bold t :foreground "Black" :background "lightBlue2")))
   "ERC face for the prompt."
   :group 'erc-faces)
 
@@ -5629,6 +5636,17 @@ when you move point into the header line."
   :group 'erc-mode-line-and-header
   :type 'boolean)
 
+(defcustom erc-header-line-face-method nil
+  "Determine what method to use when colorizing the header line text.
+
+If nil, don't colorize the header text.
+If given a function, call it and use the resulting face name.
+Otherwise, use the `erc-header-line' face."
+  :group 'erc-mode-line-and-header
+  :type '(choice (const :tag "Don't colorize" nil)
+		 (const :tag "Use the erc-header-line face" t)
+		 (function :tag "Call a function")))
+
 (defcustom erc-show-channel-key-p t
   "Show the the channel key in the header line."
   :group 'erc-paranoia
@@ -5735,7 +5753,13 @@ if `erc-away' is non-nil."
 				((erc-server-process-alive)
 				 "")
 				(t
-				 ": CLOSED"))))
+				 ": CLOSED")))
+	  (face (cond ((eq erc-header-line-face-method nil)
+		       nil)
+		      ((functionp erc-header-line-face-method)
+		       (funcall erc-header-line-face-method))
+		      (t
+		       erc-header-line))))
       (cond ((featurep 'xemacs)
 	     (setq modeline-buffer-identification
 		   (list (format-spec erc-mode-line-format spec)))
@@ -5759,7 +5783,10 @@ if `erc-away' is non-nil."
 			 (erc-replace-regexp-in-string
 			  "%"
 			  "%%"
-			  (erc-propertize header 'help-echo help-echo)))))
+			  (if face
+			      (erc-propertize header 'help-echo help-echo
+					      'face face)
+			    (erc-propertize header 'help-echo help-echo))))))
 		(t (setq header-line-format header))))))
     (if (featurep 'xemacs)
 	(redraw-modeline)



From MAILER-DAEMON Sun Oct 14 00:52:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvT9-0008DT-9U
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvT7-0008BY-6h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOu-0004yi-A5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOn-0004yZ-Rk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
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@hcoop.net>) id 1IgvOn-0003vC-JG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOm-000540-SH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOm-0005dE-Tg
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOm-0005dE-Tg@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:20 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make find-function and find-variable
	work for modules.
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, 14 Oct 2007 04:52:49 -0000

commit 28b8c0e1c7e73b4cc760da6ff628339e194cbe0b
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Jul 28 02:57:25 2006 +0000

    Make find-function and find-variable work for modules.
    
    * erc.el (define-erc-module): Make find-function and find-variable find
      the names constructed by `define-erc-module' in Emacs 22.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-24

diff --git a/ChangeLog b/ChangeLog
index 7f04ee7..55d88b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
+
+	* erc.el (define-erc-module): Make find-function and find-variable
+	find the names constructed by `define-erc-module' in Emacs 22.
+
 2006-07-14  Michael Olson  <mwolson@gnu.org>
 
 	* erc-log.el (log): Make sure that we enable logging on
diff --git a/erc.el b/erc.el
index 1202a1c..1d2cc5c 100644
--- a/erc.el
+++ b/erc.el
@@ -1243,7 +1243,11 @@ With arg, turn ERC %S mode on if and only if arg is positive.
 		(format "erc-%s-mode"
 			(downcase (symbol-name alias)))))
 	     (quote
-	      ,mode))))))
+	      ,mode)))
+       ;; For find-function and find-variable.
+       (put ',mode    'definition-name ',name)
+       (put ',enable  'definition-name ',name)
+       (put ',disable 'definition-name ',name))))
 
 (put 'define-erc-module 'doc-string-elt 3)
 



From MAILER-DAEMON Sun Oct 14 00:52:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvOu-00051M-KN
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOg-0004sE-QW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOW-0004iD-78
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004hp-RQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003oT-KL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOT-0004wr-9j
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOT-00054c-Bs
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:01 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOT-00054c-Bs@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:01 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make timestamps work better when
	erc-timestamp-right-column is 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: Sun, 14 Oct 2007 04:48:28 -0000

commit c931645cd0e2ea512d103d69e73113fcea4c3f05
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Feb 11 23:50:32 2006 +0000

    Make timestamps work better when erc-timestamp-right-column is nil.
    
    * erc-stamp.el (erc-timestamp-use-align-to): Renamed from
      `erc-timestamp-right-align-by-pixel'.  Set the default based on whether
      we are in Emacs 22, and using X.  Improve documentation.
      (erc-insert-aligned): Remove calculation of offset, since :align-to pos
      works after all.  Unlike the previous solution, this one works when
      erc-stamp.el is compiled.
      (erc-insert-timestamp-right): Don't add length of string, and then
      later remove its displayed width.  This puts timestamps after
      erc-fill-column when erc-timestamp-right-column is nil, rather than
      before it.  It also fixes a subtle bug.  Remove use of
      `current-window', since there is no variable by that name in Emacs21,
      Emacs22, or XEmacs21 beta.  Check to see whether `erc-fill-column' is
      non-nil before using it.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-113

diff --git a/ChangeLog b/ChangeLog
index d35067a..6022f52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,20 @@
 	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 	Minor whitespace fix in code.
 
+	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
+	`erc-timestamp-right-align-by-pixel'.  Set the default based on
+	whether we are in Emacs 22, and using X.  Improve documentation.
+	(erc-insert-aligned): Remove calculation of offset, since
+	:align-to pos works after all.  Unlike the previous solution, this
+	one works when erc-stamp.el is compiled.
+	(erc-insert-timestamp-right): Don't add length of string, and then
+	later remove its displayed width.  This puts timestamps after
+	erc-fill-column when erc-timestamp-right-column is nil, rather
+	than before it.  It also fixes a subtle bug.  Remove use of
+	`current-window', since there is no variable by that name in
+	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
+	`erc-fill-column' is non-nil before using it.
+
 2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-list.el: Define `list' module which sets the alias
diff --git a/erc-stamp.el b/erc-stamp.el
index ea2cb78..cf5a37e 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -183,11 +183,17 @@ the correct column."
 	  (integer :tag "Column number")
 	  (const :tag "Unspecified" nil)))
 
-(defcustom erc-timestamp-right-align-by-pixel nil
-  "*If non-nil, insert the right timestamp based on a pixel value.
-This is needed when variable-width text precedes a timestamp.
+(defcustom erc-timestamp-use-align-to (and (not (featurep 'xemacs))
+					   (>= emacs-major-version 22)
+					   (eq window-system 'x))
+  "*If non-nil, use the :align-to display property to align the stamp.
+This gives better results when variable-width characters (like
+Asian language characters and math symbols) precede a timestamp.
 Unfortunately, it only works in Emacs 22 and when using the X
-Window System."
+Window System.
+
+A side effect of enabling this is that there will only be one
+space before a right timestamp in any saved logs."
   :group 'erc-stamp
   :type 'boolean)
 
@@ -203,18 +209,15 @@ Window System."
     (insert s)))
 
 (defun erc-insert-aligned (string pos)
-  "Insert STRING based on a fraction of the width of the buffer.
-Fraction is roughly (/ POS (window-width)).
+  "Insert STRING at the POSth column.
 
-If `erc-timestamp-right-align-by-pixel' is nil, insert STRING at the
-POSth column, without using pixel coordinates."
-  (if (not erc-timestamp-right-align-by-pixel)
+If `erc-timestamp-use-align-to' is t, use the :align-to display
+property to get to the POSth column."
+  (if (not erc-timestamp-use-align-to)
       (indent-to pos)
     (insert " ")
-    (let ((offset (floor (* (/ (1- pos) (window-width) 1.0)
-			    (nth 2 (window-inside-pixel-edges))))))
-      (put-text-property (1- (point)) (point) 'display
-			 `(space :align-to (,offset)))))
+    (put-text-property (1- (point)) (point) 'display
+		       (list 'space ':align-to pos)))
   (insert string))
 
 (defun erc-insert-timestamp-right (string)
@@ -241,30 +244,26 @@ be printed just before the window-width."
     (forward-char -1);; before the last newline
     (let* ((current-window (get-buffer-window (current-buffer)))
 	   (pos (cond
-		 (erc-timestamp-right-column
-		  (+ erc-timestamp-right-column (length string)))
+		 (erc-timestamp-right-column erc-timestamp-right-column)
 		 ((and (boundp 'erc-fill-mode)
 		       erc-fill-mode
-		       (boundp 'erc-fill-column))
+		       (boundp 'erc-fill-column)
+		       erc-fill-column)
 		  (1+ erc-fill-column))
-		 (current-window
-		  (- (window-width current-window)
-		     1))
 		 (fill-column
 		  (1+ fill-column))
 		 (t
 		  (- (window-width)
+		     (string-width string)
 		     1))))
 	   (from (point))
 	   (col (current-column))
 	   indent)
-      ;; deal with variable-width characters
-      (setq pos (- pos (string-width string))
-	    ;; The following is a kludge that works with most
-	    ;; international input.  It is now only used to calculate
-	    ;; whether to move to the next line before inserting a
-	    ;; stamp.
-	    col (+ col (ceiling (/ (- col (- (point) (point-at-bol))) 1.6))))
+      ;; The following is a kludge used to calculate whether to move
+      ;; to the next line before inserting a stamp.  It allows for
+      ;; some margin of error if what is displayed on the line differs
+      ;; from the number of characters on the line.
+      (setq col (+ col (ceiling (/ (- col (- (point) (point-at-bol))) 1.6))))
       (if (< col pos)
 	  (erc-insert-aligned string pos)
 	(newline)



From MAILER-DAEMON Sun Oct 14 00:52:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTB-0008Ep-1d
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvT8-0008CN-8a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvT7-0008Bm-Ha
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOu-00051E-Aa
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
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@hcoop.net>) id 1IgvOu-0003xJ-0u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOt-00055w-5Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOt-0005nL-8G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOt-0005nL-8G@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:27 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Cleaned up code: moved all tests to
	`erc-server-reconnect-p'.
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, 14 Oct 2007 04:52:50 -0000

commit bd6fd7cd9d5bff879af4fa2a865e27804805a299
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Sun Aug 20 00:04:13 2006 +0000

    Cleaned up code: moved all tests to `erc-server-reconnect-p'.
    
    * erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
      `erc-server-reconnect-p' check all condition cases.
      (erc-server-reconnect-p): Moved rest of checks from
      `erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-44

diff --git a/ChangeLog b/ChangeLog
index 89b8f12..820da01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-20  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
+	`erc-server-reconnect-p' check all condition cases.
+	(erc-server-reconnect-p): Moved rest of checks from
+	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
+
 2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
diff --git a/erc-backend.el b/erc-backend.el
index 3ce2600..30ab523 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -523,10 +523,9 @@ We will store server variables in the current buffer."
             (erc-parse-server-response process line)))))))
 
 (defun erc-process-sentinel-1 (event)
-  "This will be called when erc-process-sentinel has decided that we
-are going to quit.  Determine whether user has quit or whether erc has
-been terminated.  Conditionally try to reconnect and take appropriate
-action."
+  "Called when `erc-process-sentinel' has decided that we're disconnecting.
+Determine whether user has quit or whether erc has been terminated.
+Conditionally try to reconnect and take appropriate action."
   (if erc-server-quitting
       ;; normal quit
       (progn
@@ -536,18 +535,14 @@ action."
           (kill-buffer (current-buffer))))
     ;; unexpected disconnect
     (erc-display-message nil 'error (current-buffer)
-                         (if (erc-server-reconnect-p)
+                         (if (erc-server-reconnect-p event)
                              'disconnected
                            'disconnected-noreconnect))
     (erc-update-mode-line)
     (erc-set-active-buffer (current-buffer))
     (setq erc-server-last-sent-time 0)
     (setq erc-server-lines-sent 0)
-    (if (and (erc-server-reconnect-p)
-             (or erc-server-timed-out
-                 (not (string-match "^deleted" event)))
-             ;; open-network-stream-nowait error for connection refused
-             (not (string-match "^failed with code 111" event)))
+    (if (erc-server-reconnect-p event)
         ;; Yuck, this should perhaps funcall
         ;; erc-server-reconnect-function with no args
         (erc erc-session-server erc-session-port erc-server-current-nick
@@ -556,9 +551,15 @@ action."
       (erc-display-message nil 'error (current-buffer)
                            'terminated ?e event))))
 
-(defun erc-server-reconnect-p ()
-  "Return non-nil if ERC should attempt to reconnect automatically."
-  (and erc-server-auto-reconnect (not erc-server-banned)))
+(defun erc-server-reconnect-p (event)
+  "Return non-nil if ERC should attempt to reconnect automatically.
+EVENT is the message received from the closed connection process."
+  (and erc-server-auto-reconnect
+       (not erc-server-banned)
+       (or erc-server-timed-out
+           (not (string-match "^deleted" event)))
+       ;; open-network-stream-nowait error for connection refused
+       (not (string-match "^failed with code 111" event))))
 
 (defun erc-process-sentinel (cproc event)
   "Sentinel function for ERC process."



From MAILER-DAEMON Sun Oct 14 00:52:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTB-0008F1-6f
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOu-00051R-SW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004lr-Af
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004kV-T3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
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@hcoop.net>) id 1IgvOY-0003q5-F1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOX-0004yc-MV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOX-0005Cc-P1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOX-0005Cc-P1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:05 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:52:51 -0000

commit c0bf41774cf437982bae9972f5298c4e9084ee54
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Feb 20 05:06:35 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-129

diff --git a/erc.el b/erc.el
index 5f37a74..de9f0cf 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.808 $"
+(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.809 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:52:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTB-0008FS-Fp
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOu-00051S-UA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOd-0004nA-Qd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004kN-Sq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
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@hcoop.net>) id 1IgvOY-0003pr-5N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOX-0004yW-D2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOX-0005C7-EW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOX-0005C7-EW@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:05 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from mwolson@gnu.org--2006
	(patch 25-27)
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, 14 Oct 2007 04:52:51 -0000

commit 6556a9b2a6aed3e4d383675e8b059861c3aae3cb
Merge: 4f03cfd... 273f1ae...
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Feb 20 05:05:23 2006 +0000

    Merged from mwolson@gnu.org--2006 (patch 25-27)
    
    Patches applied:
    
     * mwolson@gnu.org--2006/erc--cvs--5.1--patch-25
       Release ERC 5.1.2.
    
     * mwolson@gnu.org--2006/erc--cvs--5.1--patch-27
       Update Makefile version variables for release.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-128

diff --cc ChangeLog
index 3405fa8,3d0ca8f..cc80019
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,9 +1,21 @@@
  2006-02-19  Michael Olson  <mwolson@gnu.org>
  
 +	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +	parameters are strings before using them.  Thanks to Alejandro
 +	Benitez for the report.
 +
+ 	* erc.el (erc-version-string): Release ERC 5.1.2.
+ 
 +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +	<C-tab>.
 +	(erc-button-previous): New function.
 +
  2006-02-15  Michael Olson  <mwolson@gnu.org>
  
 +	* NEWS: Add category for ERC 5.2.
 +
  	* erc.el (erc): Move to the end of the buffer when a continued
  	session is detected.  Thanks to e1f and indio for the report and
  	testing a potential fix.
diff --cc NEWS
index 71950da,4527c3c..ef98227
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,10 +1,14 @@@
  ERC NEWS                                                       -*- outline -*-
  
 -* Changes in ERC 5.1.2
 +* Changes in ERC 5.2 (unreleased)
 +
 +** New modules
  
 -** Go back to using ssl.el so that SSL connections work as expected.
 -Connecting with `open-tls-stream' only seems to work (if at all?) when
 -using the tls.el located in lisp/net/ in Emacs22.
 +*** Capab identify (erc-capab.el)
 +
 +**** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 +
- * Changes in ERC 5.1.2 (unreleased)
++* Changes in ERC 5.1.2
  
  ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
  
diff --cc erc.el
index 39ae6cc,eb12ad5..5f37a74
--- a/erc.el
+++ b/erc.el
@@@ -66,7 -66,7 +66,7 @@@
  
  ;;; Code:
  
- (defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.808 $"
 -(defconst erc-version-string "Version 5.1.2 $Revision: 1.796.2.4 $"
++(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.808 $"
    "ERC version.  This is used by function `erc-version'.")
  
  (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:52:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTB-0008Fs-Mb
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOu-00051T-Ua
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004mv-1f
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004k9-6l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
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@hcoop.net>) id 1IgvOX-0003pl-L7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOW-0004yK-Oc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOW-0005B6-RS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOW-0005B6-RS@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:04 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make sure parameters are strings
	before using them.
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, 14 Oct 2007 04:52:51 -0000

commit 2988f9a58f263e0035001b1a2281c416516cc3fa
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Feb 20 03:59:20 2006 +0000

    Make sure parameters are strings before using them.
    
    * erc-capab.el (erc-capab-send-identify-messages): Make sure some
      parameters are strings before using them.  Thanks to Alejandro Benitez
      for the report.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-126

diff --git a/ChangeLog b/ChangeLog
index 92cd064..3405fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
+	parameters are strings before using them.  Thanks to Alejandro
+	Benitez for the report.
+
 2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
diff --git a/erc-capab.el b/erc-capab.el
index 6c753d5..7aea479 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -132,9 +132,11 @@ These arguments are sent to this function when called as a hook in
 
 (defun erc-capab-send-identify-messages ()
   "Send CAPAB IDENTIFY messages if the server supports it."
-  (when (and (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
+  (when (and (stringp erc-server-version)
+             (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
              ;; could possibly check for IRCD=dancer in `erc-server-parameters'
              ;; instead of looking for specific version names
+             (stringp erc-server-parameters)
              (assoc "CAPAB" erc-server-parameters))
     (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
     (erc-server-send "CAPAB IDENTIFY-MSG")



From MAILER-DAEMON Sun Oct 14 00:52:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvP1-00053c-Hp
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOk-0004vy-QO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOY-0004jL-1q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOX-0004j4-6s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
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@hcoop.net>) id 1IgvOW-0003oF-5f
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOV-0004xm-FE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOV-00058c-HX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOV-00058c-HX@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:03 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Restore the previous behavior for
	right-timestamps and erc-fill-column.
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, 14 Oct 2007 04:48:30 -0000

commit 9d157e3be6de1039c886db81b46b62f666f6ccd6
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 16 00:37:25 2006 +0000

    Restore the previous behavior for right-timestamps and erc-fill-column.
    
    * erc-stamp.el (erc-insert-timestamp-right): For now, put timestamps
      before rather than after erc-fill-column when
      erc-timestamp-right-column is nil.  This way we won't surprise anyone
      unpleasantly, or so it is hoped.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-121

diff --git a/ChangeLog b/ChangeLog
index 71b877d..f3d0d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,11 @@
 
 	* NEWS: Bring up-to-date.
 
+	* erc-stamp.el (erc-insert-timestamp-right): For now, put
+	timestamps before rather than after erc-fill-column when
+	erc-timestamp-right-column is nil.  This way we won't surprise
+	anyone unpleasantly, or so it is hoped.
+
 2006-02-13  Michael Olson  <mwolson@gnu.org>
 
 	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
diff --git a/erc-stamp.el b/erc-stamp.el
index 0b27fb2..c73f715 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -243,19 +243,18 @@ be printed just before the window-width."
     (goto-char (point-max))
     (forward-char -1);; before the last newline
     (let* ((current-window (get-buffer-window (current-buffer)))
+	   (str-width (string-width string))
 	   (pos (cond
 		 (erc-timestamp-right-column erc-timestamp-right-column)
 		 ((and (boundp 'erc-fill-mode)
 		       erc-fill-mode
 		       (boundp 'erc-fill-column)
 		       erc-fill-column)
-		  (1+ erc-fill-column))
+		  (1+ (- erc-fill-column str-width)))
 		 (fill-column
-		  (1+ fill-column))
+		  (1+ (- fill-column str-width)))
 		 (t
-		  (- (window-width)
-		     (string-width string)
-		     1))))
+		  (- (window-width) str-width 1))))
 	   (from (point))
 	   (col (current-column))
 	   indent)



From MAILER-DAEMON Sun Oct 14 00:52:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTD-0008HW-SC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTA-0008Em-Ty
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOu-0004w4-A6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOk-0004vL-FJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
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@hcoop.net>) id 1IgvOk-0003uI-7r
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOj-00052w-IU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOj-0005Xf-L3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOj-0005Xf-L3@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merge in yet another lost fragment
	from the 5.1 release branch.
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, 14 Oct 2007 04:52:53 -0000

commit b8b497b539df65514af5935652b30f26c61d594b
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Jun 27 07:12:37 2006 +0000

    Merge in yet another lost fragment from the 5.1 release branch.
    
    * erc.el (erc-open-ssl-stream): Merge in yet another lost fragment.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-13

diff --git a/erc.el b/erc.el
index 171123d..fdc524a 100644
--- a/erc.el
+++ b/erc.el
@@ -2096,14 +2096,13 @@ Arguments are as to erc-select."
   "Open an SSL stream to an IRC server.
 The process will be given the name NAME, its target buffer will be
 BUFFER.	 HOST and PORT specify the connection target."
-  (when (require 'tls)
-    (let ((proc (open-tls-stream name buffer host port)))
+  (when (require 'ssl)
+    (let ((proc (open-ssl-stream name buffer host port)))
       ;; Ugly hack, but it works for now. Problem is it is
       ;; very hard to detect when ssl is established, because s_client
       ;; doesn't give any CONNECTIONESTABLISHED kind of message, and
       ;; most IRC servers send nothing and wait for you to identify.
-      ;; Disabled when switching to tls.el -- jas
-      ;(sit-for 5)
+      (sit-for 5)
       proc)))
 
 ;;; Debugging the protocol



From MAILER-DAEMON Sun Oct 14 00:53:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvP1-00053f-Ro
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOk-0004vl-Lp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOY-0004jD-2I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004hz-VH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
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@hcoop.net>) id 1IgvOV-0003oF-F7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOU-0004xL-Jr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOU-000577-Mx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOU-000577-Mx@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:02 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merge from 5.1 release branch.
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, 14 Oct 2007 04:48:31 -0000

commit 1c228e5c1a1a748c47d0cf5d9cb565fea809f047
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Feb 14 06:42:11 2006 +0000

    Merge from 5.1 release branch.
    
    Patches applied:
    
     * mwolson@gnu.org--2006/erc--cvs--5.1--patch-13
       Bring NEWS up-to-date.
    
     * mwolson@gnu.org--2006/erc--cvs--5.1--patch-16
       Prepare a new Debian package.
    
     * mwolson@gnu.org--2006/erc--cvs--5.1--patch-17
       Never check in the erc-auto.el file.
    
     * mwolson@gnu.org--2006/erc--cvs--5.1--patch-19
       Tweak Makefile.
    
     * mwolson@gnu.org--2006/erc--cvs--5.1--patch-21
       Add note about side effect with saved logs.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-118

diff --git a/ChangeLog b/ChangeLog
index 427e81e..9ea9e6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-14  Michael Olson  <mwolson@gnu.org>
+
+	* debian/changelog: Prepare a new Debian package.
+
+	* Makefile (debprepare): New rule that creates an ERC snapshot
+	directory for use in both new Debian releases and revisions for
+	Debian packages.
+	(debrelease, debrevision-mwolson): Use debprepare.
+
+	* NEWS: Bring up-to-date.
+
 2006-02-13  Michael Olson  <mwolson@gnu.org>
 
 	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
diff --git a/Makefile b/Makefile
index fef2a64..d8e89c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION=5.1.1
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.1-1
+LASTUPLOAD = 5.1.1-2
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
@@ -80,7 +80,16 @@ distclean:
 	-rm -f $(MANUAL).info $(MANUAL).html $(TARGET)
 	-rm -Rf ../$(SNAPDIR)
 
-debbuild: 
+debprepare: $(ALLSOURCE) $(SPECIAL) distclean
+	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
+	cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
+	cp -r images ../$(SNAPDIR)
+	test -d ../$(SNAPDIR)/images/.arch-ids && rm -R \
+	  ../$(SNAPDIR)/images/.arch-ids || :
+	test -d ../$(SNAPDIR)/images/CVS && rm -R \
+	  ../$(SNAPDIR)/images/.arch-ids || :
+
+debbuild:
 	(cd ../$(SNAPDIR) && \
 	  dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
 	    -us -uc -rfakeroot && \
@@ -89,14 +98,7 @@ debbuild:
 	  echo "Done running lintian." && \
 	  debsign)
 
-debrelease: $(ALLSOURCE) $(SPECIAL) distclean
-	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
-	cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
-	cp -r images ../$(SNAPDIR)
-	test -d ../$(SNAPDIR)/images/.arch-ids && rm -R \
-	  ../$(SNAPDIR)/images/.arch-ids || :
-	test -d ../$(SNAPDIR)/images/CVS && rm -R \
-	  ../$(SNAPDIR)/images/.arch-ids || :
+debrelease: debprepare
 	(cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
 	cp -R debian ../$(SNAPDIR)
 	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
@@ -113,7 +115,17 @@ debrevision-mwolson:
 	-rm -f ../../dist/erc_*
 	-rm -f ../erc_$(VERSION)-*
 	-rm -fr ../erc-$(VERSION)
-	$(MAKE) debrelease
+	$(MAKE) debprepare
+	cp -R debian ../$(SNAPDIR)
+	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
+	  ../$(SNAPDIR)/debian/CVS \
+	  ../$(SNAPDIR)/debian/maint/CVS \
+	  ../$(SNAPDIR)/debian/scripts/CVS || :
+	test -d ../$(SNAPDIR)/debian/.arch-ids && rm -R \
+	  ../$(SNAPDIR)/debian/.arch-ids \
+	  ../$(SNAPDIR)/debian/maint/.arch-ids \
+	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
+	$(MAKE) debbuild
 	cp ../erc_$(VERSION)* ../../dist
 
 debrelease-mwolson:
diff --git a/NEWS b/NEWS
index bf60399..d3a318e 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,38 @@ ERC NEWS                                                       -*- outline -*-
 
 **** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
+** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
+
+** Changes and additions to modules
+
+*** Spell-checking (erc-spelling.el)
+
+**** Don't spell-check nicks or words that are prefixed with '/'.
+
+**** Remove flyspell properties from words we shouldn't spell-check.
+
+**** Fix an issue that caused the ispell process to reload every time
+we switch to an ERC buffer.
+
+*** Timestamps (erc-stamp.el)
+
+**** Fix an inconsistency in calculating width of right timestamps.
+
+**** Rename option `erc-timestamp-right-align-by-pixel' to
+`erc-timestamp-use-align-to'.  This controls whether to use the more
+fail-proof method of aligning right timestamps, as mentioned below.
+
+**** Fix a right timestamp spacing problem that used to occur when
+erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
+use the method that aligns right timestamps perfectly in Emacs22 with
+X.  If the current version of Emacs doesn't support this method, use
+the simpler method, which is prone to alignment issues for math
+symbols and other variable-width text.
+
+A side effect of using this new method is that there will only be one
+space before a right timestamp in any saved logs.  If this is
+unacceptable, set `erc-timestamp-use-align-to' to nil.
+
 * Changes in ERC 5.1.1
 
 ** Fix a requirement on cl.el.
diff --git a/debian/changelog b/debian/changelog
index f0454f2..1c828cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,24 @@
 erc (5.1.1-3) unstable; urgency=low
 
+  * erc.el: Go back to using ssl.el, since connecting with
+    `open-tls-stream' only seems to work with the version of tls.el in
+    Emacs22.
+  * erc-autojoin.el, erc-dcc.el: Fix compiler warnings.
+  * erc-stamp.el:
+    - Fix a consistency issue with right timestamps.
+    - Rename option `erc-timestamp-right-align-by-pixel' to
+      `erc-timestamp-use-align-to'.
+    - Use a more fail-proof method of aligning right timestamps, if the
+      current version of Emacs supports it.  Previously, a bug was
+      triggered when erc-stamp.el was byte-compiled.  This has been
+      fixed, making this method safe to use.
   * debian/rules (configure, configure-stamp, build, build-stamp):
     Generate HTML and Info documentation.
     (binary-erc): Install HTML and Info documentation.
   * debian/maint/postinst: Install the Info documentation.
   * debian/maint/prerm: Handle removing of Info documentation.
 
- --
+ -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Tue, 14 Feb 2006 00:55:54 -0500
 
 erc (5.1.1-2) unstable; urgency=low
 



From MAILER-DAEMON Sun Oct 14 00:53:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTO-0008N8-0c
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTM-0008MB-Fo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPN-000591-AZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPL-00058M-HZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
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@hcoop.net>) id 1IgvPL-00044a-AT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPK-0005GC-In
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPK-0006VP-LF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPK-0006VP-LF@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:54 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-list: Update copyright notice
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, 14 Oct 2007 04:53:04 -0000

commit db458c35cdb2c1fa7d2b7e7a5fc47572cbb5065c
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 01:04:18 2007 +0000

    erc-list: Update copyright notice
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-131

diff --git a/ChangeLog b/ChangeLog
index 6eead5d..6fcf18c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2007-04-01  Michael Olson  <mwolson@gnu.org>
 
-	* erc-auto.in, erc-chess.el, erc-speak.el, erc-viper.el: Update
-	copyright notices.
+	* 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.
diff --git a/erc-list.el b/erc-list.el
index a574d6e..5f1ed05 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -1,6 +1,7 @@
 ;;; erc-list.el --- Provide a faster channel listing mechanism
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
+;;   2007 Free Software Foundation, Inc.
 ;; Copyright (C) 2004 Brian Palmer
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>



From MAILER-DAEMON Sun Oct 14 00:53:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTT-0008QZ-4Y
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BN-Gg
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPJ-000563-RF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055l-BK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPH-00042B-Lt
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPG-0005EA-H4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPG-0006OR-Jp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPG-0006OR-Jp@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:50 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Autoload erc-select;
	erc-auto-query => 'bury; freenode suffix.
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, 14 Oct 2007 04:53:10 -0000

commit 09d1f3ea19982f9999303010262ad4d8c8e84876
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Sat Mar 10 15:41:50 2007 +0000

    Autoload erc-select; erc-auto-query => 'bury; freenode suffix.
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-117

diff --git a/ChangeLog b/ChangeLog
index 31ca040..98f1bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-03-05  Diane Murray  <disumu@x3y2z1.net>
+
+	* 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.
diff --git a/NEWS b/NEWS
index 6215c54..ca768d8 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
 `erc-ssl' with `erc-select-ssl' as its alias.  The function that was
 known as `erc' is now `erc-open'.
 
+** Open query buffers by default when private messages are received.
+The default value of `erc-auto-query' has been changed to 'bury.
+
 ** New command: /RECONNECT
 This command tries to reconnect to the current IRC server exactly
 once.  It does not work in server buffers (throws an error before the
diff --git a/erc.el b/erc.el
index a97a91d..660abd2 100644
--- a/erc.el
+++ b/erc.el
@@ -2141,6 +2141,7 @@ be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
   (erc-open server port nick full-name t password))
 
+;;;###autoload
 (defalias 'erc-select 'erc)
 
 (defun erc-ssl (&rest r)
@@ -2430,7 +2431,7 @@ See also `erc-format-message' and `erc-display-line'."
 
 This function relies on the erc-parsed text-property being
 present."
-  (let ((prop-val (get-text-property position 'erc-parsed)))
+  (let ((prop-val (erc-get-parsed-vector position)))
     (and prop-val (member (erc-response.command prop-val) list))))
 
 (defvar erc-send-input-line-function 'erc-send-input-line)
@@ -3753,7 +3754,7 @@ To change how this query window is displayed, use `let' to bind
     (erc-update-mode-line)
     buf))
 
-(defcustom erc-auto-query nil
+(defcustom erc-auto-query 'bury
   "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
@@ -5762,7 +5763,8 @@ Otherwise, use the `erc-header-line' face."
 
 (defcustom erc-common-server-suffixes
   '(("openprojects.net$" . "OPN")
-    ("freenode.net$" . "OPN"))
+    ("freenode.net$" . "freenode")
+    ("oftc.net$" . "OFTC"))
   "Alist of common server name suffixes.
 This variable is used in mode-line display to save screen
 real estate.  Set it to nil if you want to avoid changing
@@ -6262,8 +6264,7 @@ This function should be on `erc-kill-channel-hook'."
   (let ((parsed-posn (erc-find-parsed-property)))
     (put-text-property
      (point-min) (point-max)
-     'erc-parsed (when parsed-posn
-                   (get-text-property parsed-posn 'erc-parsed)))))
+     'erc-parsed (when parsed-posn (erc-get-parsed-vector parsed-posn)))))
 
 (defun erc-get-parsed-vector (point)
   "Return the whole parsed vector on POINT."



From MAILER-DAEMON Sun Oct 14 00:53:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTU-0008Rs-Bu
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BZ-Pb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00057j-BE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPK-00057T-Tv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPJ-000443-W7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPJ-0005Fi-5X
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPJ-0006Sw-7z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPJ-0006Sw-7z@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:53 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] manual: Update sample session
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, 14 Oct 2007 04:53:11 -0000

commit 7421b4439caf705990d44e148fc07f0a7a013592
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 31 04:19:46 2007 +0000

    manual: Update sample session
    
    2007-03-31  Michael Olson  <mwolson@gnu.org>
    
    	* erc.texi (Sample Session): Flesh out.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-126

diff --git a/ChangeLog b/ChangeLog
index 5d4b348..685b51d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-03-31  Michael Olson  <mwolson@gnu.org>
 
+	* erc.texi (Sample Session): Flesh 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



From MAILER-DAEMON Sun Oct 14 00:53:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTU-0008S3-ID
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-00052L-Ui
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004mi-Ay
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOY-0004jk-2b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
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@hcoop.net>) id 1IgvOX-0003pZ-03
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:05 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOV-0004xy-VY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOW-00059c-2g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOW-00059c-2g@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:04 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:53:11 -0000

commit 52c1aa2d19873928edd628b9e880fd27340d2b93
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 16 00:45:35 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-123

diff --git a/erc-stamp.el b/erc-stamp.el
index c73f715..87ad874 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -38,7 +38,7 @@
 (require 'erc)
 (require 'erc-compat)
 
-(defconst erc-stamp-version "$Revision: 1.55 $"
+(defconst erc-stamp-version "$Revision: 1.56 $"
   "ERC stamp mode revision.")
 
 (defgroup erc-stamp nil



From MAILER-DAEMON Sun Oct 14 00:53:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvOw-00052E-NT
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOk-0004vk-LR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOY-0004iQ-En
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004hr-S7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOU-0003nr-Mk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOR-0004w8-5N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:47:59 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOR-00050y-6S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:47:59 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOR-00050y-6S@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:47:59 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:48:29 -0000

commit 7d8aaa5d51b50d30c778a22df7f28c6a46f1528f
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 9 02:39:29 2006 +0000

    Update from CVS
    
    2006-02-09  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-capab.el: New file. Adds the new module
       `erc-capab-identify', which allows flagging of unidentified users
       on servers running an ircd based on dancer - irc.freenode.net, for
       example.
    
       * erc.el (erc-modules): Added `capab-identify' to options.
       (erc-get-parsed-vector, erc-get-parsed-vector-nick)
       (erc-get-parsed-vector-type): Moved here from erc-match.el.
    
       * erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
       (erc-get-parsed-vector-type): Moved these functions to erc.el
       since they can be useful outside of the text matching module.
    
       * CREDITS: Added erc-capab.el. List both erc-nickserv.el and
       erc-services.el since the file name has changed.
    
       * NEWS: Added erc-capab.el.
    
       * erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
       to "ERC".
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-106

diff --git a/CREDITS b/CREDITS
index f16f6bd..c06ea5e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -23,7 +23,7 @@ Tijs van Bakel <smoke@wanadoo.nl>:
 
 Diane Murray <disumu@x3y2z1.net>:
   * Miscellaneous development, additions, bug fixes
-  * erc-nickserv.el
+  * erc-capab.el, erc-nickserv.el/erc-services.el
 
 Gergely Nagy <algernon@debian.org> (aka "mhp"):
   * Debian package maintainer
diff --git a/ChangeLog b/ChangeLog
index c40a478..735e8f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2006-02-09  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el: New file.  Adds the new module
+	`erc-capab-identify', which allows flagging of unidentified users
+	on servers running an ircd based on dancer - irc.freenode.net, for
+	example.
+
+	* erc.el (erc-modules): Added `capab-identify' to options.
+	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
+	(erc-get-parsed-vector-type): Moved here from erc-match.el.
+
+	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
+	(erc-get-parsed-vector-type): Moved these functions to erc.el
+	since they can be useful outside of the text matching module.
+
+	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
+	erc-services.el since the file name has changed.
+
+	* NEWS: Added erc-capab.el.
+
+	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
+	to "ERC".
+
 2006-02-07  Michael Olson  <mwolson@gnu.org>
 
 	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
diff --git a/NEWS b/NEWS
index eee5589..bf60399 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 ERC NEWS                                                       -*- outline -*-
 
+* Changes since ERC 5.1.1
+
+** New modules
+
+*** Capab identify (erc-capab.el)
+
+**** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
+
 * Changes in ERC 5.1.1
 
 ** Fix a requirement on cl.el.
diff --git a/erc-capab.el b/erc-capab.el
new file mode 100644
index 0000000..e0a9f01
--- /dev/null
+++ b/erc-capab.el
@@ -0,0 +1,191 @@
+;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB
+
+;; Copyright (C) 2006 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
+;; the Free Software Foundation; either version 2, 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.
+
+;;; Commentary:
+
+;; This file defines the ERC module `erc-capab-identify', which allows
+;; flagging of unidentified users on servers running dancer-ircd or
+;; hyperion.  freenode.net supports this capability, for example.
+
+;; With CAPAB IDENTIFY-MSG and IDENTIFY-CTCP enabled, messages from
+;; users who have identified themselves to NickServ will have a plus
+;; sign and messages from unidentified users will have a minus sign
+;; added as a prefix.  Note that it is not necessary for your nickname
+;; to be identified in order to receive these marked messages.
+
+;; The plus or minus sign is removed from the message, and a prefix,
+;; `erc-capab-identify-prefix', is inserted in the front of the user's
+;; nickname if the nickname is not identified.
+
+;; Please note that once this has been enabled on a server, there is no
+;; way to tell the server to stop sending marked messages.  If you
+;; disable this module, it will continue removing message flags, but the
+;; unidentified nickname prefix will not be added to messages.
+
+;; Visit <http://freenode.net/faq.shtml#spoofing> and
+;; <http://freenode.net/faq.shtml#registering> to find further
+;; explanations of this capability.
+
+;; From freenode.net's web site (not there anymore) on how to mark
+;; unidentified users:
+;; "We recommend that you add an asterisk before the nick, and
+;;  optionally either highlight or colourize the line in some
+;;  appropriate fashion, if the user is not identified."
+
+;;; Usage:
+
+;; Enable the module `capab-identify' (see the documentation for
+;; `erc-modules').  `erc-capab-identify-prefix' will now be added to the
+;; beginning of unidentified users' nicknames.  The default is an
+;; asterisk.  If the value of this variable is nil, no prefix will be
+;; inserted, but the flag sent by the server will still be stripped.
+
+;;; Todo:
+
+;; Somebody who knows about autoload cookies could please add them where
+;; necessary.
+
+;;; Code:
+
+(defconst erc-capab-version "$Revision: 1.2 $"
+  "ERC CAPAB revision number.")
+
+;;; Customization:
+
+(defgroup erc-capab nil
+  "Support for dancer-ircd's CAPAB settings."
+  :group 'erc)
+
+(defcustom erc-capab-identify-prefix "*"
+  "The prefix used for unidentified users."
+  :group 'erc-capab
+  :type '(choice string (const nil)))
+
+;;; Define module:
+
+(define-erc-response-handler (290)
+  "Handle dancer-ircd CAPAB messages." nil nil)
+
+(define-erc-module capab-identify nil
+  "Handle dancer-ircd's CAPAB IDENTIFY-MSG and IDENTIFY-CTCP."
+  ;; append so that `erc-server-parameters' is already set by `erc-server-005'
+  ((add-hook 'erc-server-005-functions 'erc-capab-identify-setup t)
+   (add-hook 'erc-server-290-functions 'erc-capab-identify-activate)
+   (add-hook 'erc-server-PRIVMSG-functions
+             'erc-capab-identify-remove/set-identified-flag)
+   (add-hook 'erc-server-NOTICE-functions
+             'erc-capab-identify-remove/set-identified-flag)
+   (add-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix t))
+  ((remove-hook 'erc-server-005-functions 'erc-capab-identify-setup)
+   (remove-hook 'erc-server-290-functions 'erc-capab-identify-activate)
+   ;; we don't remove the `erc-capab-identify-remove/set-identified-flag' hooks
+   ;; because there doesn't seem to be a way to tell the server to turn it off
+   (remove-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix)))
+
+;;; Variables:
+
+(defvar erc-capab-identify-activated nil
+  "CAPAB IDENTIFY-MSG has been activated.")
+(make-variable-buffer-local 'erc-capab-identify-activated)
+
+(defvar erc-capab-identify-sent nil
+  "CAPAB IDENTIFY-MSG and IDENTIFY-CTCP messages have been sent.")
+(make-variable-buffer-local 'erc-capab-identify-sent)
+
+;;; Functions:
+
+(defun erc-capab-identify-setup (proc parsed)
+  "Set up CAPAB IDENTIFY on the current server.
+
+PROC is the current server's process.
+PARSED is the current message, a response struct."
+  (unless erc-capab-identify-sent
+    (erc-capab-send-identify-messages)))
+
+(defun erc-capab-send-identify-messages ()
+  "Send CAPAB IDENTIFY messages if the server supports it."
+  (when (and (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
+             ;; could possibly check for IRCD=dancer in `erc-server-parameters'
+             ;; instead of looking for specific version names
+	     (assoc "CAPAB" erc-server-parameters))
+    (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
+    (erc-send-command "CAPAB IDENTIFY-MSG")
+    (erc-send-command "CAPAB IDENTIFY-CTCP")
+    (setq erc-capab-identify-sent t)))
+
+
+(defun erc-capab-identify-activate (proc parsed)
+  "Set `erc-capab-identify-activated' and display an activation message.
+
+PROC is the current server's process.
+PARSED is an `erc-parsed' response struct."
+  (when (or (string= "IDENTIFY-MSG" (erc-response.contents parsed))
+	    (string= "IDENTIFY-CTCP" (erc-response.contents parsed)))
+    (setq erc-capab-identify-activated t)
+    (erc-display-message
+     parsed 'notice 'active (format "%s activated"
+                                    (erc-response.contents parsed)))))
+
+(defun erc-capab-identify-remove/set-identified-flag (proc parsed)
+  "Remove PARSED message's id flag and add the `erc-identified' text property.
+
+PROC is the current server's process.
+PARSED is an `erc-parsed' response struct."
+  (let ((msg (erc-response.contents parsed)))
+    (when (and erc-capab-identify-activated
+               (string-match "^\\([-\\+]\\)\\(.+\\)$" msg))
+      (setf (erc-response.contents parsed)
+            (if erc-capab-identify-mode
+                (erc-propertize (match-string 2 msg)
+                                'erc-identified
+                                (string= (match-string 1 msg) "+"))
+              (match-string 2 msg)))
+      nil)))
+
+(defun erc-capab-identify-add-prefix ()
+  "Add `erc-capab-identify-prefix' to nickname if user is unidentified."
+  (when (and erc-capab-identify-prefix
+             (with-current-buffer (erc-server-buffer)
+               erc-capab-identify-activated))
+    (let ((nickname (erc-capab-get-unidentified-nickname
+                     (erc-get-parsed-vector (- (point-max) 1)))))
+      (when (and nickname
+                 (goto-char (point-min))
+                 (re-search-forward
+                  ;; matches nick in channel, msg, notice, and action messages
+                  ;; this assumes the default action format is used
+                  (concat "\\(<\\|[^\\*]\\* ?\\|-\\)"
+                          "\\(" (regexp-quote nickname) "\\)")
+                  nil t))
+        (goto-char (match-beginning 2))
+        (insert erc-capab-identify-prefix)))))
+
+(defun erc-capab-get-unidentified-nickname (parsed)
+  "Return the nickname of the user if unidentified.
+PARSED is an `erc-parsed' response struct."
+  (and (erc-response-p parsed)
+       (eq nil (get-text-property 0 'erc-identified
+                                  (erc-response.contents parsed)))
+       (erc-get-parsed-vector-nick parsed)
+       (nth 0 (erc-parse-user (erc-get-parsed-vector-nick parsed)))))
+
+(provide 'erc-capab)
+
+;; arch-tag: 27b6d668-7ee5-4e47-b9f0-27d7a4362062
+;;; erc-capab.el ends here
diff --git a/erc-dcc.el b/erc-dcc.el
index ac8df65..53fc3e4 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -29,7 +29,7 @@
 
 ;;; Commentary:
 
-;; This file provides Direct Client-to-Client support for the Emacs IRC Client.
+;; This file provides Direct Client-to-Client support for ERC.
 ;;
 ;; The original code was taken from zenirc-dcc.el, heavily mangled and
 ;; rewritten to support the way how ERC operates.  Server socket support
@@ -57,7 +57,7 @@
 (eval-when-compile
  (require 'pcomplete))
 
-(defconst erc-dcc-version "$Revision: 1.96 $"
+(defconst erc-dcc-version "$Revision: 1.97 $"
   "ERC DCC revision")
 
 (defgroup erc-dcc nil
diff --git a/erc-match.el b/erc-match.el
index a1d1c5a..010432e 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -40,7 +40,7 @@
 
 ;; Customisation:
 
-(defconst erc-match-version "$Revision: 1.53 $"
+(defconst erc-match-version "$Revision: 1.54 $"
   "ERC match mode revision.")
 
 (defgroup erc-match nil
@@ -431,24 +431,6 @@ In any of the following situations, MSG is directed at an entry FOOL:
     (or (erc-list-match fools-beg msg)
 	(erc-list-match fools-end msg))))
 
-(defun erc-get-parsed-vector (point)
-  "Return the whole parsed vector on POINT."
-  (get-text-property point 'erc-parsed))
-
-(defun erc-get-parsed-vector-nick (vect)
-  "Return nickname in the parsed vector VECT."
-  (let* ((untreated-nick (and vect (erc-response.sender vect)))
-	 (maybe-nick (when untreated-nick
-		       (car (split-string untreated-nick "!")))))
-    (when (and (not (null maybe-nick))
-	       (erc-is-valid-nick-p maybe-nick))
-      untreated-nick)))
-
-(defun erc-get-parsed-vector-type (vect)
-  "Return message type in the parsed vector VECT."
-  (and vect
-       (erc-response.command vect)))
-
 (defun erc-match-message ()
   "Mark certain keywords in a region.
 Use this defun with `erc-insert-modify-hook'."
diff --git a/erc-stamp.el b/erc-stamp.el
index 634005f..ea2cb78 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -1,4 +1,4 @@
-;;; erc-stamp.el --- Timestamping for Emacs IRC CLient
+;;; erc-stamp.el --- Timestamping for ERC messages
 
 ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
@@ -38,7 +38,7 @@
 (require 'erc)
 (require 'erc-compat)
 
-(defconst erc-stamp-version "$Revision: 1.53 $"
+(defconst erc-stamp-version "$Revision: 1.54 $"
   "ERC stamp mode revision.")
 
 (defgroup erc-stamp nil
diff --git a/erc-xdcc.el b/erc-xdcc.el
index 7c8ee6f..84562e7 100644
--- a/erc-xdcc.el
+++ b/erc-xdcc.el
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 
-;; This file provides a very simple XDCC file server for the Emacs IRC Client.
+;; This file provides a very simple XDCC file server for ERC.
 
 ;;; Code:
 
diff --git a/erc.el b/erc.el
index f9adcbc..7d34dec 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.803 $"
+(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.804 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -1760,6 +1760,8 @@ removed from the list will be disabled."
 	      (const :tag "Join channels automatically" autojoin)
 	      (const :tag "Integrate with Big Brother Database" bbdb)
 	      (const :tag "Buttonize URLs, nicknames, and other text" button)
+	      (const :tag "Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG"
+		     capab-identify)
 	      (const :tag "Wrap long lines" fill)
 	      (const :tag "Highlight or remove IRC control characters"
 		     irccontrols)
@@ -6149,6 +6151,26 @@ This function should be on `erc-kill-channel-hook'."
 			       (funcall erc-part-reason nil))
 		       nil tgt))))
 
+;;; Dealing with `erc-parsed'
+
+(defun erc-get-parsed-vector (point)
+  "Return the whole parsed vector on POINT."
+  (get-text-property point 'erc-parsed))
+
+(defun erc-get-parsed-vector-nick (vect)
+  "Return nickname in the parsed vector VECT."
+  (let* ((untreated-nick (and vect (erc-response.sender vect)))
+	 (maybe-nick (when untreated-nick
+		       (car (split-string untreated-nick "!")))))
+    (when (and (not (null maybe-nick))
+	       (erc-is-valid-nick-p maybe-nick))
+      untreated-nick)))
+
+(defun erc-get-parsed-vector-type (vect)
+  "Return message type in the parsed vector VECT."
+  (and vect
+       (erc-response.command vect)))
+
 (provide 'erc)
 
 ;;; Deprecated. We might eventually stop requiring the goodies automatically.



From MAILER-DAEMON Sun Oct 14 00:53:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTW-0008UW-SX
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-0004yq-HJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOa-0004lh-HK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOa-0004lN-7T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
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@hcoop.net>) id 1IgvOZ-0003qj-UK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOZ-0004zC-8R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOZ-0005Fe-Bl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOZ-0005Fe-Bl@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:53:12 -0000

commit 9c194fd2a887e645275ca3e11cd13defa5f9b35f
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Mar 6 01:33:01 2006 +0000

    Update from CVS
    
    2006-02-28  Diane Murray  <disumu@x3y2z1.net>
    
       * erc-capab.el: Removed things that were accidentally committed on
       2006-02-20.  Removed Todo section.
       (erc-capab-unidentified): Removed.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-135

diff --git a/ChangeLog b/ChangeLog
index 26162a4..7471b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-28  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el: Removed things that were accidentally committed on
+	2006-02-20.  Removed Todo section.
+	(erc-capab-unidentified): Removed.
+
 2006-02-26  Michael Olson  <mwolson@gnu.org>
 
 	* erc-capab.el: Use (eval-when-compile (require 'cl)).
diff --git a/erc-capab.el b/erc-capab.el
index 191643c..a857ef3 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -61,20 +61,12 @@
 ;; `erc-capab-identify-disable'), no prefix will be inserted, but the
 ;; flag sent by the server will still be stripped.
 
-;;; Todo:
-
-;; DSM check in modify hook if we should mark, then mark appropriately
-;;     `erc-capab-identify-add-prefix'
-;;     and/or
-;;     `erc-capab-identify-apply-face'
-;; DSM CTCP has `erc-identified' but not `erc-parsed' so can't find out nickname?...
-
 ;;; Code:
 
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-capab-version "$Revision: 1.9 $"
+(defconst erc-capab-version "$Revision: 1.10 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -88,11 +80,6 @@
   :group 'erc-capab
   :type '(choice string (const nil)))
 
-(defface erc-capab-unidentified
-  '((t :inherit highlight))
-  "Face for displaying users who haven't identified with NickServ."
-  :group 'erc-faces)
-
 ;;; Define module:
 
 (define-erc-response-handler (290)



From MAILER-DAEMON Sun Oct 14 00:53:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTX-0008V7-6w
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTU-0008RT-0t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTT-0008Qg-6a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPR-0005BD-0A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
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@hcoop.net>) id 1IgvPQ-00045k-E5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPO-0005HG-7Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPO-0006aw-95
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPO-0006aw-95@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:58 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Makefile: Run linda as well as
	lintian
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, 14 Oct 2007 04:53:12 -0000

commit bf6f3b56efe8de91c99f4fc531c8d9ee83c4ad91
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 18:47:24 2007 +0000

    Makefile: Run linda as well as lintian
    
    
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-18

diff --git a/ChangeLog b/ChangeLog
index 8e0fd37..8228b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
 	(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
diff --git a/Makefile b/Makefile
index a504329..98ff913 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,9 @@ debbuild:
 	  echo "Running lintian ..." && \
 	  lintian -i ../erc_$(VERSION)*.deb || : && \
 	  echo "Done running lintian." && \
+	  echo "Running linda ..." && \
+	  linda -i ../erc_$(VERSION)*.deb || : && \
+	  echo "Done running linda." && \
 	  debsign)
 
 debrelease: debprepare



From MAILER-DAEMON Sun Oct 14 00:53:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTX-0008VX-FC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTU-0008Rm-9W
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTS-0008Q1-J2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP1-00053a-EO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
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@hcoop.net>) id 1IgvP1-0003zA-2d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP0-000588-5y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP0-0005xt-7s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP0-0005xt-7s@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:34 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-stamp: Fix bug with timestamp
	movement
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, 14 Oct 2007 04:53:12 -0000

commit 0b75c8bab8097436fb896cf48eb48dfc362398a8
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Nov 21 02:38:02 2006 +0000

    erc-stamp: Fix bug with timestamp movement
    
    2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
    
    	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
    	from the erc-timestamp field.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-65

diff --git a/CREDITS b/CREDITS
index d50680e..25ffd3b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -138,8 +138,21 @@ Eric Hanchrow <offby1@blarg.net>:
   * Implemented check of /ignore argument to see whether it was a
     regexp or a normal string (4 lines changed).
 
+John J Foerch <jjfoerch@earthlink.net>
+  * Fix bug with movement around right timestamps (2 lines changed).
+
+ukasz Demianiuk  <ldemianiuk@gmail.com>:
+  * Fix bug in erc-header-line (1 line changed).
+
+Andrea Russo <rastandy@inventati.org>:
+  * Fixed wrong type argument bug in erc-dcc (1 line changed).
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
 forgot.  If you aren't listed here and should be, send an email to
 mwolson@gnu.org along with a list of your contributions.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/ChangeLog b/ChangeLog
index 74c9b29..62ee2d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,11 @@
 	`erc-show-my-nick' is non-nil.
 	(erc-compute-server): Doc fix.
 
+2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
+
+	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
+	from the erc-timestamp field.
+
 2006-09-11  Michael Olson  <mwolson@gnu.org>
 
 	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
diff --git a/erc-stamp.el b/erc-stamp.el
index 7d8684a..6b03713 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -266,8 +266,8 @@ be printed just before the window-width."
 	(indent-to pos)
 	(setq from (point))
 	(insert string))
-      (erc-put-text-property from (1+ (point)) 'field 'erc-timestamp)
-      (erc-put-text-property from (1+ (point)) 'rear-nonsticky t)
+      (erc-put-text-property from (point) 'field 'erc-timestamp)
+      (erc-put-text-property from (point) 'rear-nonsticky t)
       (when erc-timestamp-intangible
 	(erc-put-text-property from (1+ (point)) 'intangible t)))))
 



From MAILER-DAEMON Sun Oct 14 00:53:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTX-0008Vz-Ki
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-00052A-Om
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOi-0004sC-GU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOg-0004s3-M8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
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@hcoop.net>) id 1IgvOg-0003su-6C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOf-00051Z-FX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOf-0005Qe-HZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOf-0005Qe-HZ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:13 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add COPYING file
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, 14 Oct 2007 04:53:13 -0000

commit 95e07b7889cb258b6b8b4e63ad37f017ae6673f6
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu May 4 17:20:27 2006 +0000

    Add COPYING file
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-157

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..3912109
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.



From MAILER-DAEMON Sun Oct 14 00:53:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTX-0008WH-Si
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BH-4V
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPG-00054T-U4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPG-00054L-Ox
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
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@hcoop.net>) id 1IgvPF-00042L-Io
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPC-0005Cm-Pa
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPC-0006Hu-RR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPC-0006Hu-RR@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:46 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Include name of module in description
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, 14 Oct 2007 04:53:13 -0000

commit a5cf643f6a9460a39e37a99ccf05fca221244814
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 15 00:25:52 2007 +0000

    Include name of module in description
    
    2007-02-15  Michael Olson  <mwolson@gnu.org>
    
    	* 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-105

diff --git a/ChangeLog b/ChangeLog
index 8cba67c..2affa96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-15  Michael Olson  <mwolson@gnu.org>
+
+	* 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
diff --git a/erc.el b/erc.el
index ea65494..8e35cc7 100644
--- a/erc.el
+++ b/erc.el
@@ -1814,45 +1814,45 @@ removed from the list will be disabled."
   :type
   '(set
     :greedy t
-    (const :tag "Set away status automatically" autoaway)
-    (const :tag "Join channels automatically" autojoin)
-    (const :tag "Integrate with Big Brother Database" bbdb)
-    (const :tag "Buttonize URLs, nicknames, and other text" button)
-    (const
-     :tag
-     "Mark unidentified users on freenode and other servers supporting CAPAB"
-     capab-identify)
-    (const :tag "Complete nicknames and commands (programmable)"
+    (const :tag "autoaway: Set away status automatically" autoaway)
+    (const :tag "autojoin: Join channels automatically" autojoin)
+    (const :tag "bbdb: Integrate with Big Brother Database" bbdb)
+    (const :tag "button: Buttonize URLs, nicknames, and other text" button)
+    (const :tag "capab: Mark unidentified users on servers supporting CAPAB"
+	   capab-identify)
+    (const :tag "completion: Complete nicknames and commands (programmable)"
 	   completion)
-    (const :tag "Complete nicknames and commands (old)" hecomplete)
-    (const :tag "Wrap long lines" fill)
-    (const :tag "Launch an identd server on port 8113" identd)
-    (const :tag "Highlight or remove IRC control characters"
+    (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)
+    (const :tag "irccontrols: Highlight or remove IRC control characters"
 	   irccontrols)
-    (const :tag "List channels in a separate buffer" list)
-    (const :tag "Save buffers in logs" log)
-    (const :tag "Highlight pals, fools, and other keywords" match)
-    (const :tag "Display a menu in ERC buffers" menu)
-    (const :tag "Detect netsplits" netsplit)
-    (const :tag "Don't display non-IRC commands after evaluation"
+    (const :tag "list: List channels in a separate buffer" list)
+    (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 "netsplit: Detect netsplits" netsplit)
+    (const :tag "noncommands: Don't display non-IRC commands after evaluation"
 	   noncommands)
-    (const :tag "Notify when the online status of certain users changes"
+    (const :tag
+	   "notify: Notify when the online status of certain users changes"
 	   notify)
-    (const :tag "Process CTCP PAGE requests from IRC" page)
-    (const :tag "Make displayed lines read-only" readonly)
-    (const :tag "Replace text in messages" replace)
-    (const :tag "Enable an input history" ring)
-    (const :tag "Scroll to the bottom of the buffer" scrolltobottom)
-    (const :tag "Identify to Nickserv (IRC Services) automatically"
+    (const :tag "page: Process CTCP PAGE requests from IRC" page)
+    (const :tag "readonly: Make displayed lines read-only" readonly)
+    (const :tag "replace: Replace text in messages" replace)
+    (const :tag "ring: Enable an input history" ring)
+    (const :tag "scrolltobottom: Scroll to the bottom of the buffer"
+	   scrolltobottom)
+    (const :tag "services: Identify to Nickserv (IRC Services) automatically"
 	   services)
-    (const :tag "Convert smileys to pretty icons" smiley)
-    (const :tag "Play sounds when you receive CTCP SOUND requests"
+    (const :tag "smiley: Convert smileys to pretty icons" smiley)
+    (const :tag "sound: Play sounds when you receive CTCP SOUND requests"
 	   sound)
-    (const :tag "Add timestamps to messages" stamp)
-    (const :tag "Check spelling" spelling)
-    (const :tag "Track channel activity in the mode-line" track)
-    (const :tag "Truncate buffers to a certain size" truncate)
-    (const :tag "Translate morse code in messages" unmorse)
+    (const :tag "stamp: Add timestamps to messages" stamp)
+    (const :tag "spelling: Check spelling" spelling)
+    (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)
     (repeat :tag "Others" :inline t symbol))
   :group 'erc)
 



From MAILER-DAEMON Sun Oct 14 00:53:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTd-0000Bj-Fl
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BI-51
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPM-00058E-G8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPL-00058A-Bf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
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@hcoop.net>) id 1IgvPK-00044K-UY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPK-0005G0-1F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPK-0006UR-3P
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPK-0006UR-3P@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:54 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make extras tarball
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, 14 Oct 2007 04:53:14 -0000

commit 8b8f8ac4de11887a25c69f02800950776d1f60bb
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 00:45:41 2007 +0000

    Make extras tarball
    
    2007-04-01  Michael Olson  <mwolson@gnu.org>
    
    	* erc.texi: Make Emacs Lisp source code in this document
    	essentially public domain.
    	(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.2006.
    	(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.
    
    	* NEWS: Mention extras tarball.
    
    	* README.extras: New file which serves as a README for the extras
    	tarball.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-129

diff --git a/ChangeLog b/ChangeLog
index bc502af..46b1156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2007-04-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi: Make Emacs Lisp source code in this document
+	essentially public domain.
+	(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.2006.
+	(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.
+
+	* NEWS: Mention extras tarball.
+
+	* 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.
diff --git a/FOR-RELEASE b/FOR-RELEASE
index 116b5bc..392d2e8 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -12,13 +12,15 @@ Tasks that need to be accomplished in order for a release to happen.
 This will hopefully increase the chance that it will be useful for
 other IRC clients, like Circe.
 
+*** Make erc-nicklist into a proper ERC module.
+
 * 5.2 release
 
 ** Documentation
 
 *** [DONE] Finish items marked with "@c PRE5_2" in the documentation.
 
-*** Update NEWS for changes since 5.1.4.
+*** [DONE] Update NEWS for changes since 5.1.4.
 
 ** Source
 
@@ -40,14 +42,18 @@ conflict with rcirc, for example.  Would setting `erc-track-mode-map'
 work?  Otherwise we could encourage people to use something like
 `C-c e SPC' or `C-c c'.
 
-**** Solution: We went with a global minor mode which does nothing
-but set the global-level C-c C-SPC and C-c C-@ keybindings.  It
-defaults to warning the user if one of their keybindings would be
-overridden, so this solution should be OK to install in Emacs.
+Solution: We went with a global minor mode which does nothing but set
+the global-level C-c C-SPC and C-c C-@ keybindings.  It defaults to
+warning the user if one of their keybindings would be overridden, so
+this solution should be OK to install in Emacs.
 
-*** Make a tarball with the modules that weren't included with
+*** [DONE] Make a tarball with the modules that weren't included with
 Emacs 22 that can be downloaded from GNU's ftp server.
 
+This is now available as "erc-5.2-extras.(tar.gz|zip)" at
+ftp.gnu.org/gnu/erc/.  It may be built with "make extras" and uploaded
+with "make upload-extras".
+
 * 5.1 release (old)
 
 ** [DONE] Documentation
diff --git a/Makefile b/Makefile
index 449ff29..dbd9ab6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
-VERSION=5.1.4
+VERSION=5.2
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.3-2
+LASTUPLOAD = 5.1.4-4
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
-UNCOMPILED = erc-chess.el erc-bbdb.el erc-ibuffer.el erc-speak.el \
+UNCOMPILED = erc-bbdb.el erc-chess.el erc-ibuffer.el erc-speak.el \
 		erc-speedbar.el erc-compat.el
-TESTING = erc-members.el erc-macs.el
+
+# Files to include in the extras pack for Emacs 22
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-speak.el \
+		 README.extras COPYING
+
 ALLSOURCE = $(wildcard *.el)
-SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED) $(TESTING),$(ALLSOURCE))
+SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED), $(ALLSOURCE))
 TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
-MISC	= AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
-		ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
-		ChangeLog.2001 servers.pl erc-auto.in erc.texi
+MISC	= AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
+		ChangeLog.2006 ChangeLog.2005 ChangeLog.2004 \
+		ChangeLog.2003 ChangeLog.2002 ChangeLog.2001 \
+		servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
 SITEFLAG    = --no-site-file
@@ -133,14 +138,21 @@ debrevision:
 
 release: autoloads distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
-	cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../erc-$(VERSION)
-	cp -r images ../erc-$(VERSION)
+	cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../$(SNAPDIR)
+	cp -r images ../$(SNAPDIR)
 	test -d ../$(SNAPDIR)/images/CVS && \
 	  rm -R ../$(SNAPDIR)/images/CVS || :
 	test -d ../$(SNAPDIR)/images/.arch-ids && \
 	  rm -R ../$(SNAPDIR)/images/.arch-ids || :
-	(cd .. && tar czf erc-$(VERSION).tar.gz erc-$(VERSION)/*; \
-	  zip -r erc-$(VERSION).zip erc-$(VERSION))
+	(cd .. && tar czf erc-$(VERSION).tar.gz $(SNAPDIR)/*; \
+	  zip -r erc-$(VERSION).zip $(SNAPDIR))
+
+extras:
+	-rm -Rf ../$(SNAPDIR)-extras
+	mkdir ../$(SNAPDIR)-extras && chmod 0755 ../$(SNAPDIR)-extras
+	cp $(EXTRAS) ../$(SNAPDIR)-extras
+	(cd .. && tar czf erc-$(VERSION)-extras.tar.gz $(SNAPDIR)-extras/*; \
+	  zip -r erc-$(VERSION)-extras.zip $(SNAPDIR)-extras)
 
 upload:
 	(cd .. && gpg --detach erc-$(VERSION).tar.gz && \
@@ -156,3 +168,18 @@ upload:
 	  echo close >> upload.lftp ; \
 	  lftp -f upload.lftp ; \
 	  rm -f upload.lftp)
+
+upload-extras:
+	(cd .. && gpg --detach erc-$(VERSION)-extras.tar.gz && \
+	  gpg --detach erc-$(VERSION)-extras.zip && \
+	  echo "Directory: erc" | gpg --clearsign > \
+	    erc-$(VERSION)-extras.tar.gz.directive.asc && \
+	  cp erc-$(VERSION)-extras.tar.gz.directive.asc \
+	    erc-$(VERSION)-extras.zip.directive.asc && \
+	  echo open ftp://ftp-upload.gnu.org > upload.lftp ; \
+	  echo cd /incoming/ftp >> upload.lftp ; \
+	  echo mput erc-$(VERSION)-extras.zip* >> upload.lftp ; \
+	  echo mput erc-$(VERSION)-extras.tar.gz* >> upload.lftp ; \
+	  echo close >> upload.lftp ; \
+	  lftp -f upload.lftp ; \
+	  rm -f upload.lftp)
diff --git a/NEWS b/NEWS
index 318e81f..6cb6dc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 ERC NEWS                                                       -*- outline -*-
 
-* Changes in ERC 5.2 (unreleased)
+* Changes in ERC 5.2
 
 ** M-x erc RET now starts ERC.
 `erc-select' has been changed to `erc'.  `erc-select' still remains as
@@ -60,6 +60,13 @@ This makes it easier to find modules by name.
 
 ** erc-server-send-ping-interval: Change to use a default of 30 seconds.
 
+** Some files which are included with the release of ERC 5.2 will not
+appear in the version of ERC that is bundled with Emacs 22.  These
+extras files may be found at:
+
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
+
 ** Header line changes
 
 *** Remove "[IRC]" from the header line.
diff --git a/README.extras b/README.extras
new file mode 100644
index 0000000..a610e46
--- /dev/null
+++ b/README.extras
@@ -0,0 +1,31 @@
+
+This is the README file for the ERC extras.
+
+ERC is a powerful, modular, and extensible IRC client for Emacs.
+
+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:
+
+ - No copyright disclaimer was completed for an author of the file.
+ - Depends on files which are not distibuted with Emacs.
+
+Installation
+------------
+
+There are several ways to tell Emacs where to find these files.  The
+easiest may perhaps be to copy them to "~/elisp/erc-extras", and then
+to add the line
+
+  (add-to-list 'load-path "~/elisp/erc-extras" t)
+
+to your ~/.emacs (or ~/.emacs/init.el) file.  Compiling them would be
+overkill.
+
+License information
+-------------------
+
+These extras for ERC are available under the terms of the GNU General
+Public License.  See the file `COPYING' for details.
diff --git a/erc.texi b/erc.texi
index ae5d85d..ae4ac8e 100644
--- a/erc.texi
+++ b/erc.texi
@@ -21,6 +21,9 @@ Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, Front-Cover texts, or Back-Cover Texts.
+
+All Emacs Lisp code contained in this document may be used, distributed,
+and modified without restriction.
 @end quotation
 @end copying
 
@@ -120,8 +123,17 @@ It comes with the following capabilities enabled by default.
 * Development::                 Latest unreleased development changes.
 @end menu
 
-These sections may be skipped if you are using the version of ERC that
-comes with Emacs.
+Note that some ERC files are not included with Emacs due to copyright or
+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}
+@end itemize
+
+The rest of this chapter may be skipped if you are using the version of
+ERC that comes with Emacs.
 
 @node Releases, Development, Obtaining ERC, Obtaining ERC
 @comment  node-name,  next,  previous,  up
@@ -140,7 +152,7 @@ available in the official Debian repository.
 
 @cindex releases, from source
 Alternatively, you can download the latest release from
-@uref{http://ftp.gnu.org/gnu/erc}.
+@uref{http://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
 
 @node Development,  , Releases, Obtaining ERC
 @comment  node-name,  next,  previous,  up
@@ -811,9 +823,6 @@ your Emacs configuration file.  Everything after the @code{(require
 @lisp
 ;;; Sample ERC configuration
 
-;; The code in this section (Sample Configuration) may be used,
-;; distributed, and modified without restriction.
-
 ;; Add the ERC directory to load path -- you don't need this if you are
 ;; using the version of ERC that comes with Emacs
 (add-to-list 'load-path "~/elisp/erc")



From MAILER-DAEMON Sun Oct 14 00:53:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTd-0000BF-9n
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BB-2F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPN-00057L-P6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055u-MH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPI-00042J-SC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPH-0005En-5G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPH-0006PR-7I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPH-0006PR-7I@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:51 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fixed a bug in the
	`erc-autoaway-idle-method' :set 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: Sun, 14 Oct 2007 04:53:13 -0000

commit 1d2b5c96fa224f9551adc0556723706d02bcb0b1
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Mon Mar 12 00:01:55 2007 +0000

    Fixed a bug in the `erc-autoaway-idle-method' :set definition.
    
    * 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-119

diff --git a/ChangeLog b/ChangeLog
index 8faa2b7..7bffc90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 22636a9..9c0450d 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -154,9 +154,11 @@ definitions of being idle."
 		 (const :tag "Emacs idle time" emacs)
 		 (const :tag "Last IRC action" irc))
   :set (lambda (sym val)
-	 (erc-autoaway-disable)
-	 (set-default sym val)
-	 (erc-autoaway-enable)))
+	 (cond (erc-autoaway-mode
+		(erc-autoaway-disable)
+		(set-default sym val)
+		(erc-autoaway-enable))
+	       (t (set-default sym val)))))
 
 (defcustom erc-auto-set-away t
   "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.



From MAILER-DAEMON Sun Oct 14 00:53:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTd-0000C4-MD
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BO-DA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPH-000556-9C
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPG-00054Q-Sv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
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@hcoop.net>) id 1IgvPG-00042f-8e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPE-0005DO-6u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPE-0006KP-9l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPE-0006KP-9l@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:48 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add more FOR-RELEASE items
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, 14 Oct 2007 04:53:14 -0000

commit 2f745731619140ed0469d928afa29354e66f3932
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 03:09:39 2007 +0000

    Add more FOR-RELEASE items
    
    * FOR-RELEASE: Add tasks for merging filename changes from the 5.2
      release branch, and for making a tarball of modules not in Emacs 22.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-110

diff --git a/ChangeLog b/ChangeLog
index 74a724b..7a8485b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* 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.
 
 2007-02-15  Michael Olson  <mwolson@gnu.org>
 
diff --git a/FOR-RELEASE b/FOR-RELEASE
index 3047da7..9b62b4e 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -19,6 +19,9 @@ the release of 5.2.
 
 *** Add binding for S-TAB (backtab) that moves backwards by link.
 
+*** Merge filename changes from the 5.2 release branch into the
+erc--main--0 branch.
+
 * Emacs 22 release
 
 ** Source
@@ -32,6 +35,9 @@ conflict with rcirc, for example.  Would setting `erc-track-mode-map'
 work?  Otherwise we could encourage people to use something like
 `C-c e SPC' or `C-c c'.
 
+*** Make a tarball with the modules that weren't included with
+Emacs 22 that can be downloaded from GNU's ftp server.
+
 * 5.1 release
 
 ** [DONE] Documentation



From MAILER-DAEMON Sun Oct 14 00:53:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTd-0000CO-RG
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTW-0008Ty-9Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTV-0008TA-EB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPR-0005BK-63
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
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@hcoop.net>) id 1IgvPQ-00045W-J3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPN-0005H4-Ls
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPN-0006Zw-Nf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPN-0006Zw-Nf@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:57 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Makefile: Add DISTRIBUTOR variable
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, 14 Oct 2007 04:53:14 -0000

commit 3a9613674ad46ef42670115acc398ee6c435284a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 17:21:25 2007 +0000

    Makefile: Add DISTRIBUTOR variable
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-136

diff --git a/ChangeLog b/ChangeLog
index 70ffa4e..a1d591c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
 	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.
 
 	* NEWS: Mention extras tarball.  Note which files have been
 	renamed.  Note that erc-list is enabled by default, except in
diff --git a/Makefile b/Makefile
index 93b9914..a504329 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,9 @@ PREFIX   = /usr/local
 ELISPDIR = $(PREFIX)/share/emacs/site-lisp/erc
 INFODIR  = $(PREFIX)/info
 
+# Used to differentiate building packages for Debian and Ubuntu
+DISTRIBUTOR = debian
+
 # XEmacs users will probably want the following settings.
 #EMACS    = xemacs
 #SITEFLAG = -no-site-file
@@ -104,7 +107,7 @@ debbuild:
 	  debsign)
 
 debrelease: debprepare
-	-rm -f ../../dist/erc_*
+	-rm -f ../../dist/$(DISTRIBUTOR)/erc_*
 	-rm -f ../erc_$(VERSION)*
 	(cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
 	cp -R debian ../$(SNAPDIR)
@@ -117,10 +120,10 @@ debrelease: debprepare
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
 	$(MAKE) debbuild
-	cp ../erc_$(VERSION)* ../../dist
+	cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
 debrevision:
-	-rm -f ../../dist/erc_*
+	-rm -f ../../dist/$(DISTRIBUTOR)/erc_*
 	-rm -f ../erc_$(VERSION)-*
 	-rm -fr ../erc-$(VERSION)
 	$(MAKE) debprepare
@@ -134,7 +137,7 @@ debrevision:
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
 	$(MAKE) debbuild
-	cp ../erc_$(VERSION)* ../../dist
+	cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
 release: autoloads distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)



From MAILER-DAEMON Sun Oct 14 00:53:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTe-0000Da-B0
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-00052D-JH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOd-0004ph-Sw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOd-0004p9-MX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
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@hcoop.net>) id 1IgvOc-0003rP-H8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:10 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOb-00050B-Or
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOb-0005K9-R9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOb-0005K9-R9@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:09 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Only remove first space from /quote
	argument.
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, 14 Oct 2007 04:53:16 -0000

commit baeb999b6e9e83a85f15c4c5c75e5995f184c512
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 25 18:09:03 2006 +0000

    Only remove first space from /quote argument.
    
    * erc.el (erc-cmd-QUOTE): Only remove the first space, and leave initial
      tabs and other spaces alone.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-144

diff --git a/ChangeLog b/ChangeLog
index 28a013c..6b176e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2006-03-25  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
-	that fixes the case where there is no leading whitespace.
+	that fixes the case where there is no leading whitespace.  Only
+	remove the first space character, though.
 
 	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 	erc-identd-process is set properly.
diff --git a/erc.el b/erc.el
index 86901a9..2340626 100644
--- a/erc.el
+++ b/erc.el
@@ -3003,7 +3003,7 @@ Otherwise leave the channel indicated by LINE."
 All the text given as argument is sent to the sever as unmodified,
 just as you provided it.  Use this command with care!"
   (cond
-   ((string-match "^\\s-*\\(.+\\)$" line)
+   ((string-match "^ ?\\(.+\\)$" line)
     (erc-server-send (match-string 1 line)))
    (t nil)))
 (put 'erc-cmd-QUOTE 'do-not-parse-args t)



From MAILER-DAEMON Sun Oct 14 00:53:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTe-0000Do-F6
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-00052M-Vd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOY-0004ic-F8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOV-0004ho-PT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
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@hcoop.net>) id 1IgvOV-0003ok-8X
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOU-0004xF-Bb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOU-00056c-Dk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOU-00056c-Dk@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:02 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merge for Romain's Debian package
	upload.
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, 14 Oct 2007 04:53:16 -0000

commit 96cb94d38e952b21ff884acfca6d82e78ba864a5
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Feb 14 05:07:26 2006 +0000

    Merge for Romain's Debian package upload.
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-117

diff --git a/debian/changelog b/debian/changelog
index 96a4dd5..f0454f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+erc (5.1.1-3) unstable; urgency=low
+
+  * debian/rules (configure, configure-stamp, build, build-stamp):
+    Generate HTML and Info documentation.
+    (binary-erc): Install HTML and Info documentation.
+  * debian/maint/postinst: Install the Info documentation.
+  * debian/maint/prerm: Handle removing of Info documentation.
+
+ --
+
+erc (5.1.1-2) unstable; urgency=low
+
+  * debian/control: Add Build-Depends-Indep on texinfo and texi2html,
+    thanks to Andreas Jochens (closes: #351772).
+
+ -- Romain Francoise <rfrancoise@debian.org>  Wed,  8 Feb 2006 08:31:46 +0100
+
 erc (5.1.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -12,11 +29,8 @@ erc (5.1.1-1) unstable; urgency=low
     width", thanks to Cyril Bouthors (Closes: #221223).  The desired
     behavior can be obtained by setting both `erc-fill-column' and
     `fill-column' to nil.
-  * debian/rules (configure, configure-stamp, build, build-stamp):
-    Generate HTML and Info documentation.
-    (binary-erc): Install HTML and Info documentation.
-  * debian/maint/postinst: Install the Info documentation.
-  * debian/maint/prerm: Handle removing of Info documentation.
+  * debian/rules (build, binary-erc): Build and install HTML
+    documentation.
 
  -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Sun,  5 Feb 2006 01:26:56 -0500
 
diff --git a/debian/control b/debian/control
index 3b54a98..426291b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Michael W. Olson (GNU address) <mwolson@gnu.org>
 Uploaders: Mario Lang <mlang@debian.org>, Romain Francoise <rfrancoise@debian.org>
+Build-Depends-Indep: texinfo, texi2html
 Standards-Version: 3.6.2
 
 Package: erc



From MAILER-DAEMON Sun Oct 14 00:53:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTY-00005G-62
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005Ae-GA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPH-00054k-J2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPG-00054M-QJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
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@hcoop.net>) id 1IgvPF-00042J-Gl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPC-0005Cg-F4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPC-0006HP-HC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:46 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPC-0006HP-HC@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:46 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merge new reconnect algorithm from
	flerdermaus
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, 14 Oct 2007 04:53:13 -0000

commit 74bed72cd5911699a00cd9cb34080e8a716af667
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 15 00:21:10 2007 +0000

    Merge new reconnect algorithm from flerdermaus
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-104

diff --git a/ChangeLog b/ChangeLog
index 26def0d..8cba67c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+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
diff --git a/erc-backend.el b/erc-backend.el
index 8d33459..713f713 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -193,6 +193,11 @@ active, use the `erc-server-process-alive' function instead.")
   "Non-nil if the user requests a quit.")
 (make-variable-buffer-local 'erc-server-quitting)
 
+(defvar erc-server-reconnecting nil
+  "Non-nil if the user requests an explicit reconnect, and the
+current IRC process is still alive.")
+(make-variable-buffer-local 'erc-server-reconnecting)
+
 (defvar erc-server-timed-out nil
   "Non-nil if the IRC server failed to respond to a ping.")
 (make-variable-buffer-local 'erc-server-timed-out)
@@ -497,6 +502,7 @@ We will store server variables in the buffer given by BUFFER."
       (with-current-buffer buffer
         (setq erc-server-process process)
         (setq erc-server-quitting nil)
+        (setq erc-server-reconnecting nil)
         (setq erc-server-timed-out nil)
         (setq erc-server-banned nil)
         (setq erc-server-error-occurred nil)
@@ -573,18 +579,20 @@ Make sure you are in an ERC buffer when running this."
 (defsubst erc-server-reconnect-p (event)
   "Return non-nil if ERC should attempt to reconnect automatically.
 EVENT is the message received from the closed connection process."
-  (and erc-server-auto-reconnect
-       (not erc-server-banned)
-       (not erc-server-error-occurred)
-       ;; make sure we don't infinitely try to reconnect, unless the
-       ;; user wants that
-       (or (eq erc-server-reconnect-attempts t)
-           (and (integerp erc-server-reconnect-attempts)
-                (< erc-server-reconnect-count erc-server-reconnect-attempts)))
-       (or erc-server-timed-out
-           (not (string-match "^deleted" event)))
-       ;; open-network-stream-nowait error for connection refused
-       (not (string-match "^failed with code 111" event))))
+  (or erc-server-reconnecting
+      (and erc-server-auto-reconnect
+           (not erc-server-banned)
+           (not erc-server-error-occurred)
+           ;; make sure we don't infinitely try to reconnect, unless the
+           ;; user wants that
+           (or (eq erc-server-reconnect-attempts t)
+               (and (integerp erc-server-reconnect-attempts)
+                    (< erc-server-reconnect-count
+                       erc-server-reconnect-attempts)))
+           (or erc-server-timed-out
+               (not (string-match "^deleted" event)))
+           ;; open-network-stream-nowait error for connection refused
+           (not (string-match "^failed with code 111" event)))))
 
 (defun erc-process-sentinel-1 (event)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.
@@ -608,6 +616,7 @@ Conditionally try to reconnect and take appropriate action."
         (if (erc-server-reconnect-p event)
             (condition-case err
                 (progn
+                  (setq erc-server-reconnecting nil)
                   (erc-server-reconnect)
                   (setq erc-server-reconnect-count 0))
               (error (when (integerp erc-server-reconnect-attempts)
diff --git a/erc.el b/erc.el
index 9721839..ea65494 100644
--- a/erc.el
+++ b/erc.el
@@ -3204,8 +3204,17 @@ the message given by REASON."
 
 (defun erc-cmd-RECONNECT ()
   "Try to reconnect to the current IRC server."
-  (setq erc-server-reconnect-count 0)
-  (erc-server-reconnect)
+  (let ((buffer (or (erc-server-buffer) (current-buffer)))
+	(process nil))
+    (with-current-buffer (if (bufferp buffer) buffer (current-buffer))
+      (setq erc-server-quitting nil)
+      (setq erc-server-reconnecting t)
+      (setq erc-server-reconnect-count 0)
+      (setq process (get-buffer-process (erc-server-buffer)))
+      (if process
+	  (delete-process process)
+	(erc-server-reconnect))
+      (setq erc-server-reconnecting nil)))
   t)
 
 (defun erc-cmd-SERVER (server)
@@ -6150,7 +6159,8 @@ functions."
       (format "%s (%s@%s) has left channel %s%s"
 	      nick user host channel
 	      (if (not (string= reason ""))
-		  (format ": %s" reason)
+		  (format ": %s"
+			  (erc-replace-regexp-in-string "%" "%%" reason))
 		"")))))
 
 



From MAILER-DAEMON Sun Oct 14 00:53:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTe-0000Cj-1Q
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BJ-BG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPH-00054o-JD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPG-00054N-Qo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
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@hcoop.net>) id 1IgvPF-00042V-VS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPD-0005Cz-Cc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPD-0006Iu-FU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:47 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPD-0006Iu-FU@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:47 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Permit user to disable checking the
	ping timeout
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, 14 Oct 2007 04:53:14 -0000

commit 95975a5aafb186f541c336af58776f61073421ab
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Feb 15 03:43:56 2007 +0000

    Permit user to disable checking the ping timeout
    
    * erc-backend.el (erc-server-send-ping-interval): Improve customize
      interface.
      (erc-server-send-ping-timeout): Ditto, and mention how to disable this.
      (erc-server-send-ping): Handle case where erc-server-ping-timeout is
      disabled.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-107

diff --git a/ChangeLog b/ChangeLog
index 0cd504a..eeb2d27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,12 +3,14 @@
 	* CREDITS: Update.
 
 	* erc-backend.el (erc-server-send-ping-interval): Change to use a
-	default of 30 seconds.
+	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.
+	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
diff --git a/erc-backend.el b/erc-backend.el
index eaea8c2..e2b7914 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -415,16 +415,20 @@ protection algorithm."
   "*Interval of sending pings to the server, in seconds.
 If this is set to nil, pinging the server is disabled."
   :group 'erc-server
-  :type '(choice (const nil) (integer :tag "Seconds")))
+  :type '(choice (const :tag "Disabled" nil)
+                 (integer :tag "Seconds")))
 
 (defcustom erc-server-send-ping-timeout 120
   "*If the time between ping and response is greater than this, reconnect.
 The time is in seconds.
 
 This must be greater than or equal to the value for
-`erc-server-send-ping-interval'."
+`erc-server-send-ping-interval'.
+
+If this is set to nil, never try to reconnect."
   :group 'erc-server
-  :type '(choice (const nil) (integer :tag "Seconds")))
+  :type '(choice (const :tag "Disabled" nil)
+                 (integer :tag "Seconds")))
 
 (defvar erc-server-ping-handler nil
   "This variable holds the periodic ping timer.")
@@ -462,9 +466,11 @@ Currently this is called by `erc-send-input'."
 Additionally, detect whether the IRC process has hung."
   (if (buffer-live-p buf)
       (with-current-buffer buf
-        (if (> (erc-time-diff (erc-current-time)
-                              erc-server-last-received-time)
-               erc-server-send-ping-timeout)
+        (if (and erc-server-send-ping-timeout
+                 (>
+                  (erc-time-diff (erc-current-time)
+                                 erc-server-last-received-time)
+                  erc-server-send-ping-timeout))
             (progn
               ;; if the process is hung, kill it
               (setq erc-server-timed-out t)



From MAILER-DAEMON Sun Oct 14 00:53:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTe-0000E7-Oo
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTY-00006F-QZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPb-0005Gq-0Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPZ-0005GI-Q3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
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@hcoop.net>) id 1IgvPZ-00047g-A9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPY-0005MR-E4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPY-0006sX-F5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPY-0006sX-F5@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:08 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Reconnect timeout must be a number,
	not necessarily an integer
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, 14 Oct 2007 04:53:17 -0000

commit 1b9d78bea251cac82935a12d437bcc1ad23b3ddd
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Tue Aug 14 01:12:52 2007 -0400

    Reconnect timeout must be a number, not necessarily an integer
    
    * erc-backend.el (erc-process-sentinel-2): Improve message for case where
      erc-server-reconnect timeout is t.  Check to see if
      erc-server-reconnect-timeout is a number, rather than an integer.

diff --git a/ChangeLog b/ChangeLog
index b957b34..05aa739 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,7 @@
 	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 integer.
+	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
diff --git a/erc-backend.el b/erc-backend.el
index f4c87e2..73f534a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -635,13 +635,13 @@ EVENT is the message received from the closed connection process."
                                (1+ erc-server-reconnect-count))
                        (message "%s ... %s"
                                 "Reconnecting until we succeed"
-                                "kill the server buffer to stop"))
-                     (if (integerp erc-server-reconnect-timeout)
+                                "kill the ERC server buffer to stop"))
+                     (if (numberp erc-server-reconnect-timeout)
                          (run-at-time erc-server-reconnect-timeout nil
                                       #'erc-process-sentinel-2
                                       event buffer)
                        (error (concat "`erc-server-reconnect-timeout`"
-                                      " must be an integer")))))))))))
+                                      " must be a number")))))))))))
 
 (defun erc-process-sentinel-1 (event buffer)
   "Called when `erc-process-sentinel' has decided that we're disconnecting.



From MAILER-DAEMON Sun Oct 14 00:53:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTf-0000FC-Ft
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTa-00007W-6S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPb-0005HA-A8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPa-0005Gg-Je
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
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@hcoop.net>) id 1IgvPa-000485-3V
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPZ-0005Mj-B8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPZ-0006u2-D1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPZ-0006u2-D1@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:09 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add ChangeLog entry for last 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: Sun, 14 Oct 2007 04:53:18 -0000

commit e258147fd82106b365ebd6ff81acabedfcd379b5
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Aug 15 21:50:37 2007 -0400

    Add ChangeLog entry for last change
    
    * ChangeLog: Add entry for last change.
    
    * erc-track.el (erc-track-list-changed-hook): Turn this into a
      customizable option.

diff --git a/ChangeLog b/ChangeLog
index 40ee342..87426c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2007-08-16  Michael Olson  <mwolson@gnu.org>
+
+	* erc-track.el (erc-track-list-changed-hook): Turn this into a
+	customizable option.
+
+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'.
+
 2007-08-14  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el (erc-server-reconnect): If the server buffer has
diff --git a/erc-track.el b/erc-track.el
index 3cb1206..8c1d3e6 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -157,7 +157,15 @@ If nil instead of a function, shortening is disabled."
   :type '(choice (const :tag "Disabled")
 		 function))
 
-(defvar erc-track-list-changed-hook nil)
+(defcustom erc-track-list-changed-hook nil
+  "Hook that is run whenever the contents of
+`erc-modified-channels-alist' changes.
+
+This is useful for people that don't use the default mode-line
+notification but instead use a separate mechanism to provide
+notification of channel activity."
+  :group 'erc-track
+  :type 'hook)
 
 (defcustom erc-track-use-faces t
   "*Use faces in the mode-line.



From MAILER-DAEMON Sun Oct 14 00:53:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTf-0000Fl-UW
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTb-00009S-QD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTb-00008Z-4N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPh-0005JD-Rj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
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@hcoop.net>) id 1IgvPh-0004AQ-KP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPg-0005PL-Ue
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPh-00076Y-1o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPh-00076Y-1o@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] NEWS: Improve explanation of erc-tls
	and erc-ssl.
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, 14 Oct 2007 04:53:20 -0000

commit 0c09ce580f8b590fa5418a03987764fc3cb4cd26
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 9 21:16:22 2007 -0400

    NEWS: Improve explanation of erc-tls and erc-ssl.
    
    * NEWS: Improve explanation of erc-tls and erc-ssl.

diff --git a/NEWS b/NEWS
index 7a32f9b..483c8b3 100644
--- a/NEWS
+++ b/NEWS
@@ -6,9 +6,10 @@ See the end of the file for license conditions.
 * Changes in ERC 5.3
 
 ** New function `erc-tls' is to be used for connecting to a server via TLS.
-The function `erc-ssl' should never be used for that purpose any
-longer, which was the case with the version of ERC that is included
-with Emacs.
+It requires the tls.el library.
+
+** The function `erc-ssl' will now always use ssl.el, even in the version
+of ERC that comes with Emacs.
 
 ** Changes and additions to modules
 



From MAILER-DAEMON Sun Oct 14 00:53:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTf-0000En-62
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTa-00007T-4h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOh-0004qc-ID
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOf-0004qP-Dv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
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@hcoop.net>) id 1IgvOf-0003sW-3g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOe-00051B-CE
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOe-0005Oe-Fe
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOe-0005Oe-Fe@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:12 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:53:18 -0000

commit d7595db8340d5a452c18f3821831fcb39ba5fd11
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Apr 6 02:28:16 2006 +0000

    Update from CVS
    
    2006-04-05  Diane Murray  <disumu@x3y2z1.net>
    
       * erc.el (erc-cmd-SV): Removed the exclamation point. Show the
       build date as it's shown in `emacs-version'.
    
       * erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
       with the same face property as the previous character.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-153

diff --git a/ChangeLog b/ChangeLog
index f610603..aeb6e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,14 @@
 	detect the existence of the `open-network-stream-nowait' function,
 	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 
+2006-04-05  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
+	build date as it's shown in `emacs-version'.
+
+	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
+	with the same face property as the previous character.
+
 2006-03-27  Michael Olson  <mwolson@gnu.org>
 
 	* erc.texi: Update direntry.  Remove unneeded local variables.
diff --git a/erc-backend.el b/erc-backend.el
index 634e1cc..5f86ea5 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -105,7 +105,7 @@
 
 ;;;; Variables and options
 
-(defconst erc-backend-version "$Revision: 1.46 $")
+(defconst erc-backend-version "$Revision: 1.48 $")
 
 (defvar erc-server-responses (make-hash-table :test #'equal)
   "Hashtable mapping server responses to their handler hooks.")
diff --git a/erc-capab.el b/erc-capab.el
index a857ef3..6dc4584 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -66,7 +66,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-capab-version "$Revision: 1.10 $"
+(defconst erc-capab-version "$Revision: 1.11 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -187,7 +187,9 @@ PARSED is an `erc-parsed' response struct."
                  ;; assuming the first use of `nickname' is the sender's nick
                  (re-search-forward (regexp-quote nickname) nil t))
         (goto-char (match-beginning 0))
-        (insert erc-capab-identify-prefix)))))
+        (insert (erc-propertize erc-capab-identify-prefix
+                                'face (get-char-property (- (point) 1)
+                                                         'face)))))))
 
 (defun erc-capab-find-parsed ()
   "Return the position of text found with the `erc-parsed' property."
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index 518fc73..f8d09ff 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -29,7 +29,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-ezb-version "$Revision: 1.14 $"
+(defconst erc-ezb-version "$Revision: 1.15 $"
   "ERC EZBouncer revision.")
 
 (defgroup erc-ezbounce nil
diff --git a/erc-join.el b/erc-join.el
index 02a7d4d..8691c5f 100644
--- a/erc-join.el
+++ b/erc-join.el
@@ -36,7 +36,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-join-version "$Revision: 1.1 $"
+(defconst erc-join-version "$Revision: 1.2 $"
   "ERC autojoin revision.")
 
 (defgroup erc-autojoin nil
diff --git a/erc-netsplit.el b/erc-netsplit.el
index 5ef9d9e..7a5236b 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -34,7 +34,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-netsplit-version "$Revision: 1.17 $"
+(defconst erc-netsplit-version "$Revision: 1.18 $"
   "ERC netsplit version.")
 
 (defgroup erc-netsplit nil
diff --git a/erc.el b/erc.el
index f076d20..8240f10 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.813 $"
+(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.815 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -3139,7 +3139,7 @@ the message given by REASON."
 
 (defun erc-cmd-SV ()
   "Say the current ERC and Emacs version into channel."
-  (erc-send-message (format "I'm using ERC %s with %s %s (%s%s%s)!"
+  (erc-send-message (format "I'm using ERC %s with %s %s (%s%s) of %s."
 			    erc-version-string
 			    (if (featurep 'xemacs) "XEmacs" "GNU Emacs")
 			    emacs-version
@@ -3162,7 +3162,7 @@ the message given by REASON."
 						      x-toolkit-scroll-bars)))
 			       "")
 			     (if (featurep 'multi-tty) ", multi-tty" ""))
-			    (concat ", built " erc-emacs-build-time)))
+			    erc-emacs-build-time))
   t)
 
 (defun erc-cmd-SM ()



From MAILER-DAEMON Sun Oct 14 00:53:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTe-0000EQ-VZ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTZ-00006w-NY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPb-0005H5-93
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPa-0005Gi-UG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
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@hcoop.net>) id 1IgvPa-00048E-AY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPZ-0005Mp-JS
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPZ-0006uX-MH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPZ-0006uX-MH@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:09 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-track: Allow switching to buffer
	with most important message type first
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, 14 Oct 2007 04:53:18 -0000

commit 2c7ea5ca18101c33f512dc15ba334fe214a5cd74
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Aug 15 23:26:45 2007 -0400

    erc-track: Allow switching to buffer with most important message type first
    
    * erc-track.el (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.

diff --git a/ChangeLog b/ChangeLog
index 87426c9..11c77a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 
 	* 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>
 
diff --git a/erc-track.el b/erc-track.el
index 8c1d3e6..5865257 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -281,12 +281,14 @@ when there are no more active channels."
 (defcustom erc-track-switch-direction 'oldest
   "Direction `erc-track-switch-buffer' should switch.
 
+  importance  -  find buffer with the most important message
   oldest      -  find oldest active buffer
   newest      -  find newest active buffer
   leastactive -  find buffer with least unseen messages
   mostactive  -  find buffer with most unseen messages."
   :group 'erc-track
-  :type '(choice (const oldest)
+  :type '(choice (const importance)
+		 (const oldest)
 		 (const newest)
 		 (const leastactive)
 		 (const mostactive)))
@@ -758,10 +760,11 @@ If FACES are provided, color STRING with them."
   "Set `erc-modified-channels-object'
 according to `erc-modified-channels-alist'.
 Use `erc-make-mode-line-buffer-name' to create buttons."
-  (if (or
-	(eq 'mostactive erc-track-switch-direction)
-	(eq 'leastactive erc-track-switch-direction))
-      (erc-track-sort-by-activest))
+  (cond ((or (eq 'mostactive erc-track-switch-direction)
+	     (eq 'leastactive erc-track-switch-direction))
+	 (erc-track-sort-by-activest))
+	((eq 'importance erc-track-switch-direction)
+	 (erc-track-sort-by-importance)))
   (run-hooks 'erc-track-list-changed-hook)
   (unless (eq erc-track-position-in-mode-line nil)
   (if (null erc-modified-channels-alist)
@@ -917,6 +920,29 @@ That means the number of unseen messages in a channel."
 	(sort erc-modified-channels-alist
 	      (lambda (a b) (> (nth 1 a) (nth 1 b))))))
 
+(defun erc-track-face-priority (face)
+  "Return a number indicating the priority of FACE in
+`erc-track-faces-priority-list'.  Lower number means higher
+priority.
+
+If face is not in `erc-track-faces-priority-list', it will have a
+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)
+	    (throw 'done t)
+	  (setq count (1+ count)))))
+    count))
+
+(defun erc-track-sort-by-importance ()
+  "Sort erc-modified-channels-alist by importance.
+That means the position of the face in `erc-track-faces-priority-list'."
+  (setq erc-modified-channels-alist
+	(sort erc-modified-channels-alist
+	      (lambda (a b) (< (erc-track-face-priority (cddr a))
+			       (erc-track-face-priority (cddr b)))))))
+
 (defun erc-track-get-active-buffer (arg)
   "Return the buffer name of ARG in `erc-modified-channels-alist'.
 Negative arguments index in the opposite direction.  This direction is
@@ -928,7 +954,8 @@ relative to `erc-track-switch-direction'"
 		  (oldest      'newest)
 		  (newest      'oldest)
 		  (mostactive  'leastactive)
-		  (leastactive 'mostactive)))
+		  (leastactive 'mostactive)
+		  (importance  'oldest)))
       (setq arg (- arg)))
     (setq offset (case dir
 		   ((oldest leastactive)



From MAILER-DAEMON Sun Oct 14 00:53:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTf-0000FO-Mn
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTb-00009L-Kl
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTa-00008N-Qn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP2-00053i-Go
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
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@hcoop.net>) id 1IgvP1-0003zP-QK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP0-00058K-Uy
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP1-0005yu-0i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP1-0005yu-0i@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:35 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update CREDITS
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, 14 Oct 2007 04:53:20 -0000

commit 8066dcb2724a94040f1b4c62146caadbe97fdfe1
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Dec 8 04:47:03 2006 +0000

    Update CREDITS
    
    2006-12-08  Michael Olson  <mwolson@gnu.org>
    
    	* CREDITS: Add Juanma Barranquero.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-67

diff --git a/CREDITS b/CREDITS
index 25ffd3b..da7ad34 100644
--- a/CREDITS
+++ b/CREDITS
@@ -141,12 +141,15 @@ Eric Hanchrow <offby1@blarg.net>:
 John J Foerch <jjfoerch@earthlink.net>
   * Fix bug with movement around right timestamps (2 lines changed).
 
-ukasz Demianiuk  <ldemianiuk@gmail.com>:
+ukasz Demianiuk <ldemianiuk@gmail.com>:
   * Fix bug in erc-header-line (1 line changed).
 
 Andrea Russo <rastandy@inventati.org>:
   * Fixed wrong type argument bug in erc-dcc (1 line changed).
 
+Juanma Barranquero <lekktu@gmail.com>:
+  * Vetted the inline documentation and provided many fixes.
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
diff --git a/ChangeLog b/ChangeLog
index 4b5b955..6443029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-08  Michael Olson  <mwolson@gnu.org>
+
+	* CREDITS: Add Juanma Barranquero.
+
 2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.



From MAILER-DAEMON Sun Oct 14 00:53:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTh-0000H3-Ah
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTc-0000Ah-Rc
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTc-00009y-5h
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPh-0005JB-BY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
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@hcoop.net>) id 1IgvPh-0004AC-3M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPg-0005P9-Cd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPg-00075Y-DR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPg-00075Y-DR@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:16 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add ability to specify a "filter
	function" for logging
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, 14 Oct 2007 04:53:21 -0000

commit f0aaf9083b3f18d75fbcdf685a07a772c8ae5d69
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Sep 8 02:23:44 2007 -0400

    Add ability to specify a "filter function" for logging
    
    * 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.

diff --git a/ChangeLog b/ChangeLog
index c3abd83..b332c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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>
diff --git a/erc-log.el b/erc-log.el
index 856f1dc..1733b3d 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -205,6 +205,16 @@ This should ideally, be a \"catch-all\" coding system, like
 `emacs-mule', or `iso-2022-7bit'."
   :group 'erc-log)
 
+(defcustom erc-log-filter-function nil
+  "*If non-nil, pass text through the given function before writing it to
+a log file.
+
+The function should take one argument, which is the text to filter."
+  :group 'erc-log
+  :type '(choice (function "Function")
+		 (const :tag "No filtering" nil)))
+
+
 ;;;###autoload (autoload 'erc-log-mode "erc-log" nil t)
 (define-erc-module log nil
   "Automatically logs things you receive on IRC into files.
@@ -405,17 +415,25 @@ You can save every individual message by putting this function on
   (or buffer (setq buffer (current-buffer)))
   (when (erc-logging-enabled buffer)
     (let ((file (erc-current-logfile buffer))
-	  (coding-system-for-write erc-log-file-coding-system))
+	  (coding-system erc-log-file-coding-system))
       (save-excursion
 	(with-current-buffer buffer
 	  (save-restriction
 	    (widen)
-	    ;; early on in the initalisation, don't try and write the log out
+	    ;; early on in the initialization, don't try and write the log out
 	    (when (and (markerp erc-last-saved-position)
 		       (> erc-insert-marker (1+ erc-last-saved-position)))
-	      (write-region (1+ (marker-position erc-last-saved-position))
-			    (marker-position erc-insert-marker)
-			    file t 'nomessage)
+	      (let ((start (1+ (marker-position erc-last-saved-position)))
+		    (end (marker-position erc-insert-marker)))
+		(if (functionp erc-log-filter-function)
+		    (let ((text (buffer-substring start end)))
+		      (with-temp-buffer
+			(insert (funcall erc-log-filter-function text))
+			(let ((coding-system-for-write coding-system))
+			  (write-region (point-min) (point-max)
+					file t 'nomessage))))
+		  (let ((coding-system-for-write coding-system))
+		    (write-region start end file t 'nomessage))))
 	      (if (and erc-truncate-buffer-on-save (interactive-p))
 		  (progn
 		    (let ((inhibit-read-only t)) (erase-buffer))



From MAILER-DAEMON Sun Oct 14 00:53:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTh-0000HL-MR
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTe-0000Cx-Oi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTd-0000B2-6K
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPh-0005JC-JF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
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@hcoop.net>) id 1IgvPh-0004AM-CJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPg-0005PF-Mf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPg-000761-Oj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPg-000761-Oj@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:16 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] NEWS: Improve explanation of erc-tls
	and erc-ssl.
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, 14 Oct 2007 04:53:24 -0000

commit 798deed2d50f2505401093bbdd222d5e54e6b9e9
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Sep 9 21:16:22 2007 -0400

    NEWS: Improve explanation of erc-tls and erc-ssl.
    
    * NEWS: Improve explanation of erc-tls and erc-ssl.

diff --git a/NEWS b/NEWS
index 409dcf0..53b595a 100644
--- a/NEWS
+++ b/NEWS
@@ -6,9 +6,10 @@ See the end of the file for license conditions.
 * Changes in ERC 5.3
 
 ** New function `erc-tls' is to be used for connecting to a server via TLS.
-The function `erc-ssl' should never be used for that purpose any
-longer, which was the case with the version of ERC that is included
-with Emacs.
+It requires the tls.el library.
+
+** The function `erc-ssl' will now always use ssl.el, even in the version
+of ERC that comes with Emacs.
 
 ** Changes and additions to modules
 



From MAILER-DAEMON Sun Oct 14 00:53:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTj-0000Jp-S3
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTg-0000GX-Hw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTe-0000D3-79
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPf-0005J2-VL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPe-00049H-VF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPe-0005OL-1X
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPe-00071Y-1u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPe-00071Y-1u@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update version string to 5.3 (devel)
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, 14 Oct 2007 04:53:26 -0000

commit b459923cc9aca407744f8e831fb897005806257c
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:49:15 2007 -0400

    Update version string to 5.3 (devel)
    
    * erc.el (erc-version-string): Update to 5.3, development version.

diff --git a/ChangeLog b/ChangeLog
index 7342a05..1a495f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-08  Michael Olson  <mwolson@gnu.org>
+
+	* 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
diff --git a/erc.el b/erc.el
index e62df39..222a1e2 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.2"
+(defconst erc-version-string "Version 5.3 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:53:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTk-0000K7-D1
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTi-0000IG-KM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTg-0000F5-6f
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPg-0005J6-GJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPf-00049c-M5
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPe-0005OZ-Jd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPe-00072Y-LA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPe-00072Y-LA@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] NEWS: Mention erc-tls function
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, 14 Oct 2007 04:53:27 -0000

commit 7f2c151553bf5ebe389b5b6cd7fcc4cf744764c7
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:56:24 2007 -0400

    NEWS: Mention erc-tls function

diff --git a/NEWS b/NEWS
index 0a2978a..409dcf0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,11 @@ See the end of the file for license conditions.
 
 * Changes in ERC 5.3
 
+** New function `erc-tls' is to be used for connecting to a server via TLS.
+The function `erc-ssl' should never be used for that purpose any
+longer, which was the case with the version of ERC that is included
+with Emacs.
+
 ** Changes and additions to modules
 
 *** Channel tracking (erc-track.el)



From MAILER-DAEMON Sun Oct 14 00:53:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTm-0000Lx-MG
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTk-0000Jh-9u
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTh-0000Gr-D8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPf-0005J3-WA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPe-00049C-KK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPd-0005OD-LF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPd-000713-OD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPd-000713-OD@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:13 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update version string to 5.3 (devel)
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, 14 Oct 2007 04:53:28 -0000

commit def09b1ef65d06523d21eb2d8dcf789e53f5b39e
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:49:15 2007 -0400

    Update version string to 5.3 (devel)
    
    * erc.el (erc-version-string): Update to 5.3, development version.

diff --git a/ChangeLog b/ChangeLog
index 89e983c..1f40953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-08  Michael Olson  <mwolson@gnu.org>
+
+	* 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
diff --git a/erc.el b/erc.el
index 5199a2b..2c5786a 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.2"
+(defconst erc-version-string "Version 5.3 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:53:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTm-0000M1-Ro
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPf-0005In-0M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPW-0005CT-8Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPW-0005CN-5I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
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@hcoop.net>) id 1IgvPT-00045W-HO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPP-0005Hx-TK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPP-0006dw-V3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:00 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPP-0006dw-V3@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:59 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Trivial change to test CIA.vc
	integration
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, 14 Oct 2007 04:53:29 -0000

commit 89940be2f716d68faf06e6ef071e23e5ae92b5eb
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 22 21:58:45 2007 +0000

    Trivial change to test CIA.vc integration
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-142

diff --git a/README b/README
index 6c56123..5756e6f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-This is the README file for ERC.
+This is the README file for ERC. 
 
 ERC is a powerful, modular, and extensible IRC client for Emacs.
 



From MAILER-DAEMON Sun Oct 14 00:53:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTe-0000D8-6o
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTW-0008UN-OM
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPb-0005HT-RZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPa-0005Go-UK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
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@hcoop.net>) id 1IgvPa-00048H-Kq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPZ-0005Mv-Tn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPZ-0006v2-VF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPZ-0006v2-VF@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:09 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] NEWS: Begin adding ERC 5.3 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: Sun, 14 Oct 2007 04:53:15 -0000

commit a153652009cbdbe3ca93037531d8f46b04f3b8fe
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Thu Aug 16 09:23:22 2007 -0400

    NEWS: Begin adding ERC 5.3 changes
    
    * NEWS: Add ERC 5.3 changes section, and mention jbms' erc-track
      compatibility note.

diff --git a/ChangeLog b/ChangeLog
index 11c77a2..e06fd56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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.
diff --git a/NEWS b/NEWS
index b7aa0b1..9fc24d2 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,17 @@ ERC NEWS                                                       -*- outline -*-
 Copyright (C) 2006, 2007  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in ERC 5.3
+
+** Changes and additions to modules
+
+*** 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".
+
 * Changes in ERC 5.2
 
 ** M-x erc RET now starts ERC.



From MAILER-DAEMON Sun Oct 14 00:53:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTp-0000PR-Tw
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTl-0000LE-Q1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTk-0000Jv-9P
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPf-0005Is-97
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
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@hcoop.net>) id 1IgvPe-000496-6l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPc-0005O1-Vz
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPd-000703-0N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPd-000703-0N@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:13 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Sync from Emacs trunk
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, 14 Oct 2007 04:53:30 -0000

commit 66f1dd9702273cdcd34c51d6e5ae04ab96ac5d11
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:08:16 2007 -0400

    Sync from Emacs trunk

diff --git a/ChangeLog b/ChangeLog
index 0a1e009..7342a05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/erc-log.el b/erc-log.el
index e0f5669..856f1dc 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -280,7 +280,7 @@ The current buffer is given by BUFFER."
 
 (defun erc-log-all-but-server-buffers (buffer)
   "Returns t if logging should be enabled in BUFFER.
-Returns nil iff `erc-server-buffer-p' returns t."
+Returns nil if `erc-server-buffer-p' returns t."
   (save-excursion
     (save-window-excursion
       (set-buffer buffer)
diff --git a/erc.el b/erc.el
index f14ea52..e62df39 100644
--- a/erc.el
+++ b/erc.el
@@ -4031,7 +4031,7 @@ and always returns t."
 (defun erc-echo-notice-in-target-buffer (s parsed buffer sender)
   "Echos a private notice in BUFFER, if BUFFER is non-nil.  This
 function is designed to be added to either `erc-echo-notice-hook'
-or `erc-echo-notice-always-hook', and returns non-nil iff BUFFER
+or `erc-echo-notice-always-hook', and returns non-nil if BUFFER
 is non-nil."
   (if buffer
       (progn (erc-display-message parsed nil buffer s) t)
@@ -4055,7 +4055,7 @@ designed to be added to either `erc-echo-notice-hook' or
   "Echos a private notice in the active buffer if the active
 buffer is not the server buffer.  This function is designed to be
 added to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff the active
+`erc-echo-notice-always-hook', and returns non-nil if the active
 buffer is not the server buffer."
   (if (not (eq (erc-server-buffer) (erc-active-buffer)))
       (progn (erc-display-message parsed nil 'active s) t)
@@ -4072,7 +4072,7 @@ designed to be added to either `erc-echo-notice-hook' or
   "Echos a private notice in all of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
 sender is a member.
 
 See also: `erc-echo-notice-in-first-user-buffer',
@@ -4086,7 +4086,7 @@ See also: `erc-echo-notice-in-first-user-buffer',
   "Echos a private notice in BUFFER and in all of the buffers for
 which SENDER is a member.  This function is designed to be added
 to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff there is
+`erc-echo-notice-always-hook', and returns non-nil if there is
 at least one buffer for which the sender is a member or the
 default target.
 
@@ -4102,7 +4102,7 @@ See also: `erc-echo-notice-in-user-buffers',
   "Echos a private notice in one of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
 sender is a member.
 
 See also: `erc-echo-notice-in-user-buffers',
@@ -5041,7 +5041,7 @@ Specifically, return the position of `erc-insert-marker'."
 (defun erc-send-input (input)
   "Treat INPUT as typed in by the user. It is assumed that the input
 and the prompt is already deleted.
-This returns non-nil only iff we actually send anything."
+This returns non-nil only if we actually send anything."
   ;; Handle different kinds of inputs
   (cond
    ;; Ignore empty input



From MAILER-DAEMON Sun Oct 14 00:53:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTq-0000Pj-7e
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTm-0000Lv-L4
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTl-0000Kt-EK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPf-0005Ir-91
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
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@hcoop.net>) id 1IgvPe-000492-0I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPc-0005Nt-Jq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPc-0006zY-N9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPc-0006zY-N9@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:12 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Add files from master to make
	merging easier
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, 14 Oct 2007 04:53:31 -0000

commit d8604c2e1891a80e148ad5ea67311a7d711e3727
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:11:51 2007 -0400

    Add files from master to make merging easier

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..41ec666
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,21 @@
+algernon    Gergely Nagy <algernon@debian.org>
+anaran      Adrian Aichner <adrian@xemacs.org>
+antifuchs   Andreas Fuchs <asf@void.at>
+benj2       Benjamin Drieu <benj@debian.org>
+bojohan     Johan Bockgard <bojohan@users.sourceforge.net>
+bpalmer     Brian Palmer <bpalmer@gmail.com>
+disumu      Diane Murray <disumu@x3y2z1.net>
+forcer      Jorgen Schaefer <forcer@forcix.cx>
+franl       Francis Litterio <franl@users.sourceforge.net>
+hober       Edward O'Connor <ted@oconnor.cx>
+jbms        Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+jwiegley    John Wiegley <johnw@gnu.org>
+kensanata   Alex Schroeder <alex@gnu.org>
+mlang       Mario Lang <mlang@delysid.org>
+mtoledo     Marcelo Toledo <marcelo@marcelotoledo.org>
+mwolson     Michael Olson <mwolson@gnu.org>
+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>
+wence       Lawrence Mitchell <wence@gmx.li>
diff --git a/HACKING b/HACKING
new file mode 100644
index 0000000..149bb4d
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,99 @@
+* Hacking on ERC 101                                            -*- outline -*-
+
+* Function/variable naming conventions
+
+The Emacs Lisp manual has some good advice on coding conventions
+(info "(elisp)Tips").  Remember, above all, that Emacs does not have a
+package system, so prefix all global variables/functions with `erc-'.
+If you have a macro that follows the standard `with-foo' pattern, or
+`define-foo' pattern, you can probably get away with naming it without
+a prefix, should it not conflict with an existing symbol, it's
+probably a good idea to have `erc' somewhere in the name.  For
+example:
+
+  Good:
+   
+    (defun erc-foo-p (...) ...)
+
+    (defmacro with-erc-foo (...) ...)
+
+    (defmacro define-erc-foo (...) ...)
+
+    (defvar erc-frob-foo ...)
+
+  Bad:
+
+    (defun foo-p (...) ...)
+
+    (defmacro with-foo (...) ...)
+
+    (defmacro define-foo (...) ...)
+
+    (defvar frob-foo ...)
+
+* ChangeLog Entries
+
+ERC's ChangeLog entries are *no longer* generated automatically from
+the CVS logs.  As such, please try to update the `ChangeLog' file
+every time you commit a change.
+
+The GNU Coding Standards have some good tips for writing ChangeLog
+entries: http://www.gnu.org/prep/standards_40.html#SEC40
+
+Emacs has modes to alleviate the writing of entries, see the info
+nodes:
+  (info "(emacs)Change Log")
+and
+  (info "(emacs)Change Logs and VC")
+
+* NEWS entries
+
+We maintain a list of user-visible changes between versions in the
+file NEWS.  This should be of the same form as the Emacs NEWS file
+(viewable, as an example, via C-h n (view-emacs-news)).  This file
+should not document internal changes, only ones which show their faces
+to the outside world.
+
+* Documentation
+
+If you add a new function or variable, or change an existing one,
+please add a docstring describing what it does.  Again, there are
+certain conventions to follow which are detailed at length in:
+
+  (info "(elisp)Tips")
+
+The most important:
+
+** Docstrings
+
+Each function should have a docstring summarising what the function
+does.  The first line should be able to stand on its own (for
+apropos).  You should generally try and use the imperative form in
+docstrings.  e.g. "Return non-nil if...", rather than "Returns
+non-nil if..."
+Similarly, variables should have a docstring describing what the
+variable controls, and what different values mean.  User-visible
+variables should start the docstring with a "*".  Again, the first
+sentence should stand on its own as a description of the variable
+(for apropos and eldoc-mode).
+
+** Function arguments
+
+Arguments should, where possible, have descriptive names.  This is
+especially useful for those of us who use eldoc-mode.  Note also,
+that, since elisp is a lisp-2, we can call an argument which is a
+list "list", rather than "lst", or some other lisp-1ism.
+
+You can catch a lot of these problems if you use checkdoc.  M-x
+checkdoc-defun RET on a function will pick up on most errors.
+
+* Other conventions
+
+Compatibility functions for Emacs/XEmacsisms should go in erc-compat,
+and be prefixed with `erc-'.
+
+ERC modules should be defined with `define-erc-module'.
+
+Some of the code in ERC is rather crufty, and could do with cleaning
+up, don't necessarily take all of it as being a wonderful example of
+coding standards.
diff --git a/HISTORY b/HISTORY
new file mode 100644
index 0000000..655e3b1
--- /dev/null
+++ b/HISTORY
@@ -0,0 +1,35 @@
+History of ERC development:
+---------------------------
+
+ERC was originally written by Alexander L. Belikoff (abel@bfr.co.il) and
+Sergey Berezin (sergey.berezin@cs.cmu.edu).  They stopped development
+around December 1999.  Their last released version was ERC 2.0.
+
+In June 2001, Mario Lang (mlang@delysid.org) and Alex Schroeder (alex@gnu.org)
+took over development and created a ERC Project at sourceforge.net.
+
+In reaction to a mail about the new ERC development effort,
+Sergey Berezin said, "First of all, I'm glad that my version of ERC is
+being used out there.  The thing is, I do not have free time and
+enough incentive anymore to work on ERC, so I would be happy if
+you guys take over the project entirely."
+
+So we happily hacked away on ERC, and soon after (September 2001)
+released the next "stable" version, 2.1.
+
+Most of the development of the new ERC happend on #emacs on
+irc.openprojects.net.  Over time, many people contributed code, ideas,
+bugfixes, and a lot of alpha/beta/gamma testing.
+
+In 2005, Michael Olson (mwolson@gnu.org) became the release manager,
+and later, the maintainer.  After some discussion between him and the
+Emacs developers, it was decided to include ERC in Emacs.
+
+With the release of ERC 5.1, ERC was included with Emacs 22.  It
+became an official GNU project, and development moved to Savannah
+(http://sv.gnu.org/projects/erc).
+
+See the file CREDITS for a list of contributors.
+
+P.S.: If one of the original developers of ERC reads this, we'd like to receive
+additional information for this file and hear comments in general.
diff --git a/README b/README
new file mode 100644
index 0000000..6c56123
--- /dev/null
+++ b/README
@@ -0,0 +1,61 @@
+
+This is the README file for ERC.
+
+ERC is a powerful, modular, and extensible IRC client for Emacs.
+
+Installation
+------------
+
+Type `make install'.  This will compile all the emacs-lisp files and
+install them in the directory /usr/local/share/emacs/site-lisp/erc.
+The info manual will be installed to /usr/local/info.  You'll most
+likely need to be the root user to install to these locations.
+
+If you wish to install to someplace else, edit the PREFIX, ELISPDIR,
+and/or INFODIR options in Makefile.
+
+QuickStart
+-----------
+
+Put all the files in your load-path[0], and add the following to your
+~/.emacs:
+
+(require 'erc)
+
+[0] Don't know what a load path is? See:
+http://www.emacswiki.org/cgi-bin/wiki.pl?LoadPath
+
+Usage
+-----
+
+Use M-x erc to connect to a server.  You can connect to multiple
+servers.
+
+Customization
+-------------
+
+Use M-x customize-group RET erc RET to get an overview of all the
+variables you can tweak.
+
+Documentation
+-------------
+
+ERC comes with a manual.  Type `make doc' to get the HTML and Info
+versions of it.
+
+Additional documentation is kept on the Emacs Wiki, and may be added
+to by anyone.
+
+* http://www.emacswiki.org/cgi-bin/wiki/ERC
+
+License information
+-------------------
+
+ERC is available under the terms of the GNU General Public License.
+See the file `COPYING' for details.
+
+The following copyright notice applies to each of the images contained
+in the `images' directory.
+
+Copyright (C) 2006 Free Software Foundation.
+This image may be used, distributed, and modified without restriction.
diff --git a/erc-maint.el b/erc-maint.el
new file mode 100644
index 0000000..bae42bc
--- /dev/null
+++ b/erc-maint.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path ".")
+
+;; arch-tag: 977c5231-16c4-46d2-88f0-90abe5a79ba1
diff --git a/servers.pl b/servers.pl
new file mode 100755
index 0000000..2d3f8d2
--- /dev/null
+++ b/servers.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2002 Free Software Foundation, Inc.
+
+# Convert mIRC's servers.ini to a elisp structure.
+# Get the file from http://www.mirc.co.uk/servers.ini
+
+# TODO: We need a separate file where we can store regexp/functions
+# to match a erc-server-announced-name against a erc-networks-alist entry.
+# For sanity, we'df need a lookup procedure here, and insert the
+# regexp/function instead of the nil value in the erc-networks-alist.
+#
+# There is a error somehow in the servers.ini. There are two
+# undernets, undernet and Undernet. They are the same though.
+# So we'd need to unify them somehow (change case)?
+
+print "(defcustom erc-server-alist\n'(\n";
+while (<>) {
+    if(($sname, $shost, $sport, $grp) = $_ =~ /^n\d+=(.*)SERVER:(.*):(.*)GROUP:(.*)/){
+  $groups{$grp}+=1;
+  @ports = split ",", $sport;
+  print "  (\"$sname\" '$grp \"$shost\" ";
+  if ($#ports==0) {
+      if (($p1,$p2)=$sport=~/(\d+)-(\d+)/) {
+	  print "(($p1 $p2))";}
+      else {
+	  print $sport;
+      }
+  }
+  else {
+      print "(";
+      foreach $port (@ports) {
+	  if (($p1,$p2)=$port=~/(\d+)-(\d+)/) {
+	      print "($p1 $p2) ";}
+	  else {
+	      print $port." ";
+	  }
+      }
+      print ")";
+  }
+  print ")\n";
+}
+}
+print ")\n  \"Server Alist\"\n  :group 'erc\n  :type 'sexp)\n\n";
+
+print "(defcustom erc-networks-alist\n'(\n";
+foreach $grp (sort(keys(%groups))) {
+    print "  ($grp nil)\n";
+}
+print ")\n  \"Network alist\"\n  :group 'erc\n  :type 'sexp)\n";



From MAILER-DAEMON Sun Oct 14 00:53:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTq-0000QE-I7
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-000522-5N
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOY-0004ik-FQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOW-0004i6-8s
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:04 -0400
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@hcoop.net>) id 1IgvOV-0003oZ-S6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOV-0004xd-6n
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOV-000587-8l
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOV-000587-8l@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:03 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:53:31 -0000

commit 5b8b531c469514a738472e9265cbc0bce00924e9
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Feb 15 05:10:34 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-120

diff --git a/erc.el b/erc.el
index 7aefb6e..39ae6cc 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.807 $"
+(defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.808 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))



From MAILER-DAEMON Sun Oct 14 00:53:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTr-0000RE-1q
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-00052G-Sf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOf-0004lX-UR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOZ-0004ka-9a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
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@hcoop.net>) id 1IgvOZ-0003qL-16
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOY-0004yo-8J
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOY-0005Dc-AV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOY-0005Dc-AV@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] erc-capab: Fix compiler warning.
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, 14 Oct 2007 04:53:31 -0000

commit 81929e788ea7e0c7b7c30ea6aa2cad31d3521c78
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Feb 26 07:05:26 2006 +0000

    erc-capab: Fix compiler warning.
    
    * erc-capab.el (erc-capab-unidentified): Fix compiler warning by
      specifying group.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-131

diff --git a/ChangeLog b/ChangeLog
index d9b2875..2638057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc-capab.el (erc-capab-unidentified): Fix compiler warning by
+	specifying group.
+
 2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
diff --git a/erc-capab.el b/erc-capab.el
index 36802f3..02cca05 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -89,7 +89,8 @@
 
 (defface erc-capab-unidentified
   '((t :inherit highlight))
-  "Face for displaying users who haven't identified with NickServ.")
+  "Face for displaying users who haven't identified with NickServ."
+  :group 'erc-faces)
 
 ;;; Define module:
 



From MAILER-DAEMON Sun Oct 14 00:53:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTr-0000Ry-Jg
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTo-0000Nd-1M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTn-0000MD-07
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPg-0005J7-GQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPf-00049f-Sk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPe-0005Of-SP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPe-000732-UU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPe-000732-UU@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] NEWS: Mention erc-tls function
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, 14 Oct 2007 04:53:32 -0000

commit e243b7eb5a4f30c241f69c64e09e6b1e1d051f49
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:56:24 2007 -0400

    NEWS: Mention erc-tls function

diff --git a/NEWS b/NEWS
index 9fc24d2..7a32f9b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,11 @@ See the end of the file for license conditions.
 
 * Changes in ERC 5.3
 
+** New function `erc-tls' is to be used for connecting to a server via TLS.
+The function `erc-ssl' should never be used for that purpose any
+longer, which was the case with the version of ERC that is included
+with Emacs.
+
 ** Changes and additions to modules
 
 *** Channel tracking (erc-track.el)



From MAILER-DAEMON Sun Oct 14 00:53:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTr-0000RU-7Y
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPf-0005J0-RA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPY-0005EK-ER
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Ds-1T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPV-00045q-Tf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPO-0005HM-Ga
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPO-0006bR-II
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:58 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPO-0006bR-II@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:58 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Merged from erc--rel--5.2
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, 14 Oct 2007 04:53:32 -0000

commit 4c228b6dc46e92c5b23056b23badbe7671ec23d8
Merge: 3a96136... bf6f3b5...
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 18:50:42 2007 +0000

    Merged from erc--rel--5.2
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--rel--5.2--patch-18
       Makefile: Run linda as well as lintian
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-137




From MAILER-DAEMON Sun Oct 14 00:53:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTs-0000Td-VQ
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTp-0000Oz-Ii
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTo-0000OU-Pb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPg-0005J9-P3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPg-00049y-Ha
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPf-0005Ox-Oe
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPf-00074W-Ql
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPf-00074W-Ql@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:15 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make sure ChangeLog files get copied
	when syncing to 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: Sun, 14 Oct 2007 04:53:33 -0000

commit 289fbdddc822a7e7271b50b0dd485949ddf9e9ec
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Sep 8 00:02:49 2007 -0400

    Make sure ChangeLog files get copied when syncing to Emacs
    
    * scripts/sync-to-emacs: Copy over ChangeLog files.

diff --git a/scripts/sync-to-emacs b/scripts/sync-to-emacs
index a2f5b4b..19324c8 100755
--- a/scripts/sync-to-emacs
+++ b/scripts/sync-to-emacs
@@ -19,4 +19,5 @@ for i in $IMAGES; do
     :
 done
 
+cp ChangeLog* $EMACS/lisp/erc
 cp $NEWS $EMACS/etc/ERC-NEWS



From MAILER-DAEMON Sun Oct 14 00:53:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTt-0000U0-52
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTp-0000P3-JR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTo-0000OI-Pp
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPf-0005J1-VA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPf-00049X-8e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPe-0005OT-96
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPe-000723-CR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPe-000723-CR@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix syntax error in sync-to-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: Sun, 14 Oct 2007 04:53:34 -0000

commit 1a7a2d84b59c1f3573619d6aac1d4d83295006cf
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:51:57 2007 -0400

    Fix syntax error in sync-to-emacs
    
    * scripts/sync-to-emacs: Fix syntax error.

diff --git a/scripts/sync-to-emacs b/scripts/sync-to-emacs
index 9ce9659..a2f5b4b 100755
--- a/scripts/sync-to-emacs
+++ b/scripts/sync-to-emacs
@@ -16,6 +16,7 @@ done
 
 for i in $IMAGES; do
     # Do nothing
+    :
 done
 
 cp $NEWS $EMACS/etc/ERC-NEWS



From MAILER-DAEMON Sun Oct 14 00:53:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTt-0000UL-Dz
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-000523-4d
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004tW-JY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOh-0004tC-JV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
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@hcoop.net>) id 1IgvOh-0003tN-BB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:15 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOg-00051y-Ju
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOg-0005Sc-MB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOg-0005Sc-MB@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:14 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update the upload rule in Makefile.
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, 14 Oct 2007 04:53:34 -0000

commit 9f0a44f740d9975fbec1b8e16a12542b178fae02
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Jun 3 18:08:22 2006 +0000

    Update the upload rule in Makefile.
    
    * Makefile (upload): Make this work for Savannah uploads.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-3

diff --git a/ChangeLog b/ChangeLog
index 818612b..1dcc503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-06-03  Michael Olson  <mwolson@gnu.org>
 
+	* Makefile (upload): Make this work for Savannah uploads.
+
 	* AUTHORS: Update for Savannah move.  No old entries have been
 	removed, in case people have not registered yet on Savannah.
 
diff --git a/Makefile b/Makefile
index b986520..89f3560 100644
--- a/Makefile
+++ b/Makefile
@@ -146,10 +146,12 @@ release: autoloads distclean
 	  zip -r erc-$(VERSION).zip erc-$(VERSION))
 
 upload:
-	(cd .. && echo open ftp://upload.sourceforge.net > upload.lftp ; \
-	  echo cd /incoming >> upload.lftp ; \
-	  echo mput erc-$(VERSION).zip >> upload.lftp ; \
-	  echo mput erc-$(VERSION).tar.gz >> upload.lftp ; \
+	(cd .. && gpg --detach erc-$(VERSION).tar.gz && \
+	  gpg --detach erc-$(VERSION).zip && \
+	  echo open ftp://savannah.nongnu.org > upload.lftp ; \
+	  echo cd /incoming/savannah/erc >> upload.lftp ; \
+	  echo mput erc-$(VERSION).zip* >> upload.lftp ; \
+	  echo mput erc-$(VERSION).tar.gz* >> upload.lftp ; \
 	  echo close >> upload.lftp ; \
 	  lftp -f upload.lftp ; \
 	  rm -f upload.lftp)



From MAILER-DAEMON Sun Oct 14 00:53:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTt-0000V0-RG
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTr-0000RS-7f
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTq-0000Q2-El
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPg-0005JA-Vr
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:17 -0400
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@hcoop.net>) id 1IgvPg-0004A3-Pv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPg-0005P3-1L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPg-000753-4f
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPg-000753-4f@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:16 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix a few minor whitespace issues
	and a forgotten fix to the manual
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, 14 Oct 2007 04:53:35 -0000

commit c44f53d4e76fee799a0acc55a95376bcd379f207
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sat Sep 8 00:03:55 2007 -0400

    Fix a few minor whitespace issues and a forgotten fix to the manual
    
    * erc.el (erc-setup-buffer): Minor indentation fix to match Emacs trunk.
    
    * erc.texi (Top): Remove one space to match Emacs trunk.
      (Modules): Fix completion and hecomplete entries, which somehow never
      got back upstream.

diff --git a/ChangeLog b/ChangeLog
index 1a495f0..c3abd83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -237,6 +237,10 @@
 	* 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.
diff --git a/erc.el b/erc.el
index 222a1e2..d8459dc 100644
--- a/erc.el
+++ b/erc.el
@@ -1908,7 +1908,7 @@ removed from the list will be disabled."
 				  default-frame-alist)))
 	 (switch-to-buffer buffer)
 	 (when erc-frame-dedicated-flag
-	     (set-window-dedicated-p (selected-window) t))))
+	   (set-window-dedicated-p (selected-window) t))))
 	(t
 	 (if (active-minibuffer-window)
 	     (display-buffer buffer)
diff --git a/erc.texi b/erc.texi
index a803ff1..405082e 100644
--- a/erc.texi
+++ b/erc.texi
@@ -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
@@ -561,7 +561,8 @@ Buttonize URLs, nicknames, and other text
 Mark unidentified users on freenode and other servers supporting CAPAB.
 
 @cindex modules, completion
-@item pcomplete
+@cindex modules, pcomplete
+@item completion (aka pcomplete)
 Complete nicknames and commands (programmable)
 
 @cindex modules, fill
@@ -569,7 +570,7 @@ Complete nicknames and commands (programmable)
 Wrap long lines
 
 @cindex modules, hecomplete
-@item completion
+@item hecomplete
 Complete nicknames and commands (old).  This is the old module---you
 might prefer the ``completion'' module instead.
 



From MAILER-DAEMON Sun Oct 14 00:53:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTx-0000a1-2m
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTu-0000Ve-3g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTr-0000SG-Py
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPg-0005J5-GI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPg-00049k-09
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPf-0005Ol-5g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPf-00073Y-7P
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPf-00073Y-7P@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:15 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] manual: Fix reference 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: Sun, 14 Oct 2007 04:53:38 -0000

commit dd6d46e20013864e7c9ebf334cfb86739010f96b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 23:01:56 2007 -0400

    manual: Fix reference bug
    
    * erc.texi (Top): Add Copying.
      (History): Fix bad next reference.

diff --git a/erc.texi b/erc.texi
index 2e23ade..3ff8fce 100644
--- a/erc.texi
+++ b/erc.texi
@@ -68,6 +68,10 @@ and modified without restriction.
 * Advanced Usage::              Cool ways of using ERC.
 * Getting Help and Reporting Bugs::  
 * History::                     The history of ERC.
+* Copying::                     The GNU General Public License gives you
+                                  permission to redistribute ERC on
+                                  certain terms; it also explains that
+                                  there is no warranty.
 * GNU Free Documentation License:: The license for this documentation.
 * Concept Index::               Search for terms.
 
@@ -945,7 +949,7 @@ questions.
 @end itemize
 
 
-@node History, GNU Free Documentation License, Getting Help and Reporting Bugs, Top
+@node History, Copying, Getting Help and Reporting Bugs, Top
 @comment  node-name,  next,  previous,  up
 @chapter History
 @cindex history, of ERC



From MAILER-DAEMON Sun Oct 14 00:53:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTw-0000Zk-TS
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-00052H-T3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOh-0004r3-T6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOe-0004q8-H2
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
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@hcoop.net>) id 1IgvOe-0003s5-7A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOd-00050t-Gw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOd-0005N9-JI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOd-0005N9-JI@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:11 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Minor manual tweak.
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, 14 Oct 2007 04:53:37 -0000

commit 3980ff84314f6106afa71574179a6d5b23f64df7
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Mar 27 17:51:23 2006 +0000

    Minor manual tweak.
    
    * erc.texi: Update direntry.  Remove unneeded local variables.
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-150

diff --git a/ChangeLog b/ChangeLog
index a8b49e3..f41fedc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi: Update direntry.  Remove unneeded local variables.
+
 2006-03-26  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-header-line): New face that will be used to colorize
diff --git a/erc.texi b/erc.texi
index 6793a32..e1fb8b6 100644
--- a/erc.texi
+++ b/erc.texi
@@ -6,7 +6,7 @@
 
 @dircategory Emacs
 @direntry
-* ERC: (erc). Full-featured IRC client for Emacs.
+* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
 @end direntry
 
 @syncodeindex fn cp
@@ -1435,10 +1435,6 @@ to permit their use in free software.
 
 @bye
 
-@c Local Variables:
-@c ispell-local-pdict: "ispell-dict"
-@c End:
-
 @ignore
    arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
 @end ignore



From MAILER-DAEMON Sun Oct 14 00:53:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTx-0000aa-9d
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-000525-5v
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOl-0004vV-Jf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOk-0004vG-7K
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
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@hcoop.net>) id 1IgvOj-0003uE-Vh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:18 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOj-00052q-9A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOj-0005XA-CC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOj-0005XA-CC@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:17 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update maintainer information.
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, 14 Oct 2007 04:53:39 -0000

commit 4917760a4e2e1b04baea6b0279918e0c3c46474c
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Jun 27 07:10:10 2006 +0000

    Update maintainer information.
    
    * erc.el: Update maintainer information and URLs.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-12

diff --git a/ChangeLog b/ChangeLog
index 353f2ce..920fb2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el: Update maintainer information and URLs.
+
 2006-06-21  Michael Olson  <mwolson@gnu.org>
 
 	* Makefile (upload): Make this work with the GNU upload system.
diff --git a/erc.el b/erc.el
index a87aae2..171123d 100644
--- a/erc.el
+++ b/erc.el
@@ -11,7 +11,7 @@
 ;;               Andreas Fuchs (afs@void.at)
 ;;               Gergely Nagy (algernon@midgard.debian.net)
 ;;               David Edmondson (dme@dme.org)
-;; Maintainer: Mario Lang (mlang@delysid.org)
+;; Maintainer: Michael Olson (mwolson@gnu.org)
 ;; Keywords: IRC, chat, client, Internet
 
 ;; This file is part of GNU Emacs.
@@ -36,12 +36,13 @@
 ;; ERC is an IRC client for Emacs.
 
 ;; For more information, see the following URLs:
-;; * http://sf.net/projects/erc/
+;; * http://sv.gnu.org/projects/erc/
 ;; * http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
 
-;; Jul-26-2001. erc.el is now in CVS on SourceForge.  I invite everyone
-;; who wants to hack it to contact me <mlang@delysid.org> in order to
-;; get write access on the CVS.
+;; As of 2006-06-13, ERC development is now hosted on Savannah
+;; (http://sv.gnu.org/projects/erc).  I invite everyone who wants to
+;; hack on it to contact me <mwolson@gnu.org> in order to get write
+;; access to the shared Arch archive.
 
 ;; Installation:
 
@@ -77,12 +78,12 @@
 (require 'erc-menu)
 
 (defvar erc-official-location
-  "http://erc.sf.net (comments mailto://mlang@delysid.org)"
+  "http://emacswiki.org/cgi-bin/wiki/ERC (mailing list: erc-discuss@gnu.org)"
   "Location of the ERC client on the Internet.")
 
 (defgroup erc nil
   "Emacs Internet Relay Chat client."
-  :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient")
+  :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki/ERC")
   :prefix "erc-"
   :group 'applications)
 



From MAILER-DAEMON Sun Oct 14 00:53:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTx-0000b3-JW
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTv-0000XD-9A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTu-0000Vt-8c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPg-0005J8-Km
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPg-00049q-DD
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPf-0005Or-Fb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPf-000742-Gn
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPf-000742-Gn@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:15 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix out-of-order ChangeLog entry
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Oct 2007 04:53:39 -0000

commit cd21d3bd13de53194c146a2c3dfa6297f032212a
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 23:57:11 2007 -0400

    Fix out-of-order ChangeLog entry

diff --git a/ChangeLog b/ChangeLog
index 1f40953..89bdee6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -247,6 +247,10 @@
 	* 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.
@@ -265,10 +269,6 @@
 	locate-library to find the "images" directory.  This should be
 	more failsafe.  Thanks to Tom Tromey for the idea.
 
-2007-05-26  Michael Olson  <mwolson@gnu.org>
-
-	* erc.texi (Modules): Fix references to completion modules.
-
 2007-05-19  Michael Olson  <mwolson@gnu.org>
 
 	* Makefile (ELPA): New variable that contains the location of my



From MAILER-DAEMON Sun Oct 14 00:53:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTq-0000Qh-OC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPf-0005Iz-R3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005DB-AX
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPX-0005Ci-3T
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPT-00045m-Au
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPS-0005J5-5E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPS-0006hw-7z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPS-0006hw-7z@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:02 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Figure out where user-specific Emacs
	settings are stored
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, 14 Oct 2007 04:53:31 -0000

commit d9be86aa2fd083021eb9448baf8a45afc3c13bd7
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed May 30 00:58:37 2007 +0000

    Figure out where user-specific Emacs settings are stored
    
    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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-146

diff --git a/ChangeLog b/ChangeLog
index 4869e92..ebe438a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/erc-compat.el b/erc-compat.el
index bc4af3d..dc36820 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -209,6 +209,18 @@ one is kept."
     (format-time-string "%Y-%m-%d" emacs-build-time))
   "Time at which Emacs was dumped out.")
 
+;; Emacs 21 and XEmacs do not have user-emacs-directory, but XEmacs
+;; has user-init-directory.
+(defvar erc-user-emacs-directory
+  (cond ((boundp 'user-emacs-directory)
+	 user-emacs-directory)
+	((boundp 'user-init-directory)
+	 user-init-directory)
+	(t "~/.emacs.d/"))
+  "Directory beneath which additional per-user Emacs-specific files
+are placed.
+Note that this should end with a directory separator.")
+
 ;; XEmacs' `replace-match' does not replace matching subexpressions in strings.
 (defun erc-replace-match-subexpression-in-string
   (newtext string match subexp start &optional fixedcase literal)
diff --git a/erc.el b/erc.el
index d0d84d0..fce4b9a 100644
--- a/erc.el
+++ b/erc.el
@@ -836,8 +836,9 @@ See `erc-server-flood-margin' for other flood-related parameters.")
 ;; Script parameters
 
 (defcustom erc-startup-file-list
-  '("~/.emacs.d/.ercrc.el" "~/.emacs.d/.ercrc"
-    "~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
+  (list (concat erc-user-emacs-directory ".ercrc.el")
+	(concat erc-user-emacs-directory ".ercrc")
+	"~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc")
   "List of files to try for a startup script.
 The first existent and readable one will get executed.
 



From MAILER-DAEMON Sun Oct 14 00:53:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTr-0000SC-QC
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPf-0005Iy-Ny
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPb-0005Gv-5g
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPa-0005GR-7O
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:10 -0400
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@hcoop.net>) id 1IgvPZ-00047s-QA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPZ-0005Md-1w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPZ-0006tX-3Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPZ-0006tX-3Q@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:09 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Many fixes to erc-track.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, 14 Oct 2007 04:53:32 -0000

commit 21f04e6eeb3daebf970e74346696fd1e95ee408f
Author: Jeremy Maitin-Shepard <jbms@cmu.edu>
Date:   Tue Aug 14 16:40:11 2007 -0400

    Many fixes to erc-track.el
    
    - Added variable `erc-track-remove-disconnected-buffers', 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.
    
    - Added hook `erc-track-list-changed-hook'.  This 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.
    
    - Added function `erc-track-get-buffer-window' 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.
    
    - Fixed a bug in the logic in `erc-track-modified-channels' for removing
      buffers from the list in certain cases.

diff --git a/erc-track.el b/erc-track.el
index f72a5be..3cb1206 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -95,6 +95,12 @@ Activity means that there was no user input in the last 10 seconds."
   :group 'erc-track
   :type '(repeat string))
 
+(defcustom erc-track-remove-disconnected-buffers nil
+  "*If true, remove buffers associated with a server that is
+disconnected from `erc-modified-channels-alist'."
+  :group 'erc-track
+  :type 'boolean)
+
 (defcustom erc-track-exclude-types '("NICK")
   "*List of message types to be ignored.
 This list could look like '(\"JOIN\" \"PART\")."
@@ -151,6 +157,8 @@ If nil instead of a function, shortening is disabled."
   :type '(choice (const :tag "Disabled")
 		 function))
 
+(defvar erc-track-list-changed-hook nil)
+
 (defcustom erc-track-use-faces t
   "*Use faces in the mode-line.
 The faces used are the same as used for text in the buffers.
@@ -192,12 +200,14 @@ 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'
-
-Any other value means add to the end of `global-mode-string'."
+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)
-		 (const :tag "After all other information" nil))
+		 (const :tag "After all other information" t)
+		 (const :tag "Don't display in mode line" nil))
   :set (lambda (sym val)
 	 (set sym val)
 	 (when (and (boundp 'erc-track-mode)
@@ -296,7 +306,7 @@ See `erc-track-position-in-mode-line' for possible values."
 	      (boundp 'mode-line-modes))
 	 (add-to-list 'mode-line-modes
 		      '(t erc-modified-channels-object) t))
-	(t
+	((eq position t)
 	 (when (not global-mode-string)
 	   (setq global-mode-string '(""))) ; Padding for mode-line wart
 	 (add-to-list 'global-mode-string
@@ -644,14 +654,21 @@ only consider active buffers visible.")
   (setq erc-buffer-activity (erc-current-time))
   (erc-track-modified-channels))
 
+(defun erc-track-get-buffer-window (buffer frame-param)
+  (if (eq frame-param 'selected-visible)
+      (if (eq (frame-visible-p (selected-frame)) t)
+	  (get-buffer-window buffer nil)
+	nil)
+    (get-buffer-window buffer frame-param)))
+
 (defun erc-buffer-visible (buffer)
   "Return non-nil when the buffer is visible."
   (if erc-track-when-inactive
       (when erc-buffer-activity; could be nil
-	(and (get-buffer-window buffer erc-track-visibility)
+	(and (erc-track-get-buffer-window buffer erc-track-visibility)
 	     (<= (erc-time-diff erc-buffer-activity (erc-current-time))
 		 erc-buffer-activity-timeout)))
-    (get-buffer-window buffer erc-track-visibility)))
+    (erc-track-get-buffer-window buffer erc-track-visibility)))
 
 ;;; Tracking the channel modifications
 
@@ -668,18 +685,22 @@ called via `window-configuration-change-hook'.
 ARGS are ignored."
   (interactive)
   (unless erc-modified-channels-update-inside
-    (let ((erc-modified-channels-update-inside t))
+    (let ((erc-modified-channels-update-inside t)
+	  (removed-channel nil))
       (mapcar (lambda (elt)
 		(let ((buffer (car elt)))
 		  (when (or (not (bufferp buffer))
 			    (not (buffer-live-p buffer))
 			    (erc-buffer-visible buffer)
+			    (and erc-track-remove-disconnected-buffers
 			    (not (with-current-buffer buffer
-				   erc-server-connected)))
+					erc-server-connected))))
+		    (setq removed-channel t)
 		    (erc-modified-channels-remove-buffer buffer))))
 	      erc-modified-channels-alist)
+      (when removed-channel
       (erc-modified-channels-display)
-      (force-mode-line-update t))))
+	(force-mode-line-update t)))))
 
 (defvar erc-track-mouse-face (if (featurep 'xemacs)
 				 'modeline-mousable
@@ -733,6 +754,8 @@ Use `erc-make-mode-line-buffer-name' to create buttons."
 	(eq 'mostactive erc-track-switch-direction)
 	(eq 'leastactive erc-track-switch-direction))
       (erc-track-sort-by-activest))
+  (run-hooks 'erc-track-list-changed-hook)
+  (unless (eq erc-track-position-in-mode-line nil)
   (if (null erc-modified-channels-alist)
       (setq erc-modified-channels-object (erc-modified-channels-object nil))
     ;; erc-modified-channels-alist contains all the data we need.  To
@@ -768,7 +791,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'."
@@ -802,8 +825,7 @@ is in `erc-mode'."
     (if (and (not (erc-buffer-visible (current-buffer)))
 	     (not (member this-channel erc-track-exclude))
 	     (not (and erc-track-exclude-server-buffer
-		       (string= this-channel
-				(buffer-name (erc-server-buffer)))))
+		       (erc-server-buffer-p)))
 	     (not (erc-message-type-member
 		   (or (erc-find-parsed-property)
 		       (point-min))
@@ -847,10 +869,10 @@ is in `erc-mode'."
 	    (erc-modified-channels-display)))
       ;; Else if the active buffer is the current buffer, remove it
       ;; from our list.
-      (when (or (erc-buffer-visible (current-buffer))
+      (when (and (or (erc-buffer-visible (current-buffer))
 		(and this-channel
-		     (assq (current-buffer) erc-modified-channels-alist)
 		     (member this-channel erc-track-exclude)))
+		 (assq (current-buffer) erc-modified-channels-alist))
 	;; Remove it from mode-line if buffer is visible or
 	;; channel was added to erc-track-exclude recently.
 	(erc-modified-channels-remove-buffer (current-buffer))



From MAILER-DAEMON Sun Oct 14 00:53:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvU1-0000gQ-99
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTx-0000a6-30
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTv-0000Xj-Mo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOw-00052F-Ta
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
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@hcoop.net>) id 1IgvOv-0003xl-Tx
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOv-00056E-1i
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOu-0005pr-QC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOu-0005pr-QC@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:28 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Doc fixes,
	some code cleanup and fixes.
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, 14 Oct 2007 04:53:41 -0000

commit d1c32588aa7cc00dc72b04f500eb806f156ff5a0
Author: Diane Murray <disumu@x3y2z1.net>
Date:   Thu Sep 7 15:35:51 2006 +0000

    Doc fixes, some code cleanup and fixes.
    
    * erc.el: Updated Commentary and URL.
      (erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
      (erc-arrange-session-in-multiple-windows): No need to check if
      `erc-server-process' is bound.
      (erc-server-buffer-live-p): Doc fix.
      (erc-part-from-channel): Don't use any initial contents at prompt.
      (erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
      (s367): Fixed to support only banmask and channel which is the
      standard.  Also, there's no reason to add a message to each banned
      user entry trying to persuade the user to use /banlist instead of
      /mode #channel +b.  That part of the message was a little
      confusing, anyways.
      (s367-set-by): New catalog entry.  The user who set the ban and
      the time of ban seem to be specific to only certain servers such
      as freenode.
    
    * erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
    
    * erc-backend.el (erc-server-process-alive): No need to check if
      `erc-server-process' is bound.
      (367): Use s367 or s367-set-by where appropriate.
    
    * erc-compat.el: Fixed URL.
    
    * erc-dcc.el: Updated copyright years.  Added Usage section.
      Changed supported Emacs version number from 21.3.50 to 22 in
      Commentary.
    
    * erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
      to check if `erc-server-process' is bound.
    
    * erc-nicklist.el: Added to the Commentary section an explanation
      that `erc-nicklist-quit' should be called from within the nicklist
      buffer.  Set file coding to utf-8 so a contributor's name is
      displayed correctly.
      (erc-nicklist-icons-directory): Use customize type directory
      instead of string.
      (erc-nicklist-insert-contents): Set bbdb-nick to an empty string
      if it wasn't found.  This fixes a bug where an error would occur
      when using `string=' on bbdb-nick if it was nil.
    
    * erc-replace.el: Removed URL from file information since it
      doesn't exist.
    
    * erc-sound.el: Updated copyright years.  Fixed Commentary and
      added Usage section.
      (define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
      `erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
      definitions.
      (erc-play-sound, erc-default-sound, erc-cmd-SOUND)
      (erc-ctcp-query-SOUND): Doc fix.
      (erc-play-command): Removed, not necessary anymore.
      (erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
      higher in code, added docstring.
      (erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
      as well since version 21 or earlier.  Removed commented-out older
      version of function.
    
    * NEWS: Fixed formatting, added channel tracking change.
    
    * README: Fixed typo.  Added more information to Installation
      section.  Updated URL.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-49

diff --git a/ChangeLog b/ChangeLog
index edcd70b..c9f7924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+2006-09-07  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el: Updated Commentary and URL.
+	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
+	(erc-arrange-session-in-multiple-windows): No need to check if
+	`erc-server-process' is bound.
+	(erc-server-buffer-live-p): Doc fix.
+	(erc-part-from-channel): Don't use any initial contents at prompt.
+	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
+	(s367): Fixed to support only banmask and channel which is the
+	standard.  Also, there's no reason to add a message to each banned
+	user entry trying to persuade the user to use /banlist instead of
+	/mode #channel +b.  That part of the message was a little
+	confusing, anyways.
+	(s367-set-by): New catalog entry.  The user who set the ban and
+	the time of ban seem to be specific to only certain servers such
+	as freenode.
+
+	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
+
+	* erc-backend.el (erc-server-process-alive): No need to check if
+	`erc-server-process' is bound.
+	(367): Use s367 or s367-set-by where appropriate.
+
+	* erc-compat.el: Fixed URL.
+
+	* erc-dcc.el: Updated copyright years.  Added Usage section.
+	Changed supported Emacs version number from 21.3.50 to 22 in
+	Commentary.
+
+	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
+	to check if `erc-server-process' is bound.
+
+	* erc-nicklist.el: Added to the Commentary section an explanation
+	that `erc-nicklist-quit' should be called from within the nicklist
+	buffer.  Set file coding to utf-8 so a contributor's name is
+	displayed correctly.
+	(erc-nicklist-icons-directory): Use customize type directory
+	instead of string.
+	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
+	if it wasn't found.  This fixes a bug where an error would occur
+	when using `string=' on bbdb-nick if it was nil.
+
+	* erc-replace.el: Removed URL from file information since it
+	doesn't exist.
+
+	* erc-sound.el: Updated copyright years.  Fixed Commentary and
+	added Usage section.
+	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
+	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
+	definitions.
+	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
+	(erc-ctcp-query-SOUND): Doc fix.
+	(erc-play-command): Removed, not necessary anymore.
+	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
+	higher in code, added docstring.
+	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
+	as well since version 21 or earlier.  Removed commented-out older
+	version of function.
+
+	* NEWS: Fixed formatting, added channel tracking change.
+
+	* README: Fixed typo.  Added more information to Installation
+	section.  Updated URL.
+
 2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el: M-x erc RET can now be used to start ERC.
diff --git a/NEWS b/NEWS
index 4c69e9e..03d7be1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,8 +11,15 @@ known as `erc' is now `erc-open'.
 ** New modules
 
 *** Capab identify (erc-capab.el)
+Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
-**** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
+** Changes and additions to modules
+
+*** Channel tracking (erc-track.el)
+
+**** Use mouse-face and help-echo for channel names in the mode-line.
+This helps people using a mouse know that they are buttons and can be
+clicked on.
 
 * Changes in ERC 5.1.4
 
diff --git a/README b/README
index 33b30e4..6c56123 100644
--- a/README
+++ b/README
@@ -1,13 +1,17 @@
 
-This is the README file for the ERC.
+This is the README file for ERC.
 
 ERC is a powerful, modular, and extensible IRC client for Emacs.
 
 Installation
 ------------
 
-Type `make install'.  If you wish to install to someplace other than
-/usr/local/share/emacs/site-lisp/erc, edit the PREFIX, ELISPDIR,
+Type `make install'.  This will compile all the emacs-lisp files and
+install them in the directory /usr/local/share/emacs/site-lisp/erc.
+The info manual will be installed to /usr/local/info.  You'll most
+likely need to be the root user to install to these locations.
+
+If you wish to install to someplace else, edit the PREFIX, ELISPDIR,
 and/or INFODIR options in Makefile.
 
 QuickStart
@@ -42,7 +46,7 @@ versions of it.
 Additional documentation is kept on the Emacs Wiki, and may be added
 to by anyone.
 
-* http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
+* http://www.emacswiki.org/cgi-bin/wiki/ERC
 
 License information
 -------------------
diff --git a/erc-autoaway.el b/erc-autoaway.el
index fe8a667..983f4e4 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -38,7 +38,7 @@ yourself back when you type something."
 
 (defvar erc-autoaway-idletimer nil
   "The Emacs idletimer.
-This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
+This is only used when `erc-autoaway-idle-method' is set to 'emacs.")
 
 (defvar erc-autoaway-last-sent-time (erc-current-time)
   "The last time the user sent something.")
diff --git a/erc-backend.el b/erc-backend.el
index 442b60c..622248e 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -453,7 +453,7 @@ The current buffer is given by BUFFER."
 
 (defun erc-server-process-alive ()
   "Return non-nil when `erc-server-process' is open or running."
-  (and (boundp 'erc-server-process)
+  (and erc-server-process
        (processp erc-server-process)
        (memq (process-status erc-server-process) '(run open))))
 
@@ -1645,11 +1645,16 @@ See `erc-display-server-message'." nil
   "Channel ban list entries" nil
   (multiple-value-bind (channel banmask setter time)
       (cdr (erc-response.command-args parsed))
-    (erc-display-message parsed 'notice 'active 's367
-                         ?c channel
-                         ?b banmask
-                         ?s setter
-                         ?t time)))
+    ;; setter and time are not standard
+    (if setter
+        (erc-display-message parsed 'notice 'active 's367-set-by
+                             ?c channel
+                             ?b banmask
+                             ?s setter
+                             ?t (or time ""))
+      (erc-display-message parsed 'notice 'active 's367
+                           ?c channel
+                           ?b banmask))))
 
 (define-erc-response-handler (368)
   "End of channel ban list" nil
diff --git a/erc-compat.el b/erc-compat.el
index 2d2e790..8250252 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
+;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-dcc.el b/erc-dcc.el
index 82a8759..076b002 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
+;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
@@ -35,7 +35,9 @@
 ;; rewritten to support the way how ERC operates.  Server socket support
 ;; was added for DCC CHAT and SEND afterwards.  Thanks
 ;; to the original authors for their work.
-;;
+
+;;; Usage:
+
 ;; To use this file, put
 ;;  (require 'erc-dcc)
 ;; in your .emacs.
@@ -49,7 +51,7 @@
 ;;  /dcc send nick file - Offer DCC SEND to nick
 ;;
 ;; Please note that offering DCC connections (offering chats and sending
-;; files) is only supported with Emacs 21.3.50 (CVS).
+;; files) is only supported with Emacs 22.
 
 ;;; Code:
 
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index 8255b4b..792a595 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -91,14 +91,14 @@
     " "))
 
 (define-ibuffer-column erc-server-name (:name "Server")
-  (if (and (boundp 'erc-server-process) (processp erc-server-process))
+  (if (and erc-server-process (processp erc-server-process))
       (with-current-buffer (process-buffer erc-server-process)
 	(or erc-server-announced-name erc-session-server))
     ""))
 
 (define-ibuffer-column erc-target (:name "Target")
   (if (eq major-mode 'erc-mode)
-      (cond ((and (boundp 'erc-server-process) (processp erc-server-process)
+      (cond ((and erc-server-process (processp erc-server-process)
 		  (eq (current-buffer) (process-buffer erc-server-process)))
 	     (concat "Server " erc-session-server ":"
 		     (erc-port-to-string erc-session-port)))
@@ -125,7 +125,7 @@
     ""))
 
 (define-ibuffer-column erc-away (:name "A")
-  (if (and (boundp 'erc-server-process)
+  (if (and erc-server-process
 	   (processp erc-server-process)
 	   (erc-away-time))
       "A"
diff --git a/erc-nicklist.el b/erc-nicklist.el
index 5599565..45041b3 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -29,7 +29,7 @@
 ;; This provides a minimal mIRC style nicklist buffer for ERC.  To
 ;; activate, do M-x erc-nicklist RET in the channel buffer you want
 ;; the nicklist to appear for.  To close and quit the nicklist
-;; buffer, do M-x erc-nicklist-quit RET.
+;; buffer, do M-x erc-nicklist-quit RET from within the nicklist buffer.
 ;;
 ;; TODO:
 ;; o Somehow associate nicklist windows with channel windows so they
@@ -97,7 +97,7 @@ By \"chat medium\", we mean IRC, AOL, MSN, ICQ, etc."
   "*Directory of the PNG files for chat icons.
 Icons are displayed if `erc-nicklist-use-icons' is non-nil."
   :group 'erc-nicklist
-  :type 'string)
+  :type 'directory)
 
 (defcustom erc-nicklist-voiced-position 'bottom
   "*Position of voiced nicks in the nicklist.
@@ -207,7 +207,8 @@ Seach for the BBDB record of this contact.  If not found, return nil."
 	   (channels (erc-server-user-buffers server-user))
 	   (op       (erc-channel-user-op channel-user))
 	   (voice    (erc-channel-user-voice channel-user))
-	   (bbdb-nick (erc-nicklist-search-for-nick (concat login "@" host)))
+	   (bbdb-nick (or (erc-nicklist-search-for-nick (concat login "@" host))
+			  "")
 	   (away-status (if voice "" "\n(Away)"))
 	   (balloon-text (concat bbdb-nick (if (string= "" bbdb-nick)
 					       "" "\n")
@@ -406,6 +407,7 @@ list has all the voiced users according to
 ;; Local Variables:
 ;; indent-tabs-mode: t
 ;; tab-width: 8
+;; coding: utf-8
 ;; End:
 
 ;; arch-tag: db37a256-87a7-4544-bd90-e5f16c9f5ca5
diff --git a/erc-replace.el b/erc-replace.el
index 07e8cd1..3e60d7a 100644
--- a/erc-replace.el
+++ b/erc-replace.el
@@ -5,7 +5,6 @@
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Mario Lang (mlang@delysid.org)
 ;; Keywords: IRC, client, Internet
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcReplace
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-sound.el b/erc-sound.el
index c5b0f81..e152d8e 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -21,9 +21,26 @@
 
 ;;; Commentary:
 
-;; This used to be in erc.el, I (Jorgen) just extracted it from there
-;; and put it in this file.  Bugs and features are those of the
-;; original author.
+;; Play sounds when users send you CTCP SOUND messages.
+
+;; This file also defines the command /sound so that you can send
+;; sound requests to other users.
+
+;;; Usage:
+
+;; Add the following to your .emacs if you want to play sounds.
+;;
+;; (require 'erc-soud)
+;; (erc-sound-enable)
+;;
+;; To send requests to other users from within query buffers, type the
+;; following:
+;;
+;; /sound filename optional-message-text
+;;
+;; You can also type the following:
+;;
+;; /ctcp nickname sound filename optional-message
 
 ;;; Code:
 
@@ -34,9 +51,11 @@
   "In ERC sound mode, the client will respond to CTCP SOUND requests
 and play sound files as requested."
   ;; Enable:
-  ((define-key erc-mode-map "\C-c\C-s" 'erc-toggle-sound))
+  ((add-hook 'erc-ctcp-query-SOUND-hook 'erc-ctcp-query-SOUND)
+   (define-key erc-mode-map "\C-c\C-s" 'erc-toggle-sound))
   ;; Disable:
-  ((define-key erc-mode-map "\C-c\C-s" 'undefined)))
+  ((remove-hook 'erc-ctcp-query-SOUND-hook 'erc-ctcp-query-SOUND)
+   (define-key erc-mode-map "\C-c\C-s" 'undefined)))
 
 (erc-define-catalog-entry 'english 'CTCP-SOUND "%n (%u@%h) plays %s:%m")
 
@@ -45,7 +64,7 @@ and play sound files as requested."
   :group 'erc)
 
 (defcustom erc-play-sound t
-  "*Play sound on SOUND ctcp requests (used in ICQ chat)."
+  "*Play sounds when you receive CTCP SOUND requests."
   :group 'erc-sound
   :type 'boolean)
 
@@ -55,18 +74,22 @@ and play sound files as requested."
   :type '(repeat directory))
 
 (defcustom erc-default-sound nil
-  "Play this sound if the requested file was not found."
+  "Play this sound if the requested file was not found.
+If this is set to nil or the file doesn't exist a beep will sound."
   :group 'erc-sound
   :type '(choice (const nil)
 		 file))
 
-(defcustom erc-play-command "play"
-  "Command for playing sound samples."
-  :group 'erc-sound
-  :type 'string)
+(defvar erc-ctcp-query-SOUND-hook nil
+  "Hook to run after receiving a CTCP SOUND request.")
 
 (defun erc-cmd-SOUND (line &optional force)
-  "Play the sound given in LINE."
+  "Send a CTCP SOUND message to the default target.
+If `erc-play-sound' is non-nil, play the sound as well.
+
+/sound filename optional-message-text
+
+LINE is the text entered, including the command."
   (cond
    ((string-match "^\\s-*\\(\\S-+\\)\\(\\s-.*\\)?$" line)
     (let ((file (match-string 1 line))
@@ -84,8 +107,8 @@ and play sound files as requested."
       t))
    (t nil)))
 
-(defvar erc-ctcp-query-SOUND-hook '(erc-ctcp-query-SOUND))
 (defun erc-ctcp-query-SOUND (proc nick login host to msg)
+  "Display a CTCP SOUND message and play sound if `erc-play-sound' is non-nil."
   (when (string-match "^SOUND\\s-+\\(\\S-+\\)\\(\\(\\s-+.*\\)\\|\\(\\s-*\\)\\)$" msg)
     (let ((sound (match-string 1 msg))
 	  (comment (match-string 2 msg)))
@@ -96,42 +119,16 @@ and play sound files as requested."
   nil)
 
 (defun erc-play-sound (file)
-  "Plays a sound file located in one of the directories in `erc-sound-path'
-with a command `erc-play-command'."
+  "Play a sound file located in one of the directories in `erc-sound-path'.
+See also `play-sound-file'."
   (let ((filepath (erc-find-file file erc-sound-path)))
     (if (and (not filepath) erc-default-sound)
 	(setq filepath erc-default-sound))
     (cond ((and filepath (file-exists-p filepath))
-	   (if (and (fboundp 'device-sound-enabled-p)
-		    (device-sound-enabled-p))
-	       ; For XEmacs
-	       (play-sound-file filepath)
-;	     (start-process "erc-sound" nil erc-play-command filepath)
-	     (start-process "erc-sound" nil "/bin/tcsh"  "-c"
-			    (concat erc-play-command " " filepath))))
+           (play-sound-file filepath))
 	  (t (beep)))
     (erc-log (format "Playing sound file %S" filepath))))
 
-;(defun erc-play-sound (file)
-;  "Plays a sound file located in one of the directories in `erc-sound-path'
-;   with a command `erc-play-command'."
-;  (let ((filepath nil)
-;	(paths erc-sound-path))
-;    (while (and paths
-;		(progn (setq filepath (expand-file-name file (car paths)))
-;		       (not (file-exists-p filepath))))
-;      (setq paths (cdr paths)))
-;    (if (and (not (and filepath (file-exists-p filepath)))
-;	     erc-default-sound)
-;	(setq filepath erc-default-sound))
-;    (cond ((and filepath (file-exists-p filepath))
-;;	   (start-process "erc-sound" nil erc-play-command filepath)
-;	   (start-process "erc-sound" nil "/bin/tcsh"  "-c"
-;			  (concat erc-play-command " " filepath))
-;	   )
-;	  (t (beep)))
-;    (erc-log (format "Playing sound file %S" filepath))))
-
 (defun erc-toggle-sound (&optional arg)
   "Toggles playing sounds on and off.  With positive argument,
   turns them on.  With any other argument turns sounds off."
diff --git a/erc.el b/erc.el
index aac6edb..0cc6561 100644
--- a/erc.el
+++ b/erc.el
@@ -33,11 +33,11 @@
 
 ;;; Commentary:
 
-;; ERC is an IRC client for Emacs.
+;; ERC is a powerful, modular, and extensible IRC client for Emacs.
 
 ;; For more information, see the following URLs:
 ;; * http://sv.gnu.org/projects/erc/
-;; * http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
+;; * http://www.emacswiki.org/cgi-bin/wiki/ERC
 
 ;; As of 2006-06-13, ERC development is now hosted on Savannah
 ;; (http://sv.gnu.org/projects/erc).  I invite everyone who wants to
@@ -60,7 +60,7 @@
 ;; M-x erc RET
 ;;
 ;; After you are connected to a server, you can use C-h m or have a look at
-;; the IRC menu.
+;; the ERC menu.
 
 ;;; History:
 ;;
@@ -1325,8 +1325,7 @@ the process buffer."
        (process-buffer erc-server-process)))
 
 (defun erc-server-buffer-live-p ()
-  "Return t if the buffer associated with `erc-server-process'
-has not been killed."
+  "Return t if the server buffer has not been killed."
   (and (processp erc-server-process)
        (buffer-live-p (process-buffer erc-server-process))))
 
@@ -1688,8 +1687,7 @@ needs to be active for this function to work."
 		 (mapcar 'buffer-name
 			 (erc-buffer-list
 			  nil
-			  (when (and arg (boundp 'erc-server-process))
-			    erc-server-process)))))))
+			  (when arg erc-server-process)))))))
     (switch-to-buffer
      (iswitchb-read-buffer
       "Switch-to: "
@@ -2348,9 +2346,8 @@ If STRING is nil, the function does nothing."
 		  ((listp buffer) buffer)
 		  ((processp buffer) (list (process-buffer buffer)))
 		  ((eq 'all buffer)
-		   (and (boundp 'erc-server-process)
-			;; Hmm, or all of the same session server?
-			(erc-buffer-list nil erc-server-process)))
+		   ;; Hmm, or all of the same session server?
+		   (erc-buffer-list nil erc-server-process))
 		  ((and (eq 'active buffer) (erc-active-buffer))
 		   (list (erc-active-buffer)))
 		  ((erc-server-buffer-live-p)
@@ -3566,9 +3563,8 @@ If `point' is at the beginning of a channel name, use that as default."
    (list
     (if (and (boundp 'reason) (stringp reason) (not (string= reason "")))
 	reason
-      (read-from-minibuffer (concat "Leave " (erc-default-target)
-				    ", Reason? ")
-			    (cons "No reason" 0)))))
+      (read-from-minibuffer (concat "Reason for leaving " (erc-default-target)
+				    ": ")))))
   (erc-cmd-PART (concat (erc-default-target)" " reason)))
 
 (defun erc-set-topic (topic)
@@ -3878,22 +3874,19 @@ and as second argument the event parsed as a vector."
   :type 'function)
 
 (defun erc-format-nick (&optional user channel-data)
-  "Standard nickname formatting function.  Only returns the value
-of NICK."
-  (if user
-      (erc-server-user-nickname user)))
+  "Return the nickname of USER.
+See also `erc-format-nick-function'."
+  (when user (erc-server-user-nickname user)))
 
 (defun erc-format-@nick (&optional user channel-data)
-  "Format a nickname such that @ or + are prefix for the NICK
-if OP or VOICE are t respectively."
-  (if user
-      (let (op voice)
-	(if channel-data
-	    (setq op (erc-channel-user-op channel-data)
-		  voice (erc-channel-user-voice channel-data)))
-    (concat (if voice "+" "")
-	    (if op "@" "")
-		(erc-server-user-nickname user)))))
+  "Format the nickname of USER showing if USER is an operator or has voice.
+Operators have \"@\" and users with voice have \"+\" as a prefix.
+Use CHANNEL-DATA to determine op and voice status.
+See also `erc-format-nick-function'."
+  (when user
+    (let ((op (and channel-data (erc-channel-user-op channel-data) "@"))
+	  (voice (and channel-data (erc-channel-user-voice channel-data) "+")))
+      (concat voice op (erc-server-user-nickname user)))))
 
 (defun erc-format-my-nick ()
   "Return the beginning of this user's message, correctly propertized"
@@ -4585,7 +4578,7 @@ TOPIC string to the current topic."
 	 ;; list of triples: (mode-char 'on/'off argument)
 	 (arg-modes (nth 2 modes)))
     (cond ((erc-channel-p tgt); channel modes
-	   (let ((buf (and (boundp 'erc-server-process) erc-server-process
+	   (let ((buf (and erc-server-process
 			   (erc-get-buffer tgt erc-server-process))))
 	     (when buf
 	       (with-current-buffer buf
@@ -4677,7 +4670,7 @@ person who changed the modes."
 	 (arg-modes (nth 2 modes)))
     ;; now parse the modes changes and do the updates
     (cond ((erc-channel-p tgt); channel modes
-	   (let ((buf (and (boundp 'erc-server-process) erc-server-process
+	   (let ((buf (and erc-server-process
 			   (erc-get-buffer tgt erc-server-process))))
 	     (when buf
 	       ;; FIXME! This used to have an original buffer
@@ -5920,8 +5913,8 @@ If optional argument HERE is non-nil, insert version number at point."
 
 All windows are opened in the current frame."
   (interactive)
-  (unless (boundp 'erc-server-process)
-    (error "No erc-process found in current buffer"))
+  (unless erc-server-process
+    (error "No erc-server-process found in current buffer"))
   (let ((bufs (erc-buffer-list nil erc-server-process)))
     (when bufs
       (delete-other-windows)
@@ -6053,7 +6046,8 @@ All windows are opened in the current frame."
    (s341   . "Inviting %n to channel %c")
    (s352   . "%-11c %-10n %-4a %u@%h (%f)")
    (s353   . "Users on %c: %u")
-   (s367   . "Ban on %b on %c set by %s on %t (Use /banlist!)")
+   (s367   . "Ban for %b on %c")
+   (s367-set-by . "Ban for %b on %c set by %s on %t")
    (s368   . "Banlist of %c ends.")
    (s379   . "%c: Forwarded to %f")
    (s391   . "The time at %s is %t")



From MAILER-DAEMON Sun Oct 14 00:53:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvTt-0000Uh-Iu
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvOw-0004z9-Nq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOc-0004l8-Qj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOZ-0004kc-Gs
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
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@hcoop.net>) id 1IgvOZ-0003qQ-5z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOY-0004yu-GB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOY-0005E9-J7
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOY-0005E9-J7@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Update from CVS
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, 14 Oct 2007 04:53:35 -0000

commit bd4b904a3c73c498f53ac36dc794a2f9c18d3054
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Feb 26 07:06:53 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-132

diff --git a/erc-capab.el b/erc-capab.el
index 02cca05..5e91442 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -73,7 +73,7 @@
 
 (require 'erc)
 
-(defconst erc-capab-version "$Revision: 1.7 $"
+(defconst erc-capab-version "$Revision: 1.8 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:



From MAILER-DAEMON Sun Oct 14 00:54:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvUN-00018g-G5
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvUL-00016n-VT
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOj-0004rt-TF
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOf-0004qw-Pf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
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@hcoop.net>) id 1IgvOf-0003sc-CZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:13 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOe-00051H-L9
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOe-0005P9-NO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:12 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOe-0005P9-NO@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:12 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Re-order 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: Sun, 14 Oct 2007 04:54:06 -0000

commit 8fbc6e1a8372cedbcc17f643ee7a90beb8585743
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Apr 6 03:34:50 2006 +0000

    Re-order ChangeLog.
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-154

diff --git a/ChangeLog b/ChangeLog
index aeb6e57..cf57ab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-05  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
+	build date as it's shown in `emacs-version'.
+
+	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
+	with the same face property as the previous character.
+
 2006-04-02  Michael Olson  <mwolson@gnu.org>
 
 	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
@@ -10,14 +18,6 @@
 	detect the existence of the `open-network-stream-nowait' function,
 	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 
-2006-04-05  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
-	build date as it's shown in `emacs-version'.
-
-	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
-	with the same face property as the previous character.
-
 2006-03-27  Michael Olson  <mwolson@gnu.org>
 
 	* erc.texi: Update direntry.  Remove unneeded local variables.



From MAILER-DAEMON Sun Oct 14 00:54:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvUN-00018x-K1
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvUM-00017a-IA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOj-0004ub-Mi
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOj-0004uO-J3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
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@hcoop.net>) id 1IgvOj-0003tq-8E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOi-00052Y-EG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOi-0005Vf-GJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOi-0005Vf-GJ@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:16 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Fix toggle of flood control.
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, 14 Oct 2007 04:54:06 -0000

commit bbb59c836b5a7e49c50e8769c644780dcf45de44
Author: Michael Olson <mwolson@gnu.org>
Date:   Thu Jun 15 02:21:40 2006 +0000

    Fix toggle of flood control.
    
    * erc.el (erc-toggle-flood-control): When the user hits C-c C-f, make
      flood control really toggle, not unconditionally turn off.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-9

diff --git a/ChangeLog b/ChangeLog
index 16ae791..3c17e6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* erc.el (erc-active-buffer): If the active buffer has been
 	deleted, default to the server buffer.
+	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
+	control really toggle, not unconditionally turn off.
 
 2006-06-12  Michael Olson  <mwolson@gnu.org>
 
diff --git a/erc.el b/erc.el
index 76ef789..a87aae2 100644
--- a/erc.el
+++ b/erc.el
@@ -5115,13 +5115,16 @@ If ARG is non-nil and not positive, turns CTCP replies off."
 (defun erc-toggle-flood-control (&optional arg)
   "Toggle use of flood control on sent messages.
 
-If ARG is non-nil, use flood control.
-If ARG is nil, do not use flood control.
+If ARG is positive, use flood control.
+If ARG is non-nil and not positive, do not use flood control.
 
 See `erc-server-flood-margin' for an explanation of the available
 flood control parameters."
   (interactive "P")
-  (setq erc-flood-protect arg)
+  (cond ((and (numberp arg) (> arg 0))
+	 (setq erc-flood-protect t))
+	(arg (setq erc-flood-protect nil))
+	(t (setq erc-flood-protect (not erc-flood-protect))))
   (message "ERC flood control is %s"
 	   (cond (erc-flood-protect "ON")
 		 (t "OFF"))))



From MAILER-DAEMON Sun Oct 14 00:54:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvUO-0001AV-RA
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvUN-00018S-9c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvOj-0004uk-Sd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOj-0004uZ-Mf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
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@hcoop.net>) id 1IgvOj-0003tx-DK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:17 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOi-00052e-Ny
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOi-0005WA-PO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:16 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOi-0005WA-PO@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:16 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Make upload to GNU ftp site actually
	work.
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, 14 Oct 2007 04:54:07 -0000

commit 1baaa7884a88fffc7924260c93e9334c9ab09d90
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Jun 21 21:52:56 2006 +0000

    Make upload to GNU ftp site actually work.
    
    * Makefile (upload): Make this work with the GNU upload system.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-10

diff --git a/ChangeLog b/ChangeLog
index 3c17e6e..4153c64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-21  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (upload): Make this work with the GNU upload system.
+
 2006-06-14  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-active-buffer): If the active buffer has been
diff --git a/Makefile b/Makefile
index 51dd69c..2695c91 100644
--- a/Makefile
+++ b/Makefile
@@ -148,8 +148,12 @@ release: autoloads distclean
 upload:
 	(cd .. && gpg --detach erc-$(VERSION).tar.gz && \
 	  gpg --detach erc-$(VERSION).zip && \
-	  echo open ftp://savannah.gnu.org > upload.lftp ; \
-	  echo cd /incoming/savannah/erc >> upload.lftp ; \
+	  echo "Directory: erc" | gpg --clearsign > \
+	    erc-$(VERSION).tar.gz.directive.asc && \
+	  cp erc-$(VERSION).tar.gz.directive.asc \
+	    erc-$(VERSION).zip.directive.asc && \
+	  echo open ftp://ftp-upload.gnu.org > upload.lftp ; \
+	  echo cd /incoming/ftp >> upload.lftp ; \
 	  echo mput erc-$(VERSION).zip* >> upload.lftp ; \
 	  echo mput erc-$(VERSION).tar.gz* >> upload.lftp ; \
 	  echo close >> upload.lftp ; \



From MAILER-DAEMON Sun Oct 14 00:54:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvUX-0001N3-Ve
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvUW-0001LS-U3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvUV-0001JF-7m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP2-00053h-AV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
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@hcoop.net>) id 1IgvP1-0003zS-On
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP0-0002g5-OH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOU-0004x9-3A
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOU-000567-5E
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:02 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOU-000567-5E@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:02 -0400
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][emacs22] Update from CVS
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, 14 Oct 2007 04:54:17 -0000

commit 271ea690f57ec782d307597eebaa2a494f7a58b0
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Feb 14 05:05:04 2006 +0000

    Update from CVS
    
    
    git-archimport-id: mwolson@gnu.org--2006/erc--cvs--0--patch-116

diff --git a/erc-dcc.el b/erc-dcc.el
index 8275bff..fc84302 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -58,7 +58,7 @@
   (require 'cl)
   (require 'pcomplete))
 
-(defconst erc-dcc-version "$Revision: 1.97 $"
+(defconst erc-dcc-version "$Revision: 1.98 $"
   "ERC DCC revision")
 
 (defgroup erc-dcc nil



From MAILER-DAEMON Sun Oct 14 00:54:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvUb-0001S5-E7
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvUZ-0001P8-9I
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00057t-8y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPK-00057U-RG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPK-00044H-Fu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPJ-0005Fu-O0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPJ-0006Tu-QG
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPJ-0006Tu-QG@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:53 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] NEWS: Update for the 5.2 release
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, 14 Oct 2007 04:54:19 -0000

commit 4173f57f065ffa9cb4b0170b9bc965ee15cc445b
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 31 22:21:19 2007 +0000

    NEWS: Update for the 5.2 release
    
    2007-03-31  Michael Olson  <mwolson@gnu.org>
    
    	* NEWS: Update for the 5.2 release.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-128

diff --git a/ChangeLog b/ChangeLog
index 5ad9d92..bc502af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 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.
 
@@ -37,9 +39,9 @@
 	a log file name that uses network name rather than server name,
 	when possible.
 
-	* erc-track.el (track): Assimilate track-when-active 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.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
diff --git a/NEWS b/NEWS
index ca768d8..318e81f 100644
--- a/NEWS
+++ b/NEWS
@@ -16,34 +16,248 @@ This command tries to reconnect to the current IRC server exactly
 once.  It does not work in server buffers (throws an error before the
 command is run), but works in query and channel buffers.
 
+** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
+
+** Fix buggy interaction with multi-tty Emacs.
+
+** After running /QUIT, make sure that the IRC process is killed within
+4 seconds.  Freenode, in particular, needs this at times.
+
+** If the IRC process has not responded to our PINGs within a certain
+time, kill it and restart the connection.  See
+`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
+`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
+`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
+
+** Avoid getting into an infinite connection loop.
+Previously, this could happen if your nick was banned, you were using
+Tor, incorrect information was entered, or the connection was bad.
+
+** Make ban messages less confusing.
+
+** Restore the point correctly when reconnecting to an IRC server.
+
+** Make /IGNORE and /UNIGNORE prompt to determine whether their
+argument is a user or a regexp.  This results in less-confusing
+behavior when trying to ignore someone who has a bracket in their
+nick.
+
+** Make the default port "6667" rather than "ircd", because some
+operating systems don't know what port "ircd" maps to.
+
+** Fix several bugs in erc-iswitchb (C-c C-b).
+
+** Clean up internal documentation.
+Special thanks go to Juanma Barranquero for the thorough vetting of
+ERC's internal documentation.
+
+** Display a more informative message when a module is not found.
+
+** Fix a bug where paths were being colored like IRC commands.
+
+** In the customize interface for `erc-modules', add the name of the module.
+This makes it easier to find modules by name.
+
+** erc-server-send-ping-interval: Change to use a default of 30 seconds.
+
+** Header line changes
+
+*** Remove "[IRC]" from the header line.
+
+*** Add the %l format character to `erc-header-line-format',
+
+*** Document how to remove the header line.
+Namely: (setq erc-header-line-format nil).
+
 ** New options
 
 *** erc-server-reconnect-attempts: Determines the number of
 reconnection attempts that ERC will make per server.
 
-*** erc-server-reconnect-timeout: New option that determines the
-amount of time, in seconds, that ERC will wait between successive
-reconnect attempts.
+*** erc-server-reconnect-timeout: Determines the amount of time,
+in seconds, that ERC will wait between successive reconnect attempts.
+
+*** erc-server-send-ping-timeout: Determines when to consider a connection
+stalled and restart it.  The default is	after 120 seconds.
+
+*** erc-system-name: Determines the system name to use when logging in.
+The default is to figure this out by calling `system-name'.
 
 ** New face: `erc-my-nick-face'
 This helps make it easier to distinguish messages sent by yourself
 from messages sent by other users when the value of the variable
 `erc-show-my-nick' is non-nil.
 
+** Namespace changes
+
+*** New macro: `erc-with-server-buffer'
+Switches to the current ERC server buffer and runs some code.  If no
+server buffer is available, return nil.  This is a useful way to
+access variables in the server buffer.
+
+*** New function: `erc-open-server-buffer-p'
+Returns non-nil if the given buffer is an ERC server buffer that has
+an open IRC process.
+
+*** New function: `erc-format-lag-time'
+Returns the estimated lag time to server, `erc-server-lag'.
+
+*** Renamed items
+
+ o `erc-server-setup-periodical-server-ping' is now
+   `erc-server-setup-periodical-ping'
+
+ o `erc-away-p' is now `erc-away-time'
+
+** Changes to the ERC manual
+
+*** New section: Sample Session.
+Describes a sample ERC session for connecting to the #emacs channel on
+Freenode.  Also mention the #erc channel.
+
+*** New section: Special Features.
+Describes some of the special features of ERC.
+
+*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
+interface.
+
+*** Development: Mention ErcDevelopment page on emacswiki.org.
+
+*** Tips and Tricks: Remove empty section for now.
+
+*** Options: Mention how to see available ERC options.
+
+*** Sample Configuration: Add an example of how to configure ERC.
+
 ** New modules
 
+*** Autoaway (erc-autoaway.el)
+
+**** Make this much more reliable.
+
+**** Avoid duplicate messages when coming back from being away.
+
+**** Fix bug where autoaway was enabled just by loading the file.
+
+*** BBDB (erc-bbdb.el)
+
+**** Display information on how to cancel merging of info or how to
+create a new John Doe record.
+
+**** Make it so that information from /whois continues to come in, even
+while prompting for a record to merge.
+
+**** Make hitting C-g correctly abort merging the record.
+
 *** Capab identify (erc-capab.el)
 Mark users who haven't identified to NickServ on servers supporting
 CAPAB IDENTIFY-MSG.
 
 ** Changes and additions to modules
 
+*** Button (erc-button.el)
+
+**** Make <backtab> go to the previous button.
+
 *** Channel tracking (erc-track.el)
 
 **** Use mouse-face and help-echo for channel names in the mode-line.
 This helps people using a mouse know that they are buttons and can be
 clicked on.
 
+**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
+This is accomplished by moving these bindings to their own global
+minor mode.  Now the default is to check whether the user has bound
+something to C-c C-SPC or C-c C-@.  If they have, prompt them about
+whether to really override that binding.  This also has the effect of
+preventing ERC from clobbering rcirc's keybinding, unless this is
+desired.  See `erc-track-enable-keybindings' for more details.
+
+**** New option: erc-track-enable-keybindings.
+Determine whether or not to enable the C-c C-SPC and C-c C-@
+keybindings.  The default is to ask whether to do this if a binding to
+these keys already exists.  It can also be set to t or nil to always
+bind or never bind, respectively.
+
+**** Remove `track-when-inactive' module.
+See `erc-track-when-inactive' for further details.
+
+**** New option: erc-track-when-inactive.
+This option replaces the track-when-inactive module.  Set it to
+non-nil to track activity even in visible buffers when inactive.  The
+default is nil.
+
+**** Remove the `track-modified-channels' alias for the `track' module.
+
+*** DCC support (erc-dcc.el)
+
+**** Add Usage section to Commentary.
+
+**** Fix a bug in the server message output.
+
+*** Filling (erc-fill.el)
+
+**** Fix bug involving messages that start with one or more blank lines.
+
+*** Identd (erc-identd.el)
+
+**** New option `erc-identd-port'
+Specifies the port to use if none is given as an argument to
+`erc-identd-start'.  This is placed in the new customization group
+`erc-identd'.
+
+**** New function: `erc-identd-quickstart'
+Ignores any arguments and calls `erc-identd-start'.
+
+*** Logging (erc-log.el)
+
+**** Make sure filenames are safe to use before writing to them.
+
+**** Save all log buffers when exiting Emacs.
+
+**** erc-generate-log-file-name-function: Add option for
+`erc-generate-log-file-name-network', which is a new function that
+uses the network name rather than the server name when possible.
+
+*** Menu (erc-menu.el)
+
+**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
+and other clients.
+
+**** Make this into a proper module and load it by default.
+
+**** Add "Current channel" submenu.
+
+*** Networks (erc-networks.el)
+
+**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
+
+**** Escape periods in Konfido.Net and Kewl.Org.
+
+*** Internet services / Nickserv (erc-nickserv.el)
+
+**** Add new 'both method for the `erc-nickserv-identify-mode' option
+and make it the default.  This tries to do the right thing both when a
+known nickserv message exists for an IRC network, and when it does
+not.
+
+**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
+
+**** Support authentication on BitlBee.
+
+**** Make source code easier to understand by using accessor functions.
+
+*** Sound support (erc-sound.el)
+
+**** Make this work with both Emacs 21 and Emacs 22.
+
+*** Timestamps (erc-stamp.el)
+
+**** Exclude the newline from the erc-timestamp field.
+
+**** New function: `erc-toggle-timestamps'.
+Toggles display of timestamps.
+
 * Changes in ERC 5.1.4
 
 ** Make find-function and find-variable work in Emacs 22 for



From MAILER-DAEMON Sun Oct 14 00:54:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvUb-0001SP-KA
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvUZ-0001Pm-Mq
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00056s-1S
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPJ-00055k-C8
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPH-00042V-Lo
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPG-0005E4-7o
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPG-0006Nw-9a
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPG-0006Nw-9a@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:50 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] Docfixes
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, 14 Oct 2007 04:54:20 -0000

commit fb843b631cb5fa3909483572fcc780081022f9b2
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 3 03:38:49 2007 +0000

    Docfixes
    
    2007-03-03  Michael Olson  <mwolson@gnu.org>
    
    	* erc.el (erc-open, erc): Docfixes.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-116

diff --git a/ChangeLog b/ChangeLog
index a180af1..31ca040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/erc.el b/erc.el
index 8e35cc7..a97a91d 100644
--- a/erc.el
+++ b/erc.el
@@ -1905,9 +1905,7 @@ removed from the list will be disabled."
 
 (defun erc-open (&optional server port nick full-name
 			   connect passwd tgt-list channel process)
-  "ERC is a powerful, modular, and extensible IRC client.
-
-Connect to SERVER on PORT as NICK with FULL-NAME.
+  "Connect to SERVER on PORT as NICK with FULL-NAME.
 
 If CONNECT is non-nil, connect to the server.  Otherwise assume
 already connected and just create a separate buffer for the new
@@ -2121,8 +2119,12 @@ functions in here get called with the parameters SERVER and NICK."
 		  (nick   (erc-compute-nick))
 		  password
 		  (full-name (erc-compute-full-name)))
-  "Select connection parameters and run ERC.
-Non-interactively, it takes keyword arguments
+  "ERC is a powerful, modular, and extensible IRC client.
+This function is the main entry point for ERC.
+
+It permits you to select connection parameters, and then starts ERC.
+
+Non-interactively, it takes the keyword arguments
    (server (erc-compute-server))
    (port   (erc-compute-port))
    (nick   (erc-compute-nick))
@@ -2133,7 +2135,7 @@ That is, if called with
 
    (erc :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
 
-server and full-name will be set to those values, whereas
+then the server and full-name will be set to those values, whereas
 `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
 be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))



From MAILER-DAEMON Sun Oct 14 00:54:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IgvUd-0001VW-Gd
	for mharc-erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvUb-0001S1-Bj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:54:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPL-00057c-0H
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPK-00057S-Pb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
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@hcoop.net>) id 1IgvPK-00044B-AZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:54 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPJ-0005Fo-FP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPJ-0006TR-Gs
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPJ-0006TR-Gs@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:53 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
Subject: [Erc-commit] [commit][emacs22] manual: Finish some FOR-RELEASE
	items and defer others to 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: Sun, 14 Oct 2007 04:54:21 -0000

commit 0a9acb73e3e06075d3c91e4e6189f5e1bfececfa
Author: Michael Olson <mwolson@gnu.org>
Date:   Sat Mar 31 20:14:14 2007 +0000

    manual: Finish some FOR-RELEASE items and defer others to 5.3.
    
    2007-03-31  Michael Olson  <mwolson@gnu.org>
    
    	* FOR-RELEASE: Finish up 5.2 manual item.  Add documentation item
    	for 5.3.
    
    	* erc.texi (Sample Session): 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-127

diff --git a/ChangeLog b/ChangeLog
index 685b51d..5ad9d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 2007-03-31  Michael Olson  <mwolson@gnu.org>
 
-	* erc.texi (Sample Session): Flesh out.
+	* 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.
diff --git a/FOR-RELEASE b/FOR-RELEASE
index 0a26ba5..116b5bc 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -2,6 +2,10 @@ Tasks that need to be accomplished in order for a release to happen.
 
 * 5.3 release (future)
 
+** Documentation
+
+*** Finish items marked with "@c PRE5_3" in the documentation.
+
 ** Source
 
 *** Make erc-backend not need to (require) any other part of ERC.
@@ -12,8 +16,7 @@ other IRC clients, like Circe.
 
 ** Documentation
 
-*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
-the release of 5.2.
+*** [DONE] Finish items marked with "@c PRE5_2" in the documentation.
 
 *** Update NEWS for changes since 5.1.4.
 
@@ -45,7 +48,7 @@ overridden, so this solution should be OK to install in Emacs.
 *** Make a tarball with the modules that weren't included with
 Emacs 22 that can be downloaded from GNU's ftp server.
 
-* 5.1 release
+* 5.1 release (old)
 
 ** [DONE] Documentation
 
diff --git a/erc.texi b/erc.texi
index d098782..ae5d85d 100644
--- a/erc.texi
+++ b/erc.texi
@@ -81,9 +81,8 @@ Getting Started
 Advanced Usage
 
 * Connecting::                  Ways of connecting to an IRC server.
-* Options::                     Options that are available for ERC.
-* Tips and Tricks::             Ways of enhancing your ERC experience.
 * Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
 
 @end detailmenu
 @end menu
@@ -300,7 +299,9 @@ you want, do @kbd{M-x customize-variable RET erc-modules RET}.
 @section Sample Session
 
 This is an example ERC session which shows how to connect to the #emacs
-channel on Freenode.
+channel on Freenode.  Another IRC channel on Freenode that may be of
+interest is #erc, which is a channel where ERC users and developers hang
+out.
 
 @itemize @bullet
 
@@ -650,7 +651,7 @@ Translate morse code in messages
 
 @end table
 
-@c PRE5_2: Document every option of every module in its own subnode
+@c PRE5_3: Document every option of every module in its own subnode
 
 
 @node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
@@ -660,12 +661,11 @@ Translate morse code in messages
 
 @menu
 * Connecting::                  Ways of connecting to an IRC server.
-* Options::                     Options that are available for ERC.
-* Tips and Tricks::             Ways of enhancing your ERC experience.
 * Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
 @end menu
 
-@node Connecting, Options, Advanced Usage, Advanced Usage
+@node Connecting, Sample Configuration, Advanced Usage, Advanced Usage
 @comment  node-name,  next,  previous,  up
 @section Connecting to an IRC Server
 @cindex connecting
@@ -799,33 +799,100 @@ User full name.
 This can be either a string or a function to call.
 @end defopt
 
-@node Options, Tips and Tricks, Connecting, Advanced Usage
+@node Sample Configuration, Options, Connecting, Advanced Usage
 @comment  node-name,  next,  previous,  up
-@section Options
-@cindex options
+@section Sample Configuration
+@cindex configuration, sample
 
-@c PRE5_2: (Node) Document every ERC option (module options go in
-@c previous chapter)
+Here is an example of configuration settings for ERC.  This can go into
+your Emacs configuration file.  Everything after the @code{(require
+'erc)} command can optionally go into @file{~/.emacs.d/.ercrc.el}.
 
-This section has not yet been written.
+@lisp
+;;; Sample ERC configuration
 
-@node Tips and Tricks, Sample Configuration, Options, Advanced Usage
-@comment  node-name,  next,  previous,  up
-@section Tips and Tricks
-@cindex tips and tricks
+;; The code in this section (Sample Configuration) may be used,
+;; distributed, and modified without restriction.
 
-@c PRE5_2: (Node) Tips and tricks
+;; Add the ERC directory to load path -- you don't need this if you are
+;; using the version of ERC that comes with Emacs
+(add-to-list 'load-path "~/elisp/erc")
 
-This section has not yet been written.
+;; Load ERC
+(require 'erc)
 
-@node Sample Configuration, , Tips and Tricks, Advanced Usage
+;; Load authentication info from an external source.  Put sensitive
+;; passwords and the like in here.
+(load "~/.emacs.d/.erc-auth")
+
+;; This is an example of how to make a new command.  Type "/uptime" to
+;; use it.
+(defun erc-cmd-UPTIME (&rest ignore)
+  "Display the uptime of the system, as well as some load-related
+stuff, to the current ERC buffer."
+  (let ((uname-output
+         (replace-regexp-in-string
+          ", load average: " "] @{Load average@} ["
+          ;; Collapse spaces, remove
+          (replace-regexp-in-string
+           " +" " "
+           ;; Remove beginning and trailing whitespace
+           (replace-regexp-in-string
+            "^ +\\|[ \n]+$" ""
+            (shell-command-to-string "uptime"))))))
+    (erc-send-message
+     (concat "@{Uptime@} [" uname-output "]"))))
+
+;; This causes ERC to connect to the Freenode network upon hitting
+;; C-c e f.  Replace MYNICK with your IRC nick.
+(global-set-key "\C-cef" (lambda () (interactive)
+                           (erc :server "irc.freenode.net" :port "6667"
+                                :nick "MYNICK")))
+
+;; This causes ERC to connect to the IRC server on your own machine (if
+;; you have one) upon hitting C-c e b.  Replace MYNICK with your IRC
+;; nick.  Often, people like to run bitlbee (http://bitlbee.org/) as an
+;; AIM/Jabber/MSN to IRC gateway, so that they can use ERC to chat with
+;; people on those networks.
+(global-set-key "\C-ceb" (lambda () (interactive)
+                           (erc :server "localhost" :port "6667"
+                                :nick "MYNICK")))
+
+;; Make C-c RET (or C-c C-RET) send messages instead of RET. This has
+;; been commented out to avoid confusing new users.
+;; (define-key erc-mode-map (kbd "RET") nil)
+;; (define-key erc-mode-map (kbd "C-c RET") 'erc-send-current-line)
+;; (define-key erc-mode-map (kbd "C-c C-RET") 'erc-send-current-line)
+
+;;; Options
+
+;; Join the #emacs and #erc channels whenever connecting to Freenode.
+(setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
+
+;; Interpret mIRC-style color commands in IRC chats
+(setq erc-interpret-mirc-color t)
+
+;; The following are commented out by default, but users of other
+;; non-Emacs IRC clients might find them useful.
+;; Kill buffers for channels after /part
+;; (setq erc-kill-buffer-on-part t)
+;; Kill buffers for private queries after quitting the server
+;; (setq erc-kill-queries-on-quit t)
+;; Kill buffers for server messages after quitting the server
+;; (setq erc-kill-server-buffer-on-quit t)
+@end lisp
+
+@node Options, , Sample Configuration, Advanced Usage
 @comment  node-name,  next,  previous,  up
-@section Sample Configuration
-@cindex configuration, sample
+@section Options
+@cindex options
 
-@c PRE5_2: (Node) Sample configs
+@c PRE5_3: (Node) Document every ERC option (module options go in
+@c previous chapter)
 
-This section has not yet been written.
+This section has not yet been written.  For now, the easiest way to
+check out the available option for ERC is to do
+@kbd{M-x customize-group erc RET}.
 
 
 @node Getting Help and Reporting Bugs, History, Advanced Usage, Top



From MAILER-DAEMON Wed Oct 17 10:36:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0M-00037R-Ce
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPI-00055L-01
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPH-000552-JQ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPG-00054Z-UK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
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@hcoop.net>) id 1IgvPC-00042B-HO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:50 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPB-0005CU-Rv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPB-0006GP-TY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:45 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPB-0006GP-TY@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:45 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:09 -0400
Subject: [Erc-commit] [commit][emacs22] Update copyright years
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, 14 Oct 2007 04:48:52 -0000

commit 84a821649846518aa2d8291e1f67299ea2888b74
Merge: 93c5a1f... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Jan 26 22:45:10 2007 +0000

    Update copyright years
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-102

diff --cc ChangeLog
index 46d42d7,cef3944..880b2f8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1638,16 -309,6 +1638,16 @@@
  	* erc-track.el (erc-track-remove-from-mode-line): Handle case
  	where global-mode-string is not a list.  Emacs22 permits this.
  
 -    Copyright (C) 2006 Free Software Foundation, Inc.
 +
 +See ChangeLog.05 for earlier changes.
 +
-     Copyright (C) 2006 Free Software Foundation, Inc.
++    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
    Copying and distribution of this file, with or without modification,
    are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; add-log-time-zone-rule: t
 +;; End:
 +
 +;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --cc ChangeLog.01
index 79d487d,0000000..7998938
mode 100644,000000..100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@@ -1,1046 -1,0 +1,1046 @@@
 +2001-12-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.176: * Added missing 747 numreply (banned)
 +
 +2001-12-15  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/scripts/install 1.4, debian/rules 1.6:
 +	updated to 2.1.cvs.20011215-1
 +
 +	* debian/changelog 1.12: Debian version 2.1.cvs.20011215-1
 +
 +2001-12-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.175:
 +	* applied a nicer version of mhp's patch to remove the last prompt from
 +	  saved logs
 +
 +	* erc-replace.el 1.1: * Initial checkin
 +
 +2001-12-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.174:
 +	* fixed bug triggered when reuse-buffer was enabled (the default).
 +	  Another silly port type problem. Maybe we should unify that once and for all sometimes...
 +
 +2001-12-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.173: * erc-message-english: New QUIT and s004 entries.
 +	* erc-save-buffer-on-part: New variable.
 +	* erc-kill-buffer-on-part: New variable.
 +	* (erc-server-PART): Use above variables.
 +	* (erc-join-channel): Use DEF argument instead of initial input for completing-read.
 +
 +2001-12-08  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.172: added defcustom erc-nick-uniquifier ^ (i prefer _)
 +
 +2001-12-07  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.11: changelog for version 2.1.cvs.20011208-1
 +
 +2001-12-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.171:
 +	Added erc-scroll-to-bottom as an erc-insert-hook function.  It still bugs a bit, so please test it, thanks
 +
 +2001-12-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.170: * Fixed silly bug in erc-server-TOPIC (thanks mhp)
 +
 +	* erc-speak.el 1.17:
 +	* Fix non-greedy matching bug. That one somehow swallowed text
 +
 +	* erc.el 1.169:
 +	Fix Emacs20 problem. For now, we disable erc-track-modified-channels-minor-mode in emacs20
 +
 +2001-12-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.5:
 +	* Fix another stupid one-off error. This time it really works!
 +	 (Until I find the next bug. I guess you can hold your breath) (-:
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.4: * Fixed static filling:
 +	** No more \ed (continued on next line) lines anymore
 +	** Fixed bug with previous version where longer lines wouldn't get
 +	   filled correctly (i.e. at all)
 +
 +2001-12-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.10: changelog for 2.1.cvs.20011206-1 added
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.168:
 +	* Don't discard away status when identifying to NickServ
 +	* Modify `erc-already-logged-in': check for port, too.
 +
 +	* erc-fill.el 1.3:
 +	* Fix stupid loop non-termination error in erc-fill-static when filling
 +	  one-line regions.
 +	* Make erc-count-lines return meaningful values
 +
 +2001-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.167:
 +	* (erc-process-input): Make ' /command' work for quoting /commands
 +
 +	* erc-speak.el 1.16: see changelog
 +
 +	* erc-fill.el 1.2: see erc.el changelog
 +
 +	* erc.el 1.166:
 +	* erc-insert-hook: Changed strategy completely, no start end parameters any more.
 +	We narrow-to-region now, thats much cleaner.
 +	* rename erc-fill-region to erc-fill and change the autoload
 +	** You'll probably need to restart Emacs
 +
 +2001-12-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.165:
 +	* (erc-send-current-line): Fixed long outstanding bug. XEmacs users with erc-fill-region on erc-insert-hook knew that one a long time.
 +
 +	* erc.el 1.164: fix order of attack
 +
 +	* erc.el 1.163: * macroexpanded define-minor-mode for XEmacs
 +
 +	* erc.el 1.162: First try to make channel tracking mouse sensitive
 +
 +	* erc.el 1.161: * More erc-message-format conversion.
 +	  erc-format-message-english-PART as an example on how to use functions to format message
 +	* (erc-format-message): Fallback mechanism to use english catalog if variable is not bound
 +
 +2001-12-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.160: * (erc-iswitchb): Rewrite, docfix.
 +	Make it use erc-modified-channels as default if available.
 +
 +	* erc-menu.el 1.2:
 +	* Fixage related to erc-track-modified-channels-minor-mode rewrite
 +
 +	* erc.el 1.159:
 +	* erc-track-modified-channels-minor-mode: Use buffer objects instead of erc-default-target return value for internal state keeping.
 +
 +	* erc.el 1.158: * Made reconnect behave nicer (erc-process-sentinel)
 +	* Rewrote erc-modified-channels-tracking completely.
 +	  Its now a minor mode (erc-track-modified-channels-minor-mode)
 +	  It uses a list as internal representation now, so all silly string-parsing
 +	  related bugs should be gone.
 +	  Use (erc-track-modified-channels-minor-mode t) now to toggle this functionality.
 +	  Dont set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
 +
 +2001-11-29  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.9: final version
 +
 +2001-11-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.157:
 +	* (erc-channel-p): Make it work with string and buffer as parameter. buffer.
 +	* (erc-format-message): Add a check for functionp. This allows a format-specifier also to be a function name, which gets called with args applied and needs to return the actual format string.
 +	* Converted some formats, JOIN, JOIN-you, MODE, ...
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.156:
 +	* (erc-prepare-mode-line-format): Added sanity checks to prevent it from having problems with server buffers where the connection failed
 +
 +	* erc-bbdb.el 1.7:
 +	* (erc-bbdb-JOIN): regexp-quote the fingerhost before searching, some people have really strange characters as their user names
 +
 +	* erc.el 1.155: Remove a stupid debug like (message ...) call
 +
 +2001-11-28  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.8: draft of 2.1.cvs.20011128-1
 +
 +	* debian/rules 1.5: simplify for the all-in-one erc package
 +
 +	* debian/control 1.3: integrated erc-speak back into erc
 +
 +	* debian/maint/conffiles 1.3, debian/maint/conffiles.in 1.2, debian/maint/postinst 1.3, 
 +	  debian/maint/postinst.in 1.2, debian/maint/prerm 1.3, debian/maint/prerm.in 1.2, 
 +	  debian/scripts/install 1.3, debian/scripts/install.in 1.3, debian/scripts/remove 1.3, 
 +	  debian/scripts/remove.in 1.2, debian/scripts/startup.erc-speak 1.2:
 +	since erc-speak is gone, resurrect the static files, and update them to support the latest erc
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.154: * (erc-mode): Shouldn't be interactive.
 +	* (erc-info-mode): Ditto.
 +
 +	* erc.el 1.153: * (erc-server-352): Added hopcount parsing.
 +	Added call to erc-update-channel-member to fill in channel-members information
 +	on /WHO if the channel is joined.
 +
 +2001-11-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.6: *** empty log message ***
 +
 +	* erc-speedbar.el 1.5: * (erc-speedbar-expand-user): New function.
 +	Used when more information than just the nick name is available about a dude.
 +
 +	* erc.el 1.152: * Fixed stupid edit,checkin,save cycle error :)
 +
 +	* erc.el 1.151:
 +	* (erc-generate-log-file-name-default): Renamed to -long
 +	Doc fix.
 +	* (erc-generate-log-file-name-old): Renamed to -long
 +	Doc fix.
 +	* erc-generate-log-file-name-function: Set default to ...-long
 +	Doc fixes
 +
 +	* erc-speedbar.el 1.4: *** empty log message ***
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.3: * Integrated channel names list
 +	  what else do we need to replace info buffers???
 +	  please test that code and comment on erc-ehlp, thanks
 +
 +	* erc-speedbar.el 1.2:
 +	* Added erc-speedbar-goto-buffer and therefore enable switching to the buffers from speedbar
 +
 +	* erc-speedbar.el 1.1:
 +	I had to check this in, it works !! sort of,, megaalphagammaversion, first version. test, play, submit ideas/patches
 +
 +2001-11-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.150 (erc-mode): moved erc-last-saved-position here
 +	moved buffer naming code from here..
 +	(erc): ...to here
 +	(erc-generate-log-file-name-old): only prepend target if it exists
 +
 +	made erc-log-insert-log-on-open a defcustom
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.149:
 +	* Applied antifuchs/mhp patches, the latest on erc-help, unmodified
 +	* New variable: erc-reuse-buffers default to t.
 +	* Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
 +	  then one can assume thats the same channel/query target again.
 +
 +2001-11-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.6:
 +	* new function erc-BBDB-NICK to handle nickname anotation on a nick-change event of a known record
 +
 +	* erc.el 1.148: * Remove erc-rename-buffer, its no longer necessary
 +	* Remove erc-autoop-*. it was broken, and needed rewrite anyway
 +	* write erc-already-logged-in in terms of erc-buffer-list and make the duplicate login check work again
 +
 +	* erc.el 1.147: * Fixed stupid typo
 +
 +2001-11-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.146: * New local variable, erc-announced-server-name
 +	* erc-mode-line-format supports a new symbol, target-and/or-server
 +	* The mode-line displays the announced server name now (for autojoin later..., 
 +	  greets Adam)
 +	* New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
 +	  Thanks go to the guy from #emacs who helped with that
 +	* erc-fill-region is now autoloaded from erc-fill.el
 +	  * erc-fill.el implements a new fill method, erc-fill-static
 +	    (setq erc-fill-function 'erc-fill-static)
 +	* Some other things I forgot right now
 +
 +	* erc-bbdb.el 1.5: *** empty log message ***
 +
 +	* erc-fill.el 1.1: Initial version.
 +
 +	* erc-complete.el 1.4:
 +	Applied antifuchs patch to make completion work with (string= erc-prompt "")
 +
 +	* erc-complete.el 1.3:
 +	added function erc-nick-completion-exclude-myself
 +	you can set erc-nick-completion to 'erc-nick-completion-exclude-myself to use it
 +
 +2001-11-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.4:
 +	* Changed usage of 'finger-host to bbdb-finger-host-field
 +
 +	* erc-bbdb.el 1.3:
 +	* Changed WHOIS to use finger-host instead of net field.
 +	* Added 'visible as option to erc-bbdb-popup-p to only pop-up the bbdb buffer if a join happened in a visible buffer on any visible frame.
 +	* Added (regexp-quote ...) for nickname search in erc-bbdb-JOIN
 +
 +2001-11-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.2: * Added JOIN support
 +
 +2001-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.145:
 +	Initial message catalog code. converted erc-action-format usage to use it
 +
 +	* erc.el 1.144: * erc-play-sound: Added XEmacs related check
 +
 +	* erc-bbdb.el 1.1: * Initial version, many thanks to Andreas Fuchs
 +
 +	* erc.el 1.143: * Fixed silly problem with whois/was handling
 +
 +	* erc.el 1.142: * Renamed prev-rd to erc-previous-read
 +	* Removed erc-next-line-add-newlines and s next-line-add-newlines to nil in defun erc by default
 +
 +	* erc.el 1.141:
 +	fixed xemacs compatibility prob with delete, thanks Adam
 +
 +2001-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.140: numreplies 301 & 461
 +
 +2001-11-13  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.139:
 +	Added code for error reply 421 "Unknown command", to test the new server parsing system.
 +	This was really easy!  Thanks ZenIRC guys & delysid :-)
 +
 +2001-11-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.138: * Allow connecting to SSL enabled irc servers.
 +	   Ugly hack, but it works for now. Be sure to use the numeric irc port 994 so that erc can recognize what you want
 +	  good example is
 +	irc server: ircs.segfault.net
 +	port: 994
 +
 +	meet me there, I am still delYsid :)
 +
 +	* erc.el 1.137: * some more numreply handlers
 +	* cleanup in erc-process-away-p
 +	* new function erc-display-error-notice
 +
 +	* erc.el 1.136: * numreply 501 and 221
 +
 +	* erc.el 1.135:
 +	removed obsolete old hook variables. Your functions may break, but it is easy to hook them up to the new hooks.
 +	erc-part-hook: use erc-server-PART-hook instead
 +	erc-kick-hook: use erc-server-KICK-hook instead
 +	and so on
 +
 +	* erc.el 1.134:
 +	fixed serious bug which cause privmsgs vanishing when erc-auto-query was set to nil
 +
 +	* erc.el 1.133: cleaned up erc-process-filter
 +
 +	* erc.el 1.132: * 401 and 320 numreplies implemented
 +
 +	* erc.el 1.131: * Removed old/now obsolete code
 +
 +	* erc.el 1.130: * Fixed bug in erc-server-MODE
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.129: fixed it
 +
 +	* erc.el 1.128:
 +	*** We switched over. New server message parsing/handling is running now. Thansk to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
 +
 +	* erc.el 1.127: *** empty log message ***
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.125:
 +	Fixed bug in erc-get-buffer, now channel names are compared in
 +	a case-insensitive way.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.124: erc-server-353
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.123: Fixed docstring for erc-get-buffer.
 +	Added erc-process to a lot of calls to erc-get-buffer, so
 +	that only the local process is searched.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.122: * erc-buffer-filter: do it differently
 +
 +	* erc.el 1.121: ugly but working fix for mhp's query problem
 +
 +	* erc.el 1.120: * erc-server-PRIVMSG-or-NOTICE
 +	  Now, all the server word replies are finished. Going to numreplies now
 +
 +	* erc.el 1.119:
 +	* debugging fascilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
 +
 +	* erc.el 1.118: * erc-server-KICK and erc-server-TOPIC. new functions
 +	* erc-server-305-or-306 and erc-server-311-or-314
 +
 +	* erc.el 1.117:
 +	* ported PART and QUIT msgs to the new scheme, many to go. but it is a easy task. does someone wanna try and start with numreplies?
 +
 +	* erc.el 1.116: * erc-server-JOIN
 +
 +	* erc.el 1.115: * Ported erc-server-INVITE code
 +
 +	* erc.el 1.114: * erc-server-ERROR and erc-server-MODE
 +
 +2001-11-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.113: * zen
 +
 +	* erc.el 1.112: * New variable erc-connect-function.
 +
 +	* erc.el 1.111:
 +	* New function erc-channel-p and use it where appropriate
 +
 +	* erc.el 1.110: * Removed the variable erc-buffer-list completely now
 +	* Moved erc-dbuf around a bit
 +
 +	* erc.el 1.109: * Fix silly change in quit/rename msg handling
 +
 +	* erc.el 1.108: thanks mhp, fixed
 +
 +	* erc.el 1.107: * Tijs van Bakel's work from 10th Nov. merged in
 +	* My additions to that idea merged in too
 +	Basicly, this is a major rewrite, if you are scared and want avoid problems,
 +	stay at your current version. It seems fairly stable though.
 +	That changed? erc-buffer-name handling was completely rewritten,
 +	and erc-buffer-list local variable handling removed.
 +	Simplifies alot of code. Poke at it. read the diff. report bug/send patches!
 +
 +	* erc.el 1.106: * Added variable listing when /set is used without args
 +
 +2001-11-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.105:
 +	* Comment/structure cleanup, removal of unnecessary code
 +
 +	* erc.el 1.104: only some code beautification
 +
 +	* erc-imenu.el 1.2:
 +	remove add-hook call, thats done in erc.el now for autoloadability
 +
 +	* erc.el 1.103: * Make erc-imenu autoloadable
 +
 +	* erc.el 1.102:
 +	* The long promised erc-mode-line-format handling rewrite
 +	   Poke at it, try it, play with it, report bugs
 +
 +	* erc.el 1.101:
 +	some regex-quote fixes, new function erc-cmd-set, and minor things
 +
 +2001-11-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.100:
 +	* added second timestamp-format (erc-away-timestamp-format) for marking msgs when being away
 +
 +	* erc-complete.el 1.2: fixed silly deffun
 +
 +	* erc.el 1.99: * Rewrote erc-load-irc-script (simplified)
 +	* Removed depricated code
 +
 +	* erc-speak.el 1.15: * reflect changes in erc.el
 +
 +	* erc.el 1.98:
 +	* Moved completion related functions into erc-complete.el
 +	  placed an autoload instead into erc.el. That quite cool,
 +	  because erc-complete.el only gets loaded when you use
 +	  TAB first time in erc.
 +
 +	* erc-complete.el 1.1: _ Initial checkin
 +
 +	* erc.el 1.97: * New function: erc-chain-hook-with-args
 +	* Changed calls to erc-insert-hook to use it
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.96: * Patch from Fabien Penso
 +	  Make completion case insensitive. try it! its cool
 +
 +	* erc.el 1.95: * Reduction patch 2
 +	  This time, we move the input ring handling into erc-ring.el
 +	  Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
 +	  And remeber, that you dont need it if you dont use input ring :-)
 +
 +	* erc-ring.el 1.1: * Initial checkin
 +
 +	* erc.el 1.94: * The great reduction patch :-)
 +	  moved relevant function from erc.el to new file erc-menu.el and erc-imenu.el
 +
 +	* erc-imenu.el 1.1: nitial version
 +
 +	* erc-menu.el 1.1: * Initial version
 +
 +	* erc.el 1.93: * wording change suggested by Benjamin Drieu
 +
 +2001-11-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.92: Added Emacs version to /SV
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.91: * Hookification patch, read the diff
 +
 +	* erc.el 1.90: too tired for a changelog :)
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.89:
 +	* make erc-cmd-op and erc-cmd-deop take multiple nicknames as argument
 +
 +2001-11-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.7: sync
 +
 +	* debian/rules 1.4: fixed a typo: PKGDIR, not PKIDR
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.88:
 +	* Changed timestamping when away to use erc-timestamp-format and append the timestamp instead of prepending it..
 +	* minor cleanup, s/(if (not /(unless/ and thelike
 +
 +2001-11-06  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.87: Fixed OP and DEOP commands to return T.
 +	Added SV say-version command.
 +	Added erc-send-message utility function, but it's not used everywhere yet.
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.86: stupid delYsid, forgot require 'format-spec. good nite
 +
 +	* erc.el 1.85:
 +	* new variable erc-action-format. Some erc-notice-prefix fixes again
 +
 +	* erc.el 1.84: * erc-minibuffer-privmsg defaults to t
 +
 +	* erc.el 1.83:
 +	* Small fix in relation to the transition to erc-make-notice
 +
 +2001-11-05  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.82:
 +	Renamed erc-message-notices to erc-minibuffer-notice, and renamed erc-prevent-minibuffer-privmsg to erc-minibuffer-privmsg, inverting its functionality
 +
 +	* erc.el 1.81: Added support for channel names starting with & + and !.
 +	Also, many changes partially discussed on the mailinglist:
 +
 +		* erc.el (cl): Add requirement for cl package.
 +		(erc-buffer-list): Make this variable global again.
 +		(erc-default-face): Fix typo.
 +		(erc-timestamp-face): Add face for timestamps.
 +		(erc-join-buffer, erc): Add a 'bury option.
 +		(erc-send-action): Add timestamp.
 +		(erc-command-table): Add /CLEAR, /DEOP, /OP, /Q.
 +		(erc-send-current-line): Add timestamp.
 +		(erc-send-current-line): Add call to erc-insert-hook.
 +		(erc-cmd-clear): New command to clear buffer contents.
 +		(erc-cmd-whois): Fix cut'n'paste-o.
 +		(erc-cmd-deop): New command to deop a user.
 +		(erc-cmd-op): New command to op a user.
 +		(erc-make-notice): Moved a lot of duplicate code here.  Perhaps
 +		this should also be done for erc-highlight-error.
 +		(erc-parse-line-from-server): Now NOTICE will also open a new
 +		query, just as PRIVMSG.
 +		(erc-parse-line-from-server): Call erc-put-text-property on a
 +		channel message/notice first, before concatenating nick and
 +		timestamp &c.
 +		(erc-message-notices): Add option to display notices in
 +		minibuffer.
 +		(erc-fill-region): No longer strip spaces in front of incoming
 +		messages.
 +		(erc-parse-current-line): No longer strip spaces in front of text
 +		input by user.
 +
 +	Hopefully I didn't break too much :(
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.80:
 +	* New function erc-nickserv-identify-autodetect for erc-insert-hook. Added by default currently.
 +
 +	* erc.el 1.79:
 +	* Mini-fix in erc-process-num-reply (= n 353): Added @ as prefix character to make certain channels on opn work again nicely
 +
 +2001-10-31  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.6: updated to reflect changes
 +
 +	* debian/scripts/install.in 1.2:
 +	moved #PKGFLAG# before -f batch-byte-compile
 +
 +2001-10-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.78:
 +	Imenu fixed somehow, added IRC services interactive function for indentify to NickServ. Read the diff
 +
 +2001-10-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.5: sigh. -2
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.4: updated to reflect changes
 +
 +	* debian/rules 1.3: handle conffiles.in too
 +
 +	* debian/maint/conffiles.in 1.1: new file
 +
 +	* debian/maint/conffiles 1.2: superceded by conffiles.in
 +
 +	* debian/scripts/startup 1.2: superceded by startup.erc
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/startup.erc-speak 1.1: * Initial version
 +
 +	* debian/scripts/startup.erc 1.1: * Added and fixes minimal typo
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.3: updated to reflect changes
 +
 +	* debian/rules 1.2:
 +	modified to be able to build the erc-speak package too
 +
 +	* debian/control 1.2: added the new erc-speak package
 +
 +	* debian/README.erc-speak 1.1, debian/maint/postinst.in 1.1, debian/maint/prerm.in 1.1, 
 +	  debian/scripts/install.in 1.1, debian/scripts/remove.in 1.1:
 +	new file
 +
 +	* debian/maint/postinst 1.2, debian/maint/prerm 1.2, debian/scripts/install 1.2, 
 +	  debian/scripts/remove 1.2:
 +	removed, superceded by it's .in counterpart
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.77: * Fixed some defcustom :type 's
 +	* Added erc-before-connect hook which gets called with server port and nick.
 +	  Use this hook to e.g. setup a tunnel before actually connecting.
 +	  something like (when (string= server "localhost") ...)
 +
 +2001-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.76: * Patch by smoke: fix erc-cmd-* commands and add aliases
 +
 +2001-10-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.14:
 +	* Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
 +	  especially if you are on more than one channel simultaniously.
 +
 +	* erc.el 1.75:
 +	* Made the completion postfix customizable through erc-nick-completion-postfix
 +
 +	* erc-speak.el 1.13, erc.el 1.74:
 +	* Added erc-prevent-minibuffer-privmsg
 +
 +	* erc-speak.el 1.12:
 +	* Quickish hack to allow exclusion of timestamps from speaking. see erc-speak-filter-timestamps
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.11:
 +	* Removed now really obsolete code. Package size reduced by 50%
 +
 +	* erc-speak.el 1.10:
 +	* Very important fix! Now erc-speak is really complete. Messages dont get cut anymore. Be sure to use auditory icons, 
 +	  it's reallllly cool now!!!
 +
 +	* erc-speak.el 1.9: *** empty log message ***
 +
 +	* erc-speak.el 1.5: * Major simplification. depends on erc.el,v 1.73
 +	* Things removed, read diff
 +
 +2001-10-21  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.2: oops, silly typo
 +
 +	* debian/changelog 1.1, debian/control 1.1, debian/copyright 1.1, 
 +	  debian/maint/conffiles 1.1, debian/maint/postinst 1.1, debian/maint/prerm 1.1, 
 +	  debian/rules 1.1, debian/scripts/install 1.1, debian/scripts/remove 1.1, 
 +	  debian/scripts/startup 1.1:
 +	initial check-in
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.73:
 +	* Changed erc-insert-hook to get two arguments, START and END of the region
 +	  which got inserted. CAREFUL! This could break stuff, but it makes the hook
 +	  much more useable.
 +
 +	* erc.el 1.72:
 +	* Made erc-smiley a new option, currently set to t to showoff this feature. :)
 +
 +2001-10-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.71: * Add missing erc-mode-hook variable
 +	* Add smiley-support (preliminary test)
 +
 +2001-10-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.70:
 +	Replaced all occurences of put-text-property with a call to
 +	erc-put-text-property.
 +	(erc-put-text-property): New function.
 +	(erc-tracking-modified-channels): Moved to the front of the file such
 +	that it is already defined when the menu is being defined.
 +	(erc-modified-channel-string): Ditto.
 +
 +2001-10-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.69: Removed some commentary.  The wiki page is the place to
 +	put such information.
 +	(erc-fill-prefix): Doc change.
 +	(erc-notice-highlight-type): Doc change, now a user option.
 +	(erc-pal-highlight-type): Doc change, now a user option.
 +	(erc-fool-highlight-type): New option.
 +	(erc-keyword-highlight-type): New option.
 +	(erc-dangerous-host-highlight-type): New option.
 +	(erc-uncontrol-input-line): Doc change.
 +	(erc-interpret-controls-p): Doc change, now a user option.
 +	(erc-multiline-input): Doc change.
 +	(erc-auto-discard-away): Doc change.
 +	(erc-pals): Changed from string to regexp.
 +	(erc-fools): New option.
 +	(erc-keywords): Renamed from erc-highlight-strings.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-dangerous-hosts): Renamed from erc-host-danger-highlight.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-menu-definition): Added menu entries for fools, keywords and
 +	dangerous hosts.
 +	(erc-mode-map): Changed keybindings from C-c <plain ascii> to
 +	various C-c <C-ascii> combinations.
 +	(erc-dangerous-host-face): Renamed from erc-host-danger-face.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-fool-face): New face.
 +	(erc-keyword-face): Renamed from erc-highlight-face.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-parse-line-from-server): Fixed highlighting in the cases
 +	where (equal erc-pal-highlight-type 'all), added code to handle
 +	erc-fool-highlight-type, erc-dangerous-host-highlight-type
 +	(erc-update-modes): Replaced erc-delete-string with delete.
 +	(erc-keywords): Renamed from erc-highlight-strings, handle
 +	erc-keyword-highlight-type.
 +	(erc-delete-string): Removed.
 +	(erc-list-match): New function.
 +	(erc-pal-p): Use erc-list-match.
 +	(erc-fool-p): New function.
 +	(erc-keyword-p): New function.
 +	(erc-dangerous-host-p): Renamed from erc-host-danger-p, use
 +	erc-list-match.
 +	(erc-directed-at-fool-p): New function.
 +	(erc-add-entry-to-list): New function.
 +	(erc-remove-entry-from-list): New function.
 +	(erc-add-pal): Use erc-add-entry-to-list.
 +	(erc-delete-pal): Use erc-remove-entry-from-list.
 +	(erc-add-fool): New function.
 +	(erc-delete-fool): New function.
 +	(erc-add-keyword): New function.
 +	(erc-delete-keyword): New function.
 +	(erc-add-dangerous-host): New function.
 +	(erc-delete-dangerous-host): New function.
 +
 +2001-10-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.68: * irc vs ircd default port fixed
 +
 +	* erc.el 1.67: * Added topic-change to imenu
 +
 +	* erc.el 1.66: * More imenu spiffyness
 +
 +	* erc.el 1.65: * Added imenu support
 +
 +	* erc.el 1.64:
 +	* Fix to /topic to show topic instead of setting it to null :)
 +
 +2001-10-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.63: * First version of erc-rename-buffer
 +
 +	* erc.el 1.62: * more header-line tricks.
 +
 +	* erc.el 1.61:
 +	* Small fix to do erc-update-mode-line-buffer in erc-update-channel-topic
 +
 +	* erc.el 1.60: * Added erc-header-line-format
 +
 +2001-10-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.59: * mini-fix, add msgp to auto-query code
 +
 +	* erc.el 1.58: * Added command-names to completion (erc-command-table)
 +	* New variable erc-auto-query. When set, every arriving message to you
 +	will open a query buffer for that sender if not already open.
 +	* Compatibility function fo non-existing line-beginning|end-position functions in XEmacs.
 +
 +2001-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.57:
 +	* Removed alot of (progn ...) where they were not necessary
 +	* Changed some (if ...) without else part to (when ...)
 +	* Some (while ...) to use (dolist ...)
 +	* Fix for completion popup generating tracebacks.
 +	* New function erc-arrange-session-in-mulptiple-windows
 +	* Lots of other stuff, read the diff
 +
 +2001-10-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.56: * Added erc-kill-input and keybinding C-c C-u for it
 +
 +2001-10-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.55: * Another fix to nick-completion
 +	* Additional checks in erc-track-modified-channels
 +
 +2001-09-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.54: * Fixed completion (alex)
 +	  * Now popup buffer doesnt destroy your window configuration.
 +	* Fixed away handling (incomplete)
 +
 +2001-09-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.53: Fixed silly quoting-escape error
 +
 +2001-09-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.52: * Added auto-op support (unfinished)
 +	* Added erc-latest-version.
 +	* Added erc-ediff-latest-version.
 +
 +2001-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.51:
 +	* Minor menu additions (invite only mode is now a checkbox)
 +
 +2001-09-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.50:
 +	* Fix (erc-cmd-names): This should fix C-c C-n too, hoepfully it was the right fix and doesnt break anything else.
 +
 +	* erc.el 1.49: * Fixes XEmacs easymenu usage (2nd time).
 +
 +2001-09-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.48:
 +	* (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
 +
 +	* erc.el 1.47:
 +	* Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
 +	* Fix for custom problem with :must-match on XEmacs (thanks shapr)
 +	* Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
 +	* Fix for case-sensitivity problem with pals (they are now all downcased)
 +	* Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
 +	  instead of just displaying it in the minibuffer.
 +
 +2001-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.46: Updated erc-version-string
 +
 +	* erc.el 1.45: Version number change and last read-through...
 +
 +2001-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.44: Added some asterisks
 +
 +2001-08-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.43:
 +	Fixed hidden channel buffer tracking (sort of), now using switch-to-buffer for advice.
 +	This version is unofficially named 2.1prebeta1. Please test it and send
 +	fixes to various problems you may encounter so that we can eventually
 +	release 2.1 soon.
 +
 +2001-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.42:
 +	Added function erc-bol and keybinding C-c C-a for it (contributed by Benjamin Rutt <brutt@bloomington.in.us)
 +
 +2001-08-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.41:
 +	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesnt seem to work.
 +	Removed (nick -> #channel) from mode-line. (CLOSED) and (AWAY...) should still be displayed when appropriate
 +
 +2001-08-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.40:
 +	added local-variable channel-list in session-buffers and make /LIST use it.
 +	erc-join-channel can now do completion after /LIST was executed
 +
 +2001-08-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.39: Tweaked erc-join-channel and erc-part-from-channel
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.38: some more defcustom stuff
 +
 +	* erc.el 1.37: Patch from Henrik Enberg <henrik@enberg.org>:
 +	   Adds variables erc-frame-alist and erc-frame-dedicated-p.
 +
 +	* erc.el 1.36: fixed erc-part-from-channel
 +
 +	* erc.el 1.35:
 +	fixed match-string problem and added interactive topic setting function.
 +
 +	* erc.el 1.34: fixed silly string-match bug
 +
 +	* erc.el 1.33:
 +	Added erc-join-channel and erc-part-from-channel (interactive prompts), as well as keybindings. C-c C-j #emacs RET is now enough :)
 +
 +2001-07-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.32 (erc-display-line-buffer): Simplified filling.
 +	(erc-fill-region): New function.
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.31: Added redundancy check in output
 +
 +2001-07-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.30 (erc-send-action): Add text-property stuff.
 +	(erc-input-action): Removed text-property stuff.
 +	(erc-command-table): Corrected command for DESCRIBE.  Still
 +	doesn't work though.  No idea what it should do.  Looks like a no op.
 +	(erc-cmd-me): Doc change.
 +
 +2001-07-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.29:
 +	fixed one occurence of a setq with only one argument (XEmacs didnt like that)
 +
 +	* erc.el 1.28:
 +	Added erc-next-line-add-newlines customisation possibility.
 +
 +	* erc.el 1.27:
 +	added erc-fill-prefix for defining your own way of filling and fixed filling somehow
 +
 +	* erc.el 1.26:
 +	fixed small incompatibility in erc-parse-line-from-server at (and (= n 353) regexp
 +
 +2001-07-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.25:
 +	Added erc-filling and filling code to erc-display-line-buffer.
 +
 +2001-07-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.24 (try-complete-erc-nick): Make the ": " part of the
 +	expansion
 +
 +	* erc.el 1.23: require ring
 +
 +2001-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.22: *** empty log message ***
 +
 +2001-07-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.21: typo
 +
 +	* erc.el 1.20: ommit
 +	:wq
 +
 +2001-07-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.19 (erc-mode): Call erc-input-ring-setup.
 +	(erc-send-current-line): Call erc-add-to-input-ring.
 +	(erc-input-ring): New variable.  Currently not buffer local.
 +	(erc-input-ring-index): New variable.  Currently not buffer local.
 +	(erc-input-ring-setup): New function.
 +	(erc-add-to-input-ring): New function.
 +	(erc-previous-command): New function.
 +	(erc-next-command): New function.
 +	(erc-mode-map): Uncommented keybindings for erc-next-command and
 +	erc-previous-command.
 +
 +2001-07-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.18 (erc-highlight-strings): Removed debug message.
 +
 +	* erc.el 1.17 (erc-join-buffer): Changed default to 'buffer.
 +	(erc-join-info-buffer): Changed default to 'disable.
 +	(erc-nick-completion): Changed default to 'all.
 +
 +2001-07-04  uid31117  <uid31117@confusibombus>
 +
 +	* erc.el 1.16: Resolved...
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.15 (erc-highlight-strings): New option and new function.
 +	(erc-parse-line-from-server): Use it.
 +	Various empty lines removed.  Various doc strings fixed.
 +
 +	* erc.el 1.14: Removed more empty lines.
 +
 +	* erc.el 1.13 (erc-member-string): replaced by plain member
 +	Otherwise, lots of deleting of empty lines...  I'm not too happy with that
 +	but I feel better when the code is "cleaned up".
 +
 +2001-07-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.12: Ugly hack, but looks nicer when giving commands
 +
 +	* erc-speak.el 1.4: ugly hack, but looks nicer now
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.11 (try-complete-erc-nick): New function.
 +	(erc-try-complete-nick): New function.
 +	(erc-nick-completion): New option.
 +	(erc-complete): Call hippie-expand such that erc-try-complete-nick
 +	will be called eventually.  Based on erc-nick-completion
 +	try-complete-erc-nick will then complete on the nick at point.
 +
 +2001-07-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.10:
 +	Insert (erc-current-nick) instead of (erc-display-prompt). good night :)
 +
 +	* erc.el 1.9:
 +	small, but it was anoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
 +
 +2001-06-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.8: Use defface to define all faces.
 +	Removed some history from the commentary, as well as some other
 +	commentary editing.
 +
 +2001-06-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.7: hmm, defcustom for erc-user-full-name
 +
 +	* erc-speak.el 1.3, erc.el 1.6: *** empty log message ***
 +
 +2001-06-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.5: typo
 +
 +	* erc.el 1.4: Some more defcustom
 +
 +	* erc-speak.el 1.2: nothing, really
 +
 +2001-06-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.3: Some defcustom stuff. Still no defgroup though :)
 +
 +	* erc.el 1.2:
 +	Initial change to erc.el (2.0). Mainly list of ideas and features
 +	and syntax-table entries.
 +
 +	* erc-speak.el 1.1.1.1, erc.el 1.1.1.1: Initial Import
 +
 +	* erc-speak.el 1.1, erc.el 1.1: New file.
 +
-     Copyright (C) 2001, 2006 Free Software Foundation, Inc.
++    Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
diff --cc ChangeLog.02
index 961e7d8,0000000..2d55852
mode 100644,000000..100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@@ -1,2607 -1,0 +1,2607 @@@
 +2002-12-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.398 (erc-split-command):
 +	Removed assignment to free variable "continue".
 +	(erc-strip-controls): New function.  Takes a string, returns the string with
 +	all IRC color/bold/underline/etc. control codes stripped out.
 +	(erc-interpret-controls): If variable erc-interpret-controls-p is nil, now
 +	uses erc-strip-controls to strip control codes.
 +	(erc-ctcp-reply-ECHO): Changed reference and assignment to free variable "s"
 +	into reference/assignment to "msg", which appears to be the original author's
 +	intent.
 +
 +	* erc-list.el 1.8 (erc-chanlist):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.
 +
 +	* erc-notify.el 1.10 (erc-notify-timer):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.  Also fixed a bug were variable
 +	erc-last-ison was being read from a non-server buffer (thus giving its default
 +	value instead of its per-server value).
 +
 +	* erc.el 1.397 (erc-once-with-server-event):
 +	This is now a function.  It was a macro with a
 +	bug (the call to gensym happened at byte-compile-time not macro-call-time).
 +	(erc-toggle-debug-irc-protocol): Now [return] is bound to this function in
 +	the *erc-protocol* buffer.
 +
 +2002-12-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.10 (erc-autoaway-idletimer): Doc,
 +	ref. erc-autoaway-use-emacs-idle.
 +	(autoaway): Doc, explain different idle definitions.  Reestablish
 +	the idletimer only when erc-autoaway-use-emacs-idle is non-nil.
 +	(erc-auto-set-away): Doc, ref erc-auto-discard-away.
 +	(erc-auto-discard-away): Doc, ref erc-auto-set-away.
 +	(erc-autoaway-use-emacs-idle): Doc, ref erc-autoaway-mode, and
 +	added a note that this feature is currently broken.
 +	(erc-autoaway-reestablish-idletimer): Doc.
 +	(erc-autoaway-possibly-set-away): Split test such that
 +	erc-time-diff is only computed when necessary, add a comment why
 +	erc-process-alive is not necessary.
 +	(erc-autoaway-set-away): Test for erc-process-alive.
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.9:
 +	Changed the order of defcustoms to avoid errors in the :set property
 +	of erc-autoaway-idle-seconds.
 +
 +2002-12-29  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.42:
 +	* (erc-track-get-active-buffer): remove superflous (+ arg 0)
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.8 (erc-autoaway): Moved the defgroup up to the
 +	top, before the define-erc-module call.
 +	(autoaway): Extended doc.
 +	(erc-autoaway-idle-seconds): Use a :set property to handle
 +	erc-autoaway-use-emacs-idle.
 +	(erc-auto-set-away): Set default to t.  Added doc strings where
 +	necessary, reformatted doc strings such that the first line can
 +	stand on its own.  This is important for the output of M-x
 +	apropos.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-auto.in 1.3:
 +	added (provide 'erc-auto), which is required for (require 'erc-auto) :)
 +
 +	* erc.el 1.396 (erc-display-prompt):
 +	Set the face property of the prompt to
 +	everything but the last character.
 +
 +	* erc.el 1.395 (erc-send-current-line):
 +	Check wether point is in the input line. If
 +	not, just beep and do nothing.
 +
 +2002-12-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.394 (erc-bol):
 +	Fixed bug when there is only a prompt, and no property
 +	change.
 +
 +	* erc.el 1.393 (erc-display-prompt): Rewrote using a save-excursion
 +	and erc-propertize.  No longer use a field for the prompt, but a
 +	plain text property called erc-prompt.
 +	(erc-bol): Use the erc-prompt text property instead of a field.
 +	Return point instead of t.
 +	(erc-parse-current-line): No need to call point here, then, since
 +	erc-bol now returns point.
 +
 +	* Makefile 1.11:
 +	make ChangeLog .PHONY, thus forcing it always to be rebuilt.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.392 (erc-log-irc-protocol):
 +	Removed check wether get-buffer-create
 +	    returned nil. "The value is never nil", says the docstring.
 +
 +	* erc.el 1.391: Day Of The Small Changes
 +
 +	(erc-display-prompt): Make the prompt 'front-sticky, which prevents it
 +	    from being modified. It *should* also make end-of-line move to the
 +	    end of the field (i.e. the end of the prompt) when point is at the
 +	    beginning of the prompt, but it doesn't. Dunno why. :(
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.10:
 +	Added "-f" to "rm" command in rule for target "realclean".
 +
 +	* erc.el 1.390:
 +	New function: erc-log-irc-protocol.  Consolidates nearly duplicate code
 +	from functions erc-send-command and erc-process-filter into one function.
 +
 +	* erc.el 1.389 (erc-toggle-debug-irc-protocol):
 +	Removed unneeded argument PREFIX and code
 +	which referenced it at end of function.
 +	(erc-send-command): Now we only append a newline to the logged copy
 +	of output protocol text if it doesn't have one.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.388 (erc-toggle-debug-irc-protocol):
 +	Display buffer if it's not shown
 +	    already, and use view-mode.
 +	(erc-toggle-debug-irc-protocol), (erc-send-command),
 +	    (erc-process-filter): inhibit-only t to insert into the
 +	    *erc-protocol* buffer (view-mode)
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.387 (erc-mode-map):
 +	Removed keybinding for erc-toggle-debug-irc-protocol.
 +	(erc-toggle-debug-irc-protocol): Now used erc-make-notice to propertize the
 +	face of the enabled/disabled messages in the *erc-protocol* buffer.
 +	(erc-send-command): Now outgoing IRC protocol traffic is logged too.
 +
 +	* erc.el 1.386:
 +	Added user-customizable variable erc-debug-irc-protocol.
 +	Added function erc-toggle-debug-irc-protocol.
 +	(erc-process-filter): Now supports IRC protocol logging.  If variable
 +	erc-debug-irc-protocol is non-nil, all IRC protocol traffic is appended
 +	to buffer *erc-protocol*, which is created if necessary.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.385 (erc-display-prompt):
 +	Don't make the prompt intangible; that didn't
 +	    make things that much better for the user, but confused ispell,
 +	    which checked the prompt when it should check the first word
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.4: fixed resolve's email add
 +
 +	* AUTHORS 1.3: added damien
 +
 +	* erc.el 1.384 (erc-truncate-buffer-on-save):
 +	Removed documentation that
 +	described behaviour now changed.  It used to say "When nil, no
 +	buffer is ever truncated."  This is no longer true; even when
 +	buffers are NOT truncated on save, they can be truncated, eg. by
 +	adding erc-truncate-buffer to the hook.
 +	(erc-logging-enabled): New function.
 +	(erc-current-logfile): New function.
 +	(erc): Use erc-logging-enabled and erc-current-logfile.
 +	(erc-truncate-buffer-to-size): Rewrote it, and made sure to use a
 +	(save-restriction (widen) ...) such that the truncation actually
 +	runs in the whole buffer, not in the last message only (as
 +	erc-insert-post-hook will do!).  This should fix rw's
 +	out-of-bounds error.
 +	(erc-generate-log-file-name-short): Made all but the BUFFER
 +	argument optional.  Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-generate-log-file-name-long): Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-save-buffer-in-logs): Use erc-logging-enabled and
 +	erc-current-logfile.  Doc: Mention erc-logging-enabbled.
 +
 +	(erc-encode-string-for-target): Only do the real work when
 +	featurep mule; else just return the string unchanged.
 +
 +2002-12-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.383:
 +	erc-encoding-default: check for (coding-system-p) for older emacs versions
 +
 +	* erc.el 1.382 (erc-connect): missing ()s added. "don't commit at 2am"
 +
 +	* erc.el 1.381 (erc-connect):
 +	check if (set-process-coding-system) is available before use
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.2: added franl
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.14 (pcomplete-parse-erc-arguments):
 +	Reworked, and fixed a bug that had
 +	caused completions to corrupt preceding text under some circumstances.
 +
 +	* erc.el 1.380 (erc-encoding-default): New.
 +	(erc-encode-string-for-target): Use it instead of a hard-coded ctext.
 +	(erc-encoding-coding-alist): Doc.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.379:
 +	Removed fix for bug 658552 recently checked-in, because it doesn't work.
 +
 +	* erc.el 1.378 (erc-kill-buffer-function):
 +	Removed check that connection is up
 +	before running erc-kill-server-hook hooks.  Those hooks should use
 +	erc-process-alive to avoid interacting with the process.
 +
 +	* erc.el 1.377:
 +	Fixed erc-send-current-line so it no longer assigns the free variable "s", and
 +	it doesn't move point to end-of-buffer in non-ERC buffers.  Fixed
 +	erc-kill-buffer-function so it doesn't run the erc-kill-server-hook hooks if the
 +	server connection is closed.  Fixed bug 658552, which is described in detail at
 +	http://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.376 (erc-cmd-SMV): Bug, now call erc-version-modules.
 +
 +	* erc-pcomplete.el 1.13 (erc-pcomplete-version): New.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el 1.12:
 +	Fix for bug where you could not complete a nick when there was text following
 +	the nick.
 +
 +2002-12-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.375 (erc-already-logged-in): Use erc-process-alive.
 +	(erc-prepare-mode-line-format): Use erc-process-alive.
 +	(erc-process-alive): Check erc-process for boundp and processp.
 +
 +	* erc.el 1.374 (erc-kill-buffer-function):
 +	Do not check wether the process is
 +	alive before running the hook, because there might be functions on
 +	the hook that need to run even when the process is dead.  And
 +	function that wants to check this, should use (erc-process-alive).
 +	(erc-process-alive): New function.
 +	(erc-kill-server): Use it.
 +	(erc-kill-channel): Use it.
 +
 +	* erc.el 1.373 (erc-kill-buffer-function):
 +	Reverted ignore-error change.
 +	ignore-error is dangerous because we might miss bugs in functions
 +	on erc-kill-server-hook.
 +
 +	* erc.el 1.372 (erc-kill-buffer-function): Use memq instead of member
 +	when checking process-status.  Added doc string with references to
 +	the other hooks.
 +	(erc-kill-server): Only send the command when the erc-process is
 +	still alive.  This prevents the error: "Process
 +	erc-irc.openprojects.net-6667 not running" when killing the buffer
 +	after having used /QUIT.
 +
 +2002-12-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.371 (erc-server-ERROR):
 +	Show the error reason, not only the originating host.
 +
 +	* erc.el 1.370 (erc-kill-buffer-function):
 +	(ignore-errors ...) in 'erc-kill-server-hook.
 +	    When the process for this server does not exist anymore, the hook
 +	    will cause an error, effectively preventing the buffer from being
 +	    killed.
 +
 +2002-12-24  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.9:
 +	Fixed erc-notify-timer so that it passes the correct nick to
 +	the functions on erc-notify-signoff-hook.
 +
 +2002-12-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.41: Doc
 +
 +	* erc-track.el 1.40 (erc-make-mode-line-buffer-name): Removed a
 +	superfluous if construct around erc-track-showcount-string.
 +	(erc-track-modified-channels): Use 1+.
 +	Plus some doc and comment changes.
 +
 +2002-12-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.369: Fix (erc-version) string
 +
 +2002-12-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.368:
 +	Removed unnecessary assignment to free-variable "p" in erc-downcase.
 +
 +	* erc.el 1.367:
 +	Now /PART reason strings are generated the same way /QUIT reason strings
 +	are generated (see variable erc-part-reason).  Also, when a server buffer
 +	is killed, a QUIT command is automatically sent to the server.
 +
 +	* erc.el 1.366:
 +	Changed erc-string-no-properties so that it is more efficient.  Now it uses
 +	set-text-properties instead of creating and deleting a temporary buffer.
 +
 +2002-12-21  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.365:
 +	erc-kill-input: added a check to prevent a (ding) and an error when
 +	    there's nothing to kill (thanks to Francis Litterio, franl on IRC)
 +
 +2002-12-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.364:
 +	AWAY notice duplication prevention. erc-prevent-duplicates now set to ("301") by default, and timeout to 60
 +
 +	* erc.el 1.363: erc-prevent-duplicates: New variable, see docstring
 +
 +2002-12-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.39:
 +	erc-track-modified-channels: Use cddr of cell for old-face. cdr of
 +	    cell is '(1 . face-name), i have no idea why :)
 +
 +2002-12-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.362 (erc-current-nick):
 +	check the server buffer is active before using
 +
 +	Also tabified and cleaned up some trailing whitespace
 +
 +2002-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.38: erc-track-count patch by az
 +
 +2002-12-14  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.361:
 +	last-peers: initialise to a cons. thanks to Francis Litterio
 +	    <franl@world.std.com> for the patch
 +
 +	* erc.el 1.360:
 +	erc-kill-channel-hook, erc-kill-buffer-hook, (erc-kill-channel):
 +	    both hooks now call erc-save-buffer-in-logs, so that query buffers are
 +	    saved properly now, and not just channel buffers.
 +
 +2002-12-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.37 (erc-unique-channel-names): Fix another #hurd
 +	vs. #hurd-bunny bug.
 +
 +	* erc-match.el 1.17 (match): No longer modify erc-send-modify-hook,
 +	since it does not work without a parsed text property, anyway.
 +	(erc-keywords): Allow cons cells.
 +	(erc-remove-entry-from-list): Deal with cons cells.
 +	(erc-keyword-p): Ditto.
 +	(erc-match-message): Ditto.
 +
 +	Moved nil to the beginning of the list, removed :tags for the
 +	-type variables:
 +	(erc-current-nick-highlight-type): Ditto.
 +	(erc-pal-highlight-type): Ditto.
 +	(erc-fool-highlight-type): Ditto.
 +	(erc-keyword-highlight-type): Ditto.
 +	(erc-dangerous-host-highlight-type): Ditto.
 +	(erc-log-matches-flag): Moved nil to the beginning.
 +
 +2002-12-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.359:
 +	erc-beg-of-input-line: Don't do (goto-char (beginning-of-line)), since
 +	    beginning-of-line always moves point and returns nil. Thanks to
 +	    franl on IRC for noting this.
 +
 +	* erc-stamp.el 1.20:
 +	erc-insert-timestamp-left, erc-insert-timestamp-right: Made the
 +	    timestamp a 'field named 'erc-timestamp. Now end-of-line and
 +	    beginning-of-line will move over the timestamp.
 +
 +2002-12-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.34 (erc-button-add-button):
 +	make the created button rear-nonsticky, to allow
 +	cutting and pasting of buttons without worrying about the button properties
 +	being inherited by the text typed afterwards.
 +
 +	* erc.el 1.358: save logfile when killing buffer
 +
 +2002-12-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.36 (erc-modified-channels-display): Reworked.
 +	(erc-track-face-more-important-p): Removed.
 +	(erc-track-find-face): Return only one face.
 +	(erc-track-modified-channels): Reworked.
 +	(erc-modified-channels-string): Changed from (BUFFER FACE...) to
 +	(BUFFER . FACE)
 +
 +	* erc-stamp.el 1.19 (erc-insert-timestamp-right): Do not assume
 +	erc-fill-column is available.
 +
 +2002-12-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.357:
 +	erc-ech-notices-in-minibuffer-flag, erc-minibuffer-notice: Clarified
 +	    the difference in the docstrings.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.356: erc-noncommands-list: added erc-cmd-SM and erc-cmd-SMV
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.355 (erc-cmd-SM): New.
 +	(erc-cmd-SMV): New.
 +
 +	* erc.el 1.354 (erc-modes): New.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.9:
 +	field-end: use (not (fboundp 'field-end)) instead of (featurep 'xemacs)
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.353 (erc-version-modules): New.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/changelog 1.19, debian/control 1.7, debian/scripts/startup.erc 1.3:
 +	debian release 3.0.cvs.20021208
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.352 (erc-split-command): Do the right thing with CTCPs.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.18: Be a bit more functional
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.8:
 +	XEmacs doesn't seem to have field-end, so we provide our own version here.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.9: Small fixes to debrelease target
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.351:
 +	make-obsolete-variable: xemacs doesn't have the WHEN parameter, remove it.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-imenu.el 1.5 (erc-create-imenu-index):
 +	Use (forward-line 0) instead of
 +	  (beginning-of-line) now, sine the latter ignores fields (used in the
 +	  prompt).
 +
 +	* erc.el 1.350:
 +	Rewrite of the prompt stuff to use a field named 'erc-prompt:
 +
 +	erc-prompt: Removed getter and setter functions. The properties were
 +	  already set (and overwritten) in erc-display-prompt.
 +	(erc-prompt): Add the trailing space here, not all over the code.
 +	(erc-display-prompt): Cleaned up a bit. The text-properties now are
 +	  valid on the whole prompt. Also, made the prompt 'intangible to
 +	  avoid confused users.
 +	(erc-bol): Now use the field 'erc-prompt for finding the prompt
 +	(erc-parse-current-line): Cleaned up considerably. Uses (erc-bol) now.
 +	(erc-load-irc-script-lines): Adjusted for the new (erc-prompt).
 +	(erc-save-buffer-in-logs): Adjusted for the new (erc-prompt).
 +
 +	* erc.el 1.349:
 +	erc-uncontrol-input-line: The comment said "Consider it deprecated",
 +	so I removed it now.
 +	erc-prompt-interactive-input: Marked obsolete as of 1.348
 +
 +	* erc.el 1.348:
 +	erc-smiley, erc-unmorse: Put at the end to separate it from the
 +	important parts of erc.el.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.17 (erc-insert-timestamp-right): New algorithm.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.347:
 +	last-peers, erc-message: Explained what last-peers is used for.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.3 (erc-cmd-PAGE): New function.
 +	(erc-ctcp-query-PAGE): Use the catalog entry for the message, too.
 +	(erc-ctcp-query-PAGE-hook): Added custom type.
 +	(erc-page-function): Changed custom type from ... function-item to
 +	... function.
 +	As well as doc strings.
 +
 +2002-12-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.2: provide feature at the end
 +
 +2002-12-06  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-nickserv.el 1.10:
 +	Added austnet in erc-nickserv.el (thanks to Damien Elmes
 +	<resolve@repose.cx>)
 +
 +2002-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.13: Add autoload cookie
 +
 +	* erc-speak.el 1.24: Small fix to make proper voice-changes
 +
 +2002-12-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-lang.el 1.1: New
 +
 +2002-12-03  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.346:
 +	erc-mode-map: Put back C-c C-p (PART) and C-c C-q (QUIT)
 +
 +2002-12-02  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.345:
 +	erc-insert-post-hook: Add :options erc-make-read-only, erc-save-buffer-in-logs
 +	erc-send-post-hook: Add :options erc-make-read-only
 +
 +	* erc.el 1.344: erc-insert-hook: Removed ("this hook is obsolescent")
 +	erc-insert-post-hook: Added :options '(erc-truncate-buffer)
 +
 +2002-12-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.343: Add missing requires
 +
 +2002-11-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.342 (erc-quit-reason-normal):
 +	Remove v before %s so it's "Version ..." not
 +	   "vVersion ..."
 +
 +2002-11-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.7 (erc-encode-coding-string): Add second argument
 +		coding-system, and for non-mule xemacsen, use a new defun instead
 +		of identity.
 +
 +	* erc.el 1.341:  (define-erc-module): Use the appropriate group.
 +	(erc-port): Changed custom type.
 +	(erc-insert-hook): Custom group changed to erc-hooks.
 +	(erc-after-connect): ditto
 +	(erc-before-connect): ditto
 +	(erc-disconnected-hook): ditto
 +
 +	* erc-button.el 1.33 (erc-button): New group, changed all custom groups
 +	from erc to erc-button, but left all erc-faces as-is.
 +
 +	* erc-track.el 1.35 (erc-track): New group, changed all custom groups
 +	from erc to erc-track.
 +
 +2002-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-macs.el 1.1:
 +	Macros for erc-victim handling.  Primary idea is to use setf and some fancy things to get nice syntax. have a look
 +
 +2002-11-26  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.340:
 +	pings, erc-cmd-PING, erc-ctcp-reply-PING, catalog entry CTCP-PING:
 +	Cleaned up. Removed buffer-local variable pings which stored a list of
 +	all sent CTCP PING requests. Now send our full time with the CTCP PING
 +	request and interpret the answer.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.339: nick-stk: replaced by the local variable current-nick.
 +
 +2002-11-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.338 (erc-send-command): Use erc-encode-string-for-target.
 +	(erc-encode-string-for-target): New.
 +
 +	* erc-compat.el 1.6 (erc-encode-coding-string): Add second argument
 +	coding-system, and for non-mule xemacsen, use a new defun instead
 +	of identity.
 +
 +	* erc-nickserv.el 1.9 (erc-nickserv-version): New.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* Makefile 1.8:
 +	UNCOMPILED: erc-chess.el depends on chess-network.el, which might not
 +	be installed. Don't compile it.
 +
 +	* erc.el 1.337:
 +	erc-mode-map: Added C-a as erc-bol (no reason why it shouldn't be),
 +	and removed C-c C-p (part channel) and C-c C-q (quite server) as these
 +	are a bit drastic in their consequences and easy to mistype.
 +
 +2002-11-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.34: erc-track-faces-priority-list: Extended list
 +
 +	* erc.el 1.336:
 +	channel-members: Updated docstring: We have a VOICE predicate, too.
 +
 +	* erc-track.el 1.33 (erc-unique-substrings):
 +	Don't shorten a single channel to "#", but
 +	always give at least 2 chars (except when there are no two chars).
 +
 +2002-11-23  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-nickserv.el 1.8:
 +	support for BrasNET. Thanks to rw on IRC for the settings.
 +
 +2002-11-23  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.335: (erc-default-recipients, erc-session-user-full-name)
 +		(nick-stk, pings, erc-announced-server-name, erc-connected)
 +		(channel-user-limit, last-peers, invitation, away, channel-list)
 +		(last-sent-time, last-ping-time, last-ctcp-time, erc-lines-sent)
 +		(erc-bytes-sent, quitting, bad-nick, erc-logged-in)
 +		(erc-default-nicks): Defvars.
 +
 +	* erc-compat.el 1.5: Switched tests to iso-8859-1 instead of latin-1.
 +
 +	* erc-compat.el 1.4 (erc-compat-version): New.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.334 (smiley): Smileys are a very small module, now.
 +
 +2002-11-22  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.333:
 +	erc-event-to-hook, erc-event-to-hook-name: eval-and-compile these,
 +	    since we need them in a macro. ERC now compiles again!
 +
 +	* erc-speak.el 1.23:
 +	erc-minibuffer-privmsg: Removed setting this variable to nil, since it
 +	    was removed from erc.el.
 +
 +	* erc.el 1.332 (erc-interactive-input-map): Added docstring.
 +	(erc-wash-quit-reason): Extended docstring.
 +	(erc-server-ERROR): Added docstring.
 +	(erc-server-321): buffer-local variable channel-list probably
 +	    shouldn't be renamed erc-channel-list - removed FIXME.
 +
 +	* erc.el 1.331: small cleanup.
 +	("was not used anymore" here means "not used in erc/*.el nor in
 +	fsbot", thanks to deego for checking that.)
 +
 +	erc-minibuffer-privmsg: Removed (was not used anymore)
 +	(erc-reformat-command): Removed (was not used anymore)
 +	(erc-strip-erc-parsed-property): Removed (was not used anymore)
 +	(erc-process-ctcp-response): Removed (replaced by ctcp-query-XXX-hook)
 +	(erc-send-paragraph): Removed ("Note that this function is obsolete,
 +	    erc-send-current-line handles multiline input.")
 +	(erc-input-hook): Removed ("This hook is obsolete. See
 +	    `erc-send-pre-hook', `erc-send-modify-hook' and
 +	    `erc-send-post-hook' instead.")
 +	(erc-message-hook): Removed ("This hook is obsolete. See
 +	    `erc-server-PRIVMSG-hook' and `erc-server-NOTICE-hook'.")
 +	(erc-cmd-default-channel): Removed ("FIXME: no clue what this is
 +	    supposed to do." - it was supposed to prepend the default channel
 +	    to a command before sending it. E.g. typing "/FOO now!" would send
 +	    the IRC command "FOO #mycurrentchannel now!")
 +
 +	* erc.el 1.330:
 +	erc-ctcp-query-PING: Send the whole argument back, not just the first
 +	number. This is required for many clients (e.g. irssi, BitchX, ...)
 +	which send their ping times in two different numbers for microsecond
 +	accuracy.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.32 (erc-track-shorten-function): Allow nil.
 +
 +2002-11-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.31 (erc-unique-channel-names): Fixed bug that appeared
 +	if one target name was a substring of another -- eg. #hurd and
 +	#hurd-bunny.  Added appropriate test.
 +
 +2002-11-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.30:
 +	erc-unique-channel-names: Don't take a substring of channel that could
 +	be longer than the channel, but at most (min (length candidate)
 +	(length channel). (thanks to deego for noticing this)
 +
 +2002-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.8: * (require pcomplete): Only when compiling.
 +
 +2002-11-19  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.29:
 +	erc-track-faces-priority-list: New variable, defines what faces will
 +	be shown in the modeline. If set to nil, the old behavior ("all")
 +	remains.
 +	erc-track-face-more-important-p: new function
 +	erc-track-find-face: new function
 +
 +2002-11-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-fill.el 1.20 (erc-stamp): Require it.
 +
 +	* erc-match.el 1.16 (away): devar for the compiler.
 +
 +	* erc-stamp.el 1.16 (stamp): Moved.
 +
 +	* erc.el 1.329 (erc-version-string): New version.
 +
 +	* erc-autoaway.el 1.7 (erc-autoaway-idletimer): Moved to the front of
 +	the file.
 +
 +	* erc-auto.in 1.2: (generated-autoload-file, command-line-args-left):
 +	Added defvar without value to silence byte compiler.
 +
 +	* Makefile 1.7 (realclean): renamed fullclean to realclean.
 +	(UNCOMPILED): New list, for erc-bbdb.el, erc-ibuffer.el,
 +	erc-speak.el.
 +	(SOURCE): Do not compile UNCOMPILED.
 +	(release): New target.
 +	(ChangeLog): New target.
 +	(todo): New target.
 +
 +	* erc-complete.el 1.12 (erc-match): Require it.
 +	(hippie-exp): Require it.
 +
 +	* erc-ezbounce.el 1.3 (erc): Require it.
 +
 +	* erc-imenu.el 1.4 (imenu): Require it.
 +
 +	* erc-nickserv.el 1.7 (erc-networks): Moved up.
 +
 +	* erc-notify.el 1.7 (pcomplete): Require it.
 +
 +	* erc-replace.el 1.5 (erc): Require it.
 +
 +	* erc-sound.el 1.3 (sound): Typo -- define-key in erc-mode-map.
 +
 +	* erc-speedbar.el 1.10 (dframe): Require it.
 +	(speedbar): Require it.
 +
 +	* erc-track.el 1.28 (erc-default-recipients): devar for the compiler.
 +
 +	* README 1.1: New file.
 +
 +2002-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.1: File needed for mkChangeLog
 +
 +	* mkChangeLog 1.1: Original code by mhp
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.32 (erc-button-list): Renamed to erc-list and moved
 +	to erc.el.
 +
 +	* erc.el 1.328 (erc-list): New.
 +
 +	* erc-track.el 1.27 (erc-make-mode-line-buffer-name): Simplified.
 +	(erc-modified-channels-display): Simplified.  Now works with all
 +	faces, and fixes the bug that when two faces where used (bold
 +	erc-current-nick-face), then no faces was added.
 +
 +	* erc-track.el 1.26: Lots of new tests.  Moved some defuns around in
 +	the file.
 +	(erc-all-channel-names): Renamed.
 +	(erc-all-buffer-names): New name, now include query buffers as
 +	well.
 +	(erc-modified-channels-update-inside): New variable.
 +	(erc-modified-channels-update): Use it to prevent running display
 +	if already inside it.  This prevented debugging of
 +	`erc-modified-channels-display'.
 +	(erc-make-mode-line-buffer-name): Moved.
 +	(erc-track-shorten-names): Don't test using erc-channel-p as that
 +	failed with query buffers.
 +	(erc-unique-substrings): Move setq i + 1 to the end of the while
 +	loop, so that start is used as a default value instead of start +
 +	1.
 +
 +2002-11-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.25:
 +	erc-unique-substrings: define this before using it in assert
 +
 +	* erc.el 1.327:
 +	with-erc-channel-buffer: Define *before* using this macro. This
 +	hopefully fixes a bug noted on IRC.
 +
 +	* erc-notify.el 1.6:
 +	erc-notify-signon-hook, erc-notify-signoff-hook: New hooks. They're
 +	even run when their name suggests!
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-list.el 1.7: Typo.
 +
 +	* erc-speedbar.el 1.9: Whitespace only.
 +
 +	* erc.el 1.326 (define-erc-module): Avoid defining an alias if name and
 +	alias are the same.
 +
 +	* erc-ibuffer.el 1.17: URL
 +
 +	* erc-imenu.el 1.3 (erc-imenu-version): New constant.
 +
 +	* erc-ibuffer.el 1.16 (erc-ibuffer-version): New constant.
 +
 +	* erc-ibuffer.el 1.15: File header, comments.
 +
 +	* erc-fill.el 1.19 (erc-fill-version): New constant.
 +
 +	* erc-ezbounce.el 1.2 (erc-ezb-version): New constant.
 +
 +	* erc-complete.el 1.11 (erc-complete-version): New constant.
 +
 +	* erc-chess.el 1.21 (erc-chess-version): New constant.
 +
 +	* erc-chess.el 1.20: Whitespace only.
 +
 +	* erc-bbdb.el 1.20 (erc-bbdb-version): Typo.
 +
 +	* erc-bbdb.el 1.19 (erc-bbdb-version): New constant.
 +	Lots of whitespace changes.  Changes to the header.
 +
 +	* erc-track.el 1.24 (erc-track-shorten-aggressively): Doc.
 +	(erc-all-channel-names): New function.
 +	(erc-unique-channel-names): New function.
 +	(unique-substrings): Renamed.
 +	(erc-unique-substrings): New name
 +	(unique-substrings-1): Renamed.
 +	(erc-unique-substring-1): New name.  Added lots of tests.
 +	(erc-track-shorten-names): Call erc-unique-channel-names instead
 +
 +	* erc-match.el 1.15 (match): Rewrote a as module.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-netsplit.el 1.6 (erc-netsplit-version): New.
 +	(netsplit): Defined as a module, replacing erc-netsplit-initialize
 +	and erc-netsplit-destroy.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.23 (erc-track-switch-buffer):
 +	define-erc-module defines erc-track-mode,
 +	not erc-track-modified-channels-mode.
 +
 +	* erc.el 1.325:
 +	Variables erc-play-sound, erc-sound-path, erc-default-sound,
 +	erc-play-command, erc-ctcp-query-SOUND-hook and functions
 +	erc-cmd-SOUND, erc-ctcp-query-SOUND, erc-play-sound, erc-toggle-sound
 +	moved to erc-sound.el
 +
 +	Variables erc-page-function, erc-ctcp-query-PAGE-hook and function
 +	erc-ctcp-query-PAGE moved to erc-page.el
 +
 +	* erc-page.el 1.1:
 +	erc-page.el: New file. CTCP PAGE support for ERC, extracted from erc.el.
 +
 +	* erc-sound.el 1.2:
 +	defin-erc-module: Typo. Autoload should do erc-sound-mode and "erc-sound".
 +
 +	* erc-sound.el 1.1:
 +	erc-sound.el: New file. Contains all the CTCP SOUND stuff from erc.el.
 +
 +	* erc.el 1.324 (erc-process-ctcp-request):
 +	Removed (old-style CTCP handling)
 +	(erc-join-autogreet): Removed (was broken anyways)
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.31 (erc-button-version): New constant.
 +
 +	* erc-button.el 1.30 (button): rewrote as a module.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.323: New functions:
 +	(erc-event-to-hook), (erc-event-to-hook-name): Convert an event to the
 +	corresponding hook. The latter only returns the name, while the former
 +	interns the hook symbol and returns it.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-replace.el 1.4:
 +	Practically total rewrite.  All smiley stuff deleted.
 +
 +	* erc-track.el 1.22 (track): typo.
 +
 +	* erc.el 1.322 (define-erc-module): Doc change.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.6: Changed to use define-erc-module.
 +
 +	* erc.el 1.321 (define-erc-module):
 +	Make the enable/disable functions interactive.
 +
 +	* erc.el 1.320 (erc):
 +	Don't use switch-to-buffer when we're in the minibuffer,
 +	because that does not work. Use display-buffer instead. This leaves
 +	two problems: The point does not advance to the end of the buffer for
 +	whatever reason, and after leaving the minibuffer, the new window gets
 +	buried.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.15 (stamp): Doc change.
 +
 +	* erc-stamp.el 1.14 (erc-stamp-version): New constant.
 +	(stamp): downcase alias name of the mode.
 +
 +	* erc.el 1.319 (define-erc-module): Added defalias option, renamed
 +	parameters again.
 +
 +	* erc-track.el 1.21: erc-track-modified-channels-mode is now only an
 +	alias to erc-track-mode.  Only erc-track-mode is autoloaded.
 +	(track): Rewrote call to define-erc-module.
 +
 +2002-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.5: * Spelling fix
 +
 +	* erc-fill.el 1.18: * Fix autoload definition for erc-fill-mode
 +
 +	* debian/control 1.6, debian/maint/postinst 1.4, debian/maint/prerm 1.4:
 +	* Remove /usr/doc -> /usr/share/doc link handling
 +
 +	* debian/changelog 1.18: * Sync with reality
 +
 +	* debian/scripts/startup.erc 1.2:
 +	* Add /usr/share/emacs/site-lisp/erc/ to load-path
 +	* (load "erc-auto")
 +
 +	* debian/README.Debian 1.4:
 +	* Info about the changes since last release updated
 +
 +	* erc-pcomplete.el 1.11: * Fix emacs/xemacs compatibility
 +
 +	* debian/scripts/install 1.10: * Dont compile erc-compat, fix ELCDIR
 +
 +	* debian/control 1.5: * Change maintainer field
 +
 +	* erc.el 1.318:
 +	* (defin-erc-module): Renamed argument mode-name to mname because silly byte-compiler thought we were talking about `mode-name'.
 +
 +	* Makefile 1.6: * Added debrelease target
 +
 +	* erc-bbdb.el 1.18, erc-pcomplete.el 1.10, erc-stamp.el 1.13, erc.el 1.317:
 +	* (define-erc-module): Added mode-name argument.
 +	* Converted erc-bbdb, erc-pcomplete and erc-stamp to new macro.
 +	* autoload fixes
 +
 +	* erc-bbdb.el 1.17:
 +	* Create a global-minor-mode (i.e., make it a proper erc-module)
 +
 +	* erc.el 1.316: * (define-erc-modle): New defmacro
 +
 +2002-11-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.5 (erc-autoaway-idle-seconds):
 +	t in docstrings should be non-nil
 +
 +2002-11-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, 
 +	  erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20:
 +	Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
 +
 +	* erc-stamp.el 1.12 (erc-insert-away-timestamp-function):
 +	New custom type.
 +	(erc-insert-timestamp-function): New custom type.
 +
 +	* erc-fill.el 1.16 (erc-fill-function): Doc, new custom type.
 +	(erc-fill-static): Doc.
 +	(erc-fill-enable): New function.
 +	(erc-fill-disable): New function.
 +	(erc-fill-mode): New function.
 +
 +	* erc-match.el 1.13 (erc-match-enable): add-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +	(erc-match-disable): remove-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +
 +2002-11-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.3:
 +	- Added a way to use auto-away using emacs idle timers
 +	- Renamed erc-set-autoaway to erc-autoaway-possibly-set-away for consistency
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.315: erc-mode-map: Removed the C-c C-g binding for erc-grab
 +
 +	* erc.el 1.314:
 +	(erc-server-341) Another instance of the channel/chnl problem i didn't
 +	see last time
 +
 +2002-11-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.3 (erc-decode-coding-string): typo
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.313 (erc-server-341):
 +	variable name should be chnl not channel, as it is
 +	used this way in this function, and the other erc-server-[0-9]* use
 +	chnl too.
 +
 +	* erc-autoaway.el 1.2:
 +	Set back on all servers, not just the current one, since we're set
 +	away on all servers as well.
 +
 +	* HISTORY 1.2: Fixed typo (ngu.org => gnu.org)
 +
 +	* erc-autoaway.el 1.1, erc-fill.el 1.15, erc.el 1.312: erc-autoaway.el:
 +	* new file
 +
 +	erc.el:
 +	* Removed auto-discard-away facility (now included in erc-autoaway.el)
 +	* (erc-away-p): new function
 +
 +	erc-fill.el:
 +	* (erc-fill-variable): Check wether erc-timestamp-format is bound before
 +	                       using it (erc-fill.el does not require erc-stamp).
 +
 +2002-11-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* TODO 1.4:
 +	TODO: moved it to http://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO
 +
 +	* erc.el 1.311 (with-erc-channel-buffer): Rudimentary doc string.
 +
 +2002-11-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.28 (erc-nick-popup-alist): Made a defcustom.
 +
 +	* erc-button.el 1.27 (erc-button-disable): New function.
 +	(erc-button-enable): New function, replaces the add-hook calls at top-level.
 +	(erc-button-mode): New minor mode.
 +
 +2002-11-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.26 (erc-button-entry): Use erc-button-syntax-table.
 +
 +	* erc.el 1.310, erc-stamp.el 1.10: Doc changes.
 +
 +	* erc-match.el 1.12 (erc-match-mode): New function, replacing the
 +	add-hook.
 +	(erc-match-enable): New function.
 +	(erc-match-disable): New function.
 +	(erc-current-nick-highlight-type): Changed from 'nickname to 'nick
 +	to make it consistent with the others.
 +	(erc-match-message): Ditto.
 +
 +	* erc-button.el 1.25 (erc-button-syntax-table): New variable.
 +	(erc-button-add-buttons): Use it.
 +
 +2002-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.309:
 +	1) (bug) ERC pops up a new buffer and window when being messaged
 +	   from an ignored person. fixed
 +	2) (misfeature) ERC notices the user in the minibuffer when it
 +	   ignores something - this can get very annoying, since the
 +	   minibuffer is also visible when not looking at ERC buffers.
 +	   Added a customizeable variable for this, the default is nil.
 +	3) (wishlist) There is no IGNORE or UNIGNORE command.
 +	   Added.
 +	4) (wishlist) Some IRC clients, notably irssi, allow the user to
 +	   ignore "replies" to ignored people. A reply is defined as a
 +	   line starting with "nick:", where nick is the nick of an
 +	   ignored person. Added that functionaly.
 +	Done by Jorgen Schaefer <forcer@forcix.cx>
 +
 +2002-11-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.308 (erc-connect): set-process-coding-system to raw-text.
 +
 +2002-11-01  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-pcomplete.el 1.9, erc-stamp.el 1.9, erc-track.el 1.19:
 +	Fixed more autoloads
 +
 +	* erc-compat.el 1.2: Added autoload for erc-define-minor-mode
 +
 +2002-11-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.307: * (erc-send-command): will break long messages into
 +	a bunch of smaller ones, to prevent them from being truncated by the server.
 +	The patch also axes some trailing whitespace. :-) <resolve>
 +
 +2002-10-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.8 (erc-compat): Require.
 +	(erc-completion-mode): Use erc-define-minor-mode.
 +
 +	* erc-track.el 1.18 (erc-compat): Require.
 +	(erc-track-modified-channels-mode): Use erc-define-minor-mode.
 +
 +	* erc-stamp.el 1.8 (erc-compat): Require.
 +	(erc-timestamp-mode): Use erc-define-minor-mode.
 +
 +	* erc-compat.el 1.1: New file with the code for erc-define-minor-mode,
 +	erc-encode-coding-string and erc-decode-coding-string.  Essentially
 +	all the stuff that cannot be tested for using a simple boundp or
 +	fboundp -- eg. because the number of arguments are wrong.
 +
 +	* erc.el 1.306 (erc-compat): Require.
 +	(erc-process-coding-system): Moved to erc-compat.el.
 +	(erc-connect): Do not set-process-coding-system.
 +	(encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(decode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-decode-coding-string): Compatibility code moved to erc-compat.el.
 +
 +2002-10-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.305 (erc-display-line-1): Removed call to
 +	erc-decode-coding-string.
 +	(erc-parse-line-from-server): Added call to
 +	erc-decode-coding-string before anything gets parsed at all.
 +	(erc-decode-coding-string): Use undecided coding system.
 +
 +2002-10-24  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-button.el 1.24, erc.el 1.304:
 +	Added LASTLOG command and action for nick-button
 +
 +2002-10-22  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.7:
 +	Fixed nopruning bug, added /MODE channel (mode) [nicks...] completion - mode not completed yet.
 +
 +2002-10-16  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.6:
 +	Fixed 'Hi delysid:' bug in SAY completion after realizing that pcomplete on commands already took care of completing the initial nick:
 +
 +2002-10-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.5: update from sachac
 +
 +2002-10-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.303 (erc-emacs-time-to-erc-time): Catch when tm is nil.
 +
 +2002-10-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.302:
 +	* Fixed `erc-scroll-to-bottom' to scroll to the bottom even when
 +	  in the middle of a line. Might also fix the Magic ECHAN Bug[tm]. (-:
 +
 +2002-10-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.6: Fixed erc-networks for the opn->freenode change
 +
 +2002-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.4:
 +	Make erc-completion-mode work interactively with already joined channel buffers
 +
 +	* erc-chess.el 1.19: Add autoload cookies
 +
 +	* erc-notify.el 1.5: Add pcomplete support
 +
 +	* erc.el 1.301:
 +	Remove autoload statments, remove autoload cookie from erc-mode and erc-info-mode
 +
 +	* erc-fill.el 1.14, erc-match.el 1.11: add/remove autoload cookies
 +
 +2002-10-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.3 (erc-completion-mode): New global minor mode
 +	with autoload cookie.
 +	(erc-pcomplete-enable): Renamed erc-pcomplete-initialize.
 +	(erc-pcomplete-disable): New function.
 +
 +	* erc-complete.el 1.10: Doc changes.
 +
 +	* erc-stamp.el 1.7 (erc-stamp-enable): Renamed erc-stamp-initialize.
 +	(erc-stamp-disable): Renamed erc-stamp-destroy.
 +	(erc-timestamp-mode): Use new names.
 +
 +	* erc.el 1.300: Removed autload for erc-complete and
 +	erc-track-modified-channels-mode -- the autoload cookie should do
 +	that instead.
 +	(erc-input-message): Doc string, removed binding for erc-complete.
 +	(erc-mode-map): Removed binding for erc-complete.
 +
 +2002-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.4:
 +	New functions erc-notify-JOIN and erc-notify-QUIT to catch some common cases (warning, untested)
 +
 +2002-10-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.6 (erc-timestamp-mode): New function.  Removed call
 +	to erc-stamp-initialize at the end.
 +
 +2002-09-25  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.299:
 +	Added customizable `erc-process-coding-system' variable.
 +
 +2002-09-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-fill.el 1.13:
 +	`erc-fill-variable' now does the right thing when `erc-hide-timestamps' is non-nil
 +
 +2002-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.12:
 +	patch from Peter Solodov <peter@alcor.concordia.ca>  (note, its slightly broken still
 +
 +2002-09-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.2: Added LEAVE as alias for PART
 +
 +2002-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.1:
 +	By sachac (good work!) keep up doing such things
 +
 +2002-08-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.298:
 +	A fix for Bug#133267: now you can put (erc-save-buffer-in-logs) on erc-insert-post-hook to save *every* incoming message.
 +
 +2002-08-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.297:
 +	Changed default value of erc-common-server-suffixes because of the OPN
 +	name change
 +
 +2002-08-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.5: Try to reactivate isearch in xemacs
 +
 +	* erc-stamp.el 1.4:
 +	fixes issues related to comparative emacsology and a silly bug
 +
 +2002-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.296:
 +	New hook erc-send-completed-hook (for robot stuff), changed alexanders email address to reflect reality, little fix to erc-auto-query to get a bit of a speedup
 +
 +2002-08-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.23:
 +	Fixed case-fold-search (thanks sachac), now lambda works in erc-button-alist, added wardwiki+google+symvar+rfc+itime regexps from the wiki
 +
 +2002-08-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.22:
 +	erc-nick-popup-alist: New variable to make erc-nick-popup configurable
 +
 +2002-08-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.21 (erc-recompute-nick-regexp): Fixed regexp.
 +
 +	* erc-button.el 1.20 (erc-button-buttonize-nicks): Changed custom type
 +	to integer.
 +	(erc-button-add-buttons): Moved button removal code to new
 +	function.
 +	(erc-button-remove-old-buttons): New function.
 +	(erc-button-add-button): Removed use of overlays and used
 +	erc-button-add-face instead.
 +	(erc-button-add-face): New function to merge faces as text
 +	properties.  This should be much faster when lots of buttons
 +	appear.
 +	(erc-button-list): New helper function.
 +
 +	* erc.el 1.295 (erc-display-message): Fixed argument list.
 +	(erc-display-prompt): Reduced calls to length, use start-open
 +	property for XEmacs to prevent a little box of erc-prompt-face at
 +	the end of messages other people send.
 +	(erc-refresh-channel-members): Fix XEmacs calls to split-string,
 +	which may return an empty string at the end of the list.  This
 +	would cause hangups in erc-button in re-search-forward loops.
 +	(erc-get-channel-mode-from-keypress): Replaced control codes with
 +	octal escape sequences.
 +
 +2002-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.19:
 +	Try to be compatible to XEmacs regexp-opt. (Im going to quit this job if I find more of those damn differencies
 +
 +	* debian/README.Debian 1.3, debian/scripts/install 1.9:
 +	* Added info to README.Debian
 +	* Finished debian/scripts/install
 +
 +2002-08-13  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/install 1.8: First attempt to fix it
 +
 +	* debian/README.Debian 1.2, debian/changelog 1.17, debian/scripts/install 1.7:
 +	changelog: Changed maintainer and added new entry
 +	README.Debian: Re-explained the byte-compile issue
 +	scripts/install: Exclude erc-bbdb|chess|ibuffer|speedbar from
 +	byte-compiling
 +
 +	* erc-track.el 1.17: Added C-c C-SPC in addition to C-c C-@
 +
 +	* erc-notify.el 1.3: Little docstring change
 +
 +2002-08-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.3:
 +	Change one use of set-text-properties to add-text-properties (tnx Lathi)
 +
 +2002-08-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.2: added erc-timestamp-only-if-changed-flag
 +
 +2002-07-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.294:
 +	Removed timestamp related code and moved into erc-stampe.l
 +
 +	* erc-stamp.el 1.1:
 +	Timestamping code moved out of erc.el. Additional, now we can timestamp either on the left or on the right side
 +
 +2002-07-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.293:
 +	* Make ctcp ping return its message in the active buffer, instead of the server buffer
 +	* Corrected minimal typo in catalog
 +	* Added var and variable as alias for /set
 +
 +2002-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.16:
 +	* New function erc-track-switch-buffer (by resolve)
 +	  Bound to C-c C-SPC, enjoy!
 +
 +2002-07-08  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.16: New snapshot deb
 +
 +	* debian/scripts/install 1.6: Rewrote in make.
 +	Does not byte-compile erc-speak.el at all, and excludes erc-track.el too, if
 +	ran for xemacs.
 +
 +	* debian/control 1.4: Added dependency on make
 +
 +	* debian/copyright 1.2: Updated copyright info
 +
 +	* debian/rules 1.10: Use $(wildcard *.el) instead of a hardcoded list
 +
 +2002-07-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.292:
 +	erc-iswitchb now works correctly if erc-modified-channels-alist is non-nil
 +
 +2002-07-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.8:
 +	* changed how we check if we should activate "Track hidden channels" and
 +	  whether it should be selected - fixes a bug Xemacs where whole menu bar
 +	  does not work if menu is loaded
 +
 +	* erc-menu.el 1.7:
 +	* added "Disconnect from server", only selectable if erc-connected is non-nil
 +
 +	* topic is allowed to be set by normal users if channel mode is not +t
 +
 +	* add " ..." after description if arguments needed after selecting menu item
 +
 +	* only allow selecting of menu points needing a channel if current buffer is
 +	  a channel buffer - done by testing if channel-members is non-nil
 +
 +	* put erc-match functions in new group "Pals, fools and other keywords"
 +
 +	* erc.el 1.291:
 +	* moved definition of erc-show-my-nick to GUI variables section
 +
 +	* erc-connected variable now defined with defvar
 +	  now set in channel and query buffers, was only in server buffer before
 +	  upon disconnect, set erc-connected to nil in all the server's buffers
 +
 +	* added erc-cmd-GQUIT and its alias erc-cmd-GQ - quit all servers at once
 +
 +	* added interactive function erc-quit-server, bound to C-c C-q
 +
 +	* added erc-server-WALLOPS
 +
 +	* added WALLOPS to english catalog, fixed s461 (was showing message twice)
 +
 +	* typo fixes, spacing change
 +
 +2002-06-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.290: Use pp-to-string in /set (without args)
 +
 +	* erc-netsplit.el 1.5:
 +	Make /set anonymous-lign set erc-anonymous-login, also report
 +	which var was set to which val.
 +
 +2002-06-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.6: added "Customize ERC"
 +
 +2002-06-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.289: New variable: erc-use-info-buffers, defaults to nil.
 +	  This prevents info-buffers from being created/updated.
 +	  Set to t if you use :INFO buffers.
 +	  (by rw)
 +	Delete (erc-display-prompt) from reconnect to avoid clutter
 +
 +2002-06-23  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.288:
 +	erc-get-channel-mode-from-keypress is now bound to C-c C-m
 +	erc-insert-mode-command is taken care of by this function as well
 +
 +2002-06-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.15:
 +	Fixed bug where buffer-names suddenly had text-properties.
 +
 +2002-06-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* Makefile 1.5: changed erc-auto.el to $(SPECIAL) in make fullclean
 +
 +	* Makefile 1.4: remove erc-auto.el on make fullclean
 +
 +2002-06-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.10: fixed spelling error
 +
 +	* erc-track.el 1.14, erc-match.el 1.9: * erc-match.el:
 +	  highlight current nickname in its own face (deactivated by default):
 +	  - added erc-current-nick-highlight-type, erc-current-nick-face,
 +	    erc-current-nick-p
 +
 +	* erc-track.el:
 +	  added support for erc-current-nick-face
 +
 +2002-06-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.287: * added beginning suport for 005 numerics:
 +	  - added buffer local variable erc-server-parameters
 +	  - added erc-server-005, which sets erc-server-parameters if the server has
 +	    used this code to show its parameters
 +
 +2002-06-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.286:
 +	* bugfix: when pasting lines with blank lines in between, remove the blank lines
 +	  but send the rest
 +
 +	* since we know the command, use it when checking what's in erc-hide-list
 +	  added check to erc-server-KICK
 +
 +	* added some blank lines for better readability
 +
 +2002-06-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.5 (erc-nickserv-alist): Fixed typo.
 +
 +2002-06-15  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.4 (erc-networks): Added doc string.
 +	(erc-nickserv-alist): Added doc string.
 +
 +2002-06-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el 1.4:
 +	fixed bug so that the prompt and command always get put at the end of the buffer
 +
 +2002-06-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.3: Added iip support.
 +	Added :type for erc-nickserv-passwords custom.
 +	Fixed hook usage.
 +
 +2002-06-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.2: * added GalaxyNet
 +
 +	* erc-nickserv-alist:
 +	  - sorting networks alphabetically
 +	  - added two more pieces of information in erc-nickserv-alist:
 +	    word to use for identification and whether to use the nickname
 +
 +	* erc-current-network:
 +	  - made regex case insensitive, downcase server to match
 +	  - uses the new information
 +	  - now uses new variable erc-networks instead of doing checking manually
 +
 +	* added variable erc-networks
 +
 +	* fixed some indentation, documentation
 +
 +2002-06-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.285: Fix for kill-buffer hook stuff
 +
 +2002-06-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.284: Added /squery command
 +
 +2002-06-06  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.5: * made group Channel modes
 +	  - moved change mode and invite only mode to here
 +	  - added secret, moderated, no external send, topic lock, limit, key
 +
 +	* check that user is in a channel buffer and user is a channel operator
 +	  for all op-related actions
 +
 +	* "Identify to nickserv" needs erc-nickserv-identify defined
 +
 +	* added "Show ERC version"
 +
 +	* erc.el 1.283:
 +	* added erc-set-channel-limit, erc-set-channel-key, erc-toggle-channel-mode
 +
 +	* added erc-get-channel-mode-from-keypress, which is binded to C-c m
 +	  sends the next character which is typed to one of the 3 new functions
 +	  - did not remove erc-invite-only-mode and it's key binding in case
 +	    people are used to it, although it probably should be removed...
 +
 +	* in erc-server-MODE:
 +	  added check if tgt equal to user's nick
 +	  removed erc-display-line, only using the erc-display-message
 +
 +	* added s461 to english catalog
 +
 +	* fixed bug where Xemacs would not quit if erc-quit-reason was
 +	  set to erc-quit-reason-various and assoc-default was not defined
 +
 +2002-06-04  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-ezbounce.el 1.1, erc-match.el 1.8:
 +	* erc-ezbounce.el: Added. Provides support for ezbouncer; automatic login,
 +	                   session management implemented. I've contacted the author
 +			   about stuff in EZBounce's logging.
 +	* erc-match.el: Fixed a stupid mistake where
 +	                "*** Your new nick is <foo>" would trigger an error.
 +
 +2002-06-04  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.1, erc.el 1.282: * added erc-nickserv.el
 +	* moved nickserv identification variables and functions to the new file
 +	  (require 'erc-nickserv) is now necessary for this to work
 +
 +	* erc.el 1.281:
 +	* results of /COUNTRY now formatted as notice; errors are ignored, 
 +	  fixing
 +	  bug which made prompt disappear
 +
 +	* added undefined-ctcp error message to english catalog
 +
 +	* changed some (when (not erc-disable-ctcp-replies) to use unless instead
 +	  and some if's without else statments to use when or use
 +
 +	* CTCP replies now use erc-display-message, formatted as notices
 +
 +	* added following to english catalog:
 +	  - undefined-ctcp
 +	  - CTCP-CLIENTINFO, CTCP-ECHO, CTCP-FINGER, CTCP-PAGE, CTCP-PING,
 +	    CTCP-SOUND, CTCP-TIME, CTCP-UNKNOWN, CTCP-VERSION
 +	  - s303, s305, s306, s353
 +
 +	* split erc-server-305-or-306 into erc-server-305 and erc-server-306
 +
 +	* KICK already had buffer set, using it
 +
 +	* erc.el 1.280:
 +	* erc-format-timestamp now only called from erc-display-message and
 +	  erc-send-current-line
 +
 +	* all instances of erc-display-line with erc-highlight-error
 +	  changed to use erc-display-message
 +
 +	* added following error messages to english catalog:
 +	  bad-ping-response, bad-syntax, cannot-find-file, cannot-read-file,
 +	  ctcp-request, flood-ctcp-off, flood-strict-mode, no-default-channel,
 +	  no-target, variable-not-bound
 +
 +	* added following server related messages to english catalog:
 +	  s324, s329, s331, s332, s333, s341, s406, KICK, KICK-you, KICK-by-you, MODE-nick
 +
 +	* ignoring server codes 315, 369
 +
 +	* added erc-server-341, erc-server-406
 +
 +	* channel topic and mode notices displayed in respective channel buffers if they
 +	  exist
 +
 +	* erc-server-KICK: display the message before removing this channel so that we
 +	  can track the kick
 +
 +	* send parsed to erc-ctcp-query-ACTION-hook so that actions can be checked
 +	  by erc-match
 +
 +	* fixed bug where nil was shown if no reason was given by users on /PART
 +
 +2002-06-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.7:
 +	* fixed bug where erc-log-matches produced an error when the value of
 +	  (erc-default-target) was not a channel
 +	* use erc-format-timestamp, if it's non-nil, for %t in erc-log-match-format
 +
 +2002-06-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el 1.18:
 +	* made action case insensitive in erc-nick-popup and added a more descriptive
 +	  error message
 +
 +2002-05-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.279:
 +	Removed multiple calls of `erc-prompt' in `erc-display-prompt'
 +
 +2002-05-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.278:
 +	First step timestampkiller cleanup. I'm tired, do the rest tomorrow.
 +
 +	* erc.el 1.277:
 +	New functionality: Catch channel/server buffer kills through kill-buffer-hook.
 +	Currently, it only does a PART if you kill a channel buffer.
 +
 +2002-05-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.276:
 +	defvar'ed some buffer-local variables to make elint at least a bit more happy.
 +	  Moved comments into docstrings.
 +	Changed some instances of member to memq.
 +
 +	* erc-track.el 1.13, erc.el 1.275:
 +	erc.el: (erc-message-type-member): New function, used to test
 +	for message type. Require erc-parsed text-property.
 +	erc-track.el: erc-track-exclude-types: New variable. Defaults to ("JOIN" "PART") right now for testing, it should eventually set to nil soon again.
 +	(erc-track-modified-channels): Use above fun and var to optionally exclude certain message types from channel tracking.
 +
 +2002-05-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* CREDITS 1.5: added myself, vain as it sounds ;)
 +
 +2002-05-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.274: * Some small docstring fixes
 +	* (erc-display-line): Now takes also a process object in the buffer argument.
 +	  Used for easy sending to the server buffer.
 +	* Several places: Just pass proc, not (process-buffer proc)
 +
 +2002-05-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.273: Mostly docstring fixes/additions
 +
 +	* erc-netsplit.el 1.4: Doc fixes, and a new netjoin-done message.
 +
 +	* erc-fill.el 1.11: Doc fixes, erc-fill custom group, autoloads.
 +
 +	* erc-netsplit.el 1.3: Fix to erc-netsplit-timer.
 +
 +	* erc-netsplit.el 1.2: Fixed a silly typo
 +
 +	* erc-maint.el 1.1: is this really necessary?
 +
 +	* erc.el 1.272: Added new variable erc-hide-list.
 +	It affects erc globally right now, and is used to hide certain IRC type messages like JOIN and PART.
 +
 +	* Makefile 1.3: Doh, I should really test this before checkin :)
 +
 +	* Makefile 1.2: Silly cut&paste bug fixed
 +
 +	* erc-list.el 1.6: Added autoload cookie
 +
 +	* erc-match.el 1.6: Added missing require erc.
 +
 +	* erc-notify.el 1.2: Autoload cookies and a -initialize function.
 +
 +	* erc-chess.el 1.18: Added autoload cookies
 +
 +	* Makefile 1.1: Finally, we have a Makefile.
 +	Primarily used for autoload definition generation right now.
 +
 +	* erc-auto.in 1.1: First version.
 +
 +	* erc-track.el 1.12: Added autoload cookie
 +
 +	* erc-netsplit.el 1.1:
 +	New module, used to autodetect and hide netsplits.
 +	(Untested, no netsplit happened yet :) )
 +
 +	* erc-nets.el 1.3: Added some old code I once worked on.
 +	Added autoload cookie
 +
 +2002-05-24  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.10:
 +	removed reference in documentation to old variable, changed it to the new one
 +
 +	* erc.el 1.271:
 +	* added new function erc-connection-established which is called after receiving
 +	  end of MOTD (does nothing if it's been called before)
 +
 +	* added new hook erc-after-connect which is called from
 +	  erc-connection-established with the arguments server (the announced server)
 +	  and nick - which other arguments should be sent??
 +
 +	* added buffer variable erc-connected which is set to t the first time
 +	  erc-connection-established is called, set to nil again if we've been
 +	  disconnected
 +
 +	* set initial user mode
 +	  - added custom variable erc-user-mode which can be a string or a function
 +	    which returns a string
 +	  - new function erc-set-initial-user-mode gets called from
 +	    erc-connection-established
 +
 +2002-05-22  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.270: fixed bug where prompt was missing after reconnect
 +
 +2002-05-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.269:
 +	in erc-nickserv-identify: if network is unknown, just use "Nickserv"
 +
 +	* erc.el 1.268: * fixed some typos
 +
 +	* timestamping
 +	  - ctcp request messages and replies now have timestamp
 +	  - timestamps in front of error messages now in timestamp face
 +	  - added timestamp to more error messages
 +
 +	* ctcp reply messages, server ping message updated
 +
 +	* added variable erc-verbose-server-ping - check this instead of erc-paranoid
 +
 +	* added whowas on no such nick:
 +	  - added variable erc-whowas-on-nosuchnick
 +	  - in erc-server-401 do WHOWAS if erc-whowas-on-nosuchnick is non-nil
 +
 +	* erc.el 1.267: forgot documentaion for erc-nickserv-alist
 +
 +	* erc.el 1.266: NickServ identification changed and enhanced:
 +	- erc-nickserv-identify-autodetect now called from erc-server-NOTICE-hook
 +	- now possible to identify automatically without prompt:
 +	  - added custom variables erc-prompt-for-nickserv-password and
 +	    erc-nickserv-passwords
 +	- added erc-nickserv-alist containing the different networks' nickserv details
 +	- added function erc-current-network to determine the network symbol
 +	- fixed bug where identification on dalnet didn't work, because they now
 +	  require NickServ@services.dal.net
 +	  now sends to all NickServ with nick@server where possible
 +
 +2002-05-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.9:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +	* erc.el 1.265: erc.el:
 +	* fixed bug where topic wasn't being set when chanel name was provided
 +
 +	erc-fill.el:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +2002-05-16  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.264: whitespace fix
 +
 +2002-05-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.263:
 +	* added explanation of empty string working in erc-quit-reason-various-alist
 +	* removed the text property from erc-send-message, it caused problems
 +	  with /SV (as noticed by gbvb on IRC) and is obviously not needed
 +	* when receiving a ctcp query, convert type to uppercase to allow for
 +	  "/ctcp nick time" and not just "/ctcp nick TIME"
 +	* timestamp in front of server notices now shown in the timestamp face
 +
 +2002-05-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.262:
 +	- in erc-format-privmessage: `erc-format-timestamp' added to message after
 +	  message's text properties are applied so that it doesn't lose its face
 +
 +	- /quit without reason now works when `erc-quit-reason' is set to
 +	  `erc-quit-reason-various' and the empty string "" is defined in
 +	  `erc-quit-reason-various-alist'
 +
 +2002-05-13  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.16:
 +	* Applied Drewies patch to pop-up on nick changes when -popup-type is 'visible
 +
 +2002-05-12  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.15, erc.el 1.261:
 +	* erc-bbdb.el: pop up the buffer on /whois when erc-bbdb-popup-type is 'visible
 +	* erc.el: fix for empty quit reason problem by drewie.
 +
 +2002-05-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.260: disumu nick patch
 +	- added erc-show-my-nick (default t)
 +	  if t, show nickname like <nickname>
 +	  if nil, only show a > character before the message
 +	- added faces erc-nick-default-face and erc-nick-msg-face
 +	  - nicknames (channel, msgs, notices) are now in bold face by default
 +	  - the msg face matches the erc-direct-msg-face color
 +
 +2002-05-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.259 (erc-send-pre-hook): Doc change.
 +
 +	* CREDITS 1.4: Alexander L. Belikoff is confirmed original author.
 +
 +2002-05-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.258:
 +	timestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumu
 +
 +2002-05-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.257: *** empty log message ***
 +
 +2002-05-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.256:
 +	New var: erc-echo-notices-in-minibuffer-flag. defaults to t.
 +
 +2002-05-04  John Wiegley  <johnw@gnu.org>
 +
 +	* TODO 1.3: *** empty log message ***
 +
 +2002-05-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.255: Copyright notice, version string updates.
 +
 +2002-05-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.254: Comment: dme is David Edmondson
 +
 +2002-05-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.253 (erc-warn-about-blank-lines): New option.
 +	(erc-send-current-line): Use it.
 +	(erc-quit-reason-various-alist): New option.
 +	(erc-quit-reason): New option.
 +	(erc-quit-reason-normal): New function.
 +	(erc-quit-reason-zippy): New function.
 +	(erc-quit-reason-various): New function.
 +	(erc-cmd-QUIT): Use them.
 +
 +2002-04-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.252: Version 2.92
 +
 +	* erc.el 1.251 (erc-send-modify-hook): Default value is nil.
 +
 +2002-04-27  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.250:
 +	Don't redisplay the prompt if the ERC buffer is no longer alive.
 +
 +2002-04-26  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.249:
 +	Don't call `set-buffer' on old-buf unless the buffer is valid.  It's
 +	often not when separate frames are being used.
 +
 +2002-04-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.17: fixed up erc-nick-regexp
 +
 +2002-04-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.248:
 +	`erc-prompt' may now be a function that returns a string (which is
 +	used as the prompt). I don't use Customize but I think customization
 +	of it may be broken if it's not a string.
 +
 +	There is a new `erc-prompt' function that returns the prompt as a
 +	string (e.g., returning either the result of `(funcall erc-prompt)' or
 +	`erc-prompt').
 +
 +	This allows for dynamic prompts, such as a LispWorks-like prompt, or
 +	one containing simply the current channel name. It was requested by
 +	Mojo Nichols (nick michols) in #emacs today, 21-Apr-2002; cf. the
 +	#emacs logs at <URL:http://www.tunes.org/~nef/logs/emacs/02.04.21.
 +
 +2002-04-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.247:
 +	fix erc-send-current-line to work on empty lines again (without sending the prompt)
 +	Fix C-c C-t to not include the nick/time info
 +	(both from antifuchs)
 +
 +	* erc-complete.el 1.9: Fix for xemacs elt behaviour
 +
 +2002-04-17  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.17:
 +	Added a missing arg in a call to erc-chess-handler.
 +
 +2002-04-15  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.16: *** empty log message ***
 +
 +2002-04-14  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.15: *** empty log message ***
 +
 +2002-04-12  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.14: *** empty log message ***
 +
 +	* erc-chess.el 1.12: bug fixes
 +
 +	* erc-chess.el 1.11: *** empty log message ***
 +
 +2002-04-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.6: change order.
 +
 +	* erc-chess.el 1.5: more fixing.
 +
 +	Now, the 'match question works. It sends an accept back.
 +	But display popup doesnt work..
 +
 +	* erc-chess.el 1.4: fixup (still far from working)
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.246:
 +	* Added :options entry for erc-mode-hook (erc-add-scroll-to-bottom)
 +
 +2002-04-11  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.245: remove trailing \n from any sent text
 +
 +	* servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, 
 +	  erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, 
 +	  erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, 
 +	  erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 1.244:
 +	clean whitespace
 +
 +	* erc.el 1.243: Replaced erc-scroll-to-bottom.
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.10:
 +	try to fix behaviour when used with different frames.
 +
 +2002-04-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.2:
 +	fixup release, far from ready for real usage, but it appears to work.
 +
 +	* erc.el 1.242:
 +	speed improvments based on elp-instrument-package RET erc- RET results
 +
 +	* erc-chess.el 1.1: initial version.
 +	please test it
 +	Get chess.el from johnw's cvs:
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot login
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot co chess
 +
 +	(as usual, blank password)
 +
 +	Add the resulting dir to your load-path and reqire erc-chess.
 +
 +	Usage: Just do /chess nickname
 +	The remote end much use erc, as no other irc client I know of supports this ...
 +
 +	See erc-chess-default-display and maybe set it to chess-images or chess-ics1 if you prefer those over chess-plain.
 +	Also, see erc-chess-user-full-name to set the name you use in chess games.
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.241: New hackery latenightwise
 +
 +	* erc.el 1.240: upupadowndowncase
 +
 +2002-04-04  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.15: Updated for the new snapshot
 +
 +	* debian/rules 1.9: Install README.Debian into the package
 +
 +	* debian/README.Debian 1.1: Initial check-in
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.239:
 +	Fixed that /me in query buffers ended up in server buffer
 +
 +	* erc.el 1.238: * Implemented joining +k channels
 +
 +2002-03-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.237: New utility function: erc-channel-list
 +	minor fix to erc-get-buffer. hopefully that helps shapr
 +
 +2002-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.236:
 +	New /command: /QUOTE for sending directly to the IRC server
 +	Removed erc-fill from erc-insert-modify-hook. To activate filling, simply customize that var.
 +
 +2002-03-09  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.3: *** empty log message ***
 +
 +2002-03-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.7:
 +	New variable: erc-nick-completion-ignore-case. Defaults to t.
 +
 +	* erc-track.el 1.9:
 +	* erc-track-shorten-name-function can now be set to nil to avoid treating of channel names at all.
 +
 +2002-03-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.14, debian/rules 1.8: update to new snapshot
 +
 +2002-03-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.235:
 +	Fixed nasty bug which prevented channel limit from correctly display/handling
 +
 +	* erc-track.el 1.8: Made shortening code highly customizable.
 +	Now, there is the variable erc-track-shorten-function which holds
 +	a function which gets called with one argument, CHANNEL-NAMES, which is a list
 +	of strings of the channel names.
 +	It needs to return a list of strings of the same length with the modified values...
 +
 +	* erc-track.el 1.7:
 +	Added erc-track-shorten-aggressively, default to nil
 +	if it is set to t, erc will shorten a bit more.
 +	if nil, erc will shorten the name only if it would get shorter than just
 +	one char...
 +
 +	* erc-speak.el 1.21: added iirc to the abbreviation expansion list.
 +
 +	* erc-track.el 1.6:
 +	Added customization variable: erc-track-use-faces. defaults to t.
 +
 +	* erc-track.el 1.5: *** empty log message ***
 +
 +	* erc-track.el 1.4:
 +	experimental: Added face support to mode-line channel activity tracker.
 +	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal acitivity...)
 +
 +2002-03-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.6: * added docfixes (thanks ore)
 +
 +	* erc-track.el 1.3: Fixed channel-name reduction.
 +	thanks again alex.
 +	Renamed the vars to erc-track-opt-start and erc-track-opt-cutoff.
 +
 +	* erc.el 1.234: fixed another silly error
 +
 +	* erc-track.el 1.2: Implemented channel name shortening.
 +	Vars erc-track-cutoff says: all channel names longer than this will be shortened.
 +	Var erc-track-minimum-channel-length says: dont make names shorten than this.
 +	(Thanks go out to kensanata for the nice unique-substrings utility function).
 +
 +	* erc.el 1.233: silly typo corrected
 +
 +	* erc.el 1.232:	* erc.el 1.232: * New varialbe: erc-common-server-name-suffixes
 +	  This alist can be used to change the server names displayed in mode-line
 +	  to a shorter version..
 +	* New function: erc-shorten-server-name (uses var above)
 +	* Changed erc-prepare-mode-line to use erc-shorten-server-name.
 +
 +2002-02-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.231:
 +	CTCP handling rewritten. Seems to work. please test and report probs.
 +
 +2002-02-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.230:
 +	Fixed emacs20 backward compatibility (new defun/alias: erc-propertize)
 +
 +2002-02-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.15: *** empty log message ***
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.14, erc.el 1.229:
 +	minor fixup related to read-only prompts and command renaming.
 +
 +2002-02-21  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.228: * modify `erc-remove-text-properties-region' to work.
 +	  Could even be a little faster now. (-:
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ring.el 1.3:
 +	fixed erc-replace-command to behave right when text is read-only.
 +	Also, use erc-insert-marker and (point-max) now.
 +
 +	* erc.el 1.227: * Made erc-prompt read-only
 +	* new function: erc-make-read-only. Can be used on erc-insert-post-hook and erc-send-post-hook to ensure read-only buffer text too
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.4: added comment to docstring
 +
 +	* erc-speak.el 1.20: minor updates, use erc-nick-regexp now
 +
 +	* erc.el 1.226:
 +	ensure that erc-timer-hook is called inside the server-buffer.
 +
 +2002-02-19  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.4:
 +	* Probably fixed the "number-char-or-marker-p: nil" bug.
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.1: Initial release.
 +
 +	* erc.el 1.225: added #303 handling
 +	moved timer and added an arg (erc-current-time)
 +
 +	* erc-list.el 1.3, erc.el 1.224:
 +	slightly changed the erc-once-with-server-event macro
 +
 +	* erc-button.el 1.13: erc-button-alist: doc fix and custom type fix
 +
 +2002-02-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.2, erc.el 1.223: new macro: erc-once-with-server-event
 +	erc-list.el: use it
 +
 +	* erc-match.el 1.3:
 +	Minor fix related to hook call method change (-until-seccess now)
 +
 +	* erc.el 1.222: fixed ctcp behaviour abit (with auto-query on)
 +
 +	* erc-list.el 1.1: ChanList mode.
 +	Load it, and type M-x erc-chanlist RET
 +	Demonstrates how the new hook system can be nicely used.
 +
 +	* erc.el 1.221:
 +	new hook: erc-default-server-hook. This one gets called if we dont have anything defined for a certain IRC server message.
 +	New function: erc-default-server-handler. (used by above hook).
 +	New function: erc-debug-missing-hooks: Used by above hook to save a list of unimplemented server messages.
 +	New function: erc-server-buffer, erc-server-buffer-p.
 +	Various places: use it.
 +	Minor fixup.
 +
 +	* erc-button.el 1.12: fix regexp to not buttonize ~user@host hostnames
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.5, erc.el 1.220: Eliminated erc-command-table
 +	Upcased the command defuns (erc-cmd-join is now erc-cmd-JOIN)
 +	Fixed erc-complete to not require erc-command-table.
 +	Implemented erc-cmd-HELP
 +	  (You have to try that, its tooo coool!)
 +	  e.g. /help auto-q
 +	fixed autoloads for erc-add-pal and so on to be interactive.
 +
 +2002-02-17  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.2:
 +	* Fix unfunctional code in `erc-get-parsed-vector-type'.
 +
 +	* erc-bbdb.el 1.13, erc-button.el 1.11, erc-match.el 1.1, erc.el 1.219:
 +	* Be careful: MANY changes ahead. I won't go into too much details.
 +
 +	* erc.el, new file erc-match.el: split out all pattern-matching code.
 +	* erc.el: removed all defcusts for erc-{...}-highlight-props. They are
 +	  quite useless, anyway.
 +	* moved erc-add-entry-to-list and -remove- over to erc-match. changed
 +	  their arg list.
 +	* erc.el: add autoloads for erc-{add,delete}-{keyword,pal,fool,dangerous-host}
 +	* erc.el: erc-server-PRIVMSG-or-NOTICE:
 +	  - remove all the highlighting crap
 +	  - add a (when (eq s nil) ...) so that untreated CTCP messages don't
 +	    get misdisplayed.
 +	* erc.el: erc-mark-message: removed this function, it's useless
 +	* erc.el: minor bugfixes.
 +
 +	* erc-match.el: first checkin. This file now contains all the pattern
 +	  matching stuff. there is now another defcust group, erc-match,
 +	  containing all match related stuff (erc-keywords, ...)
 +	* erc-match.el: added functionality to log matching lines. Quite
 +	  customizable, check out the docstring of defun erc-log-matches
 +	* erc-match.el: added functionality to make foolish messages
 +	  invisible/intangible. This could replace erc-ignore-list
 +	  sometime. it's more powerful right now, anyway.
 +	* erc-match.el erc-text-matched-hook: new hook. run when Text matches
 +	  anything (pal, fool, etc.).
 +
 +	* erc-button.el: Make nick buttonization customizable.
 +	* erc-button.el: Give nick buttonization a lower priority so that it
 +	  does not break url buttons.
 +
 +	* erc-bbdb.el: Add \n to the separators by which we split nicknames.
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* TODO 1.2: Added item
 +
 +2002-02-17  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.2, erc.el 1.218: Added invisible timestamp support.
 +
 +2002-02-16  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.13, debian/rules 1.7, debian/scripts/install 1.5:
 +	updated to new snapshot
 +
 +2002-02-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.217:
 +	Fixed channel limit format overflow in mode-line display.
 +	(Having to use floats if integers are to large is quite strange, isn't it?)
 +
 +	* TODO 1.1: TODO list created.
 +	Add comments and expand it.
 +
 +	* erc.el 1.216:
 +	Fixed bug in query buffer handling (only happend in mixed-case situations)
 +
 +	* erc.el 1.215: shapr checkdoc patch #1
 +	massive docfixes! yay, keep going!
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.214: various other fixes
 +	make s301 a catalog entry
 +
 +2002-02-15  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.213: * erc-server-NICK and erc-server-INVITE: fixed to use
 +	  `erc-display-message'. These I missed in the first checkin.  I
 +	  didn't say it in the last log message, but please test these.
 +
 +	* erc-fill.el 1.7, erc.el 1.212:
 +	* erc.el: updated many functions to use `erc-display-message'. Now, we
 +	  should go for getting highlighting out of
 +	  erc-server-PRIVMSG-or-NOTICE. The part I want to attack has been
 +	  marked.
 +	* erc-fill.el: updated static filling to leave the erc-parsed property alone.
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.211:
 +	first step, new function: erc-display-message
 +
 +	* erc.el 1.210: added numreply 379 and 405.
 +
 +	* erc.el 1.209: stupid typo fixed
 +
 +	* erc.el 1.208:
 +	Finally renamed erc-frame-dedicated-p to erc-frame-dedicated-flag
 +	Removed usage of erc-interpret-controls from info buffer drawing (major speedup)
 +	Other speedups based on the results from elp.
 +	ERC is now about 300%-500% faster in some situations with very full channels!!!!!
 +
 +2002-02-14  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.207:
 +	* erc-downcase now downcases {}|^ with []\~ -- 'stolen' from zenirc.
 +	* various checkdoc fixes. Just the upper third of the file, but that
 +	  should help a little, too. (-: Again, if you have any writing
 +	  skills, take out that dusty keyboard and tap it to the beat of M-x
 +	  checkdoc!
 +
 +2002-02-14  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.206 (erc-format-privmessage):
 +	fix it, so timestamp-coloring works again (patch from antifuchs)
 +
 +2002-02-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.205: Many fixes based on M-x checkdoc RET.
 +	If you have write access, and some english knowledge, help document erc too!
 +	M-x checkdoc RET, and follow the instructions.
 +
 +	* erc-button.el 1.10, erc-ibuffer.el 1.13: minor fixes
 +
 +	* erc.el 1.204: Use nreverse instead of reverse.
 +	Use eq instead of equal where possible.
 +	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isnt good ina  defun which is called so often)
 +
 +2002-02-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.9, erc.el 1.203:
 +	In erc.el, new hook: erc-channel-members-changed-hook.
 +	erc-button.el: Now highlight all nicknames. uses regexp-opt.
 +
 +2002-02-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nets.el 1.1:
 +	Database of irc networks. Use erc-server-select to interactively select one.
 +
 +	* erc.el 1.202: * erc-format-nick-function: New variable.
 +	* (erc-format-nick): The default for above var. Just return the nick.
 +	* (erc-format-@nick): Prefix NICK with @ or + if OP or VOICE.
 +	* Removed erc-track-modified-channels related code and moved into erc-tracke.l
 +	   Its auto-loaded now
 +
 +	* erc-track.el 1.1: Split code from erc.el
 +
 +2002-02-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.12:
 +	* erc-target now uses erc-port-to-string
 +
 +	* servers.pl 1.1:
 +	Script to convert mircs servers.ini to a elisp salist kind of thing.
 +	(development tool, it doesnt help you much as a user)
 +
 +	* erc.el 1.201:
 +	* erc-display-line-buffer: renamed to erc-display-line-1
 +	* erc-port-equal: New function.
 +	* erc-normalize-port: Used by erc-port-equal
 +	* minor docstring fixes
 +
 +2002-02-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.200:
 +	* erc-already-logged-in-p: compare ports is more robust now.
 +
 +	* erc-button.el 1.8: * Add buttonization to erc-send-modify-hook, too
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.199:
 +	Use insert-before-markers instead of insert in erc-display-line-buffer
 +	This fixed point@column 0 problem and gives us some speedup! yay
 +
 +	* erc-ibuffer.el 1.11, erc.el 1.198: minor fixes
 +
 +	* erc.el 1.197:
 +	* (erc-line-beginning-position): Renamed to erc-beg-of-input-line.
 +	* (erc-line-end-position): Renamed to erc-end-of-input-line.
 +	* erc-multiline-input-p: Variable removed.
 +
 +	* erc.el 1.196:
 +	Minor docstring fixes (using M-x checkdoc-current-buffer)
 +	  If you find time, and you are native english speaker, do that too!!
 +
 +	* erc.el 1.195: fixed macro-invokation
 +
 +2002-01-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.194: * erc-with-all-buffers-of-server: use erc-list-buffers
 +	* erc-process-away, erc-{save,kill}-query-buffers: use it.
 +	* erc-cmd-away-all: new command. Set away/back on all servers.
 +
 +	* erc.el 1.193:
 +	* Fix last multiline bug in erc-send-distinguish-noncommands.
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.10, erc.el 1.192: minor fixes
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.9, erc-menu.el 1.3, erc-speak.el 1.19, erc.el 1.191:
 +	Renamed erc-track-modified-channels-minor-mode to erc-track-modified-channels-mode (at least, its a bit shorter)
 +	Added docstring to erc-server-hooks (through the macro)
 +	Minor docfix in obsolete hook
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.190:
 +	* erc-send-current-line: fix behaviour where buffer changes.
 +	* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
 +
 +	* erc-ring.el 1.2, erc.el 1.189:
 +	* new hooks: erc-send-pre-hook, erc-send-modify-hook, erc-send-post-hook
 +	* erc-send-this: new variable
 +	* erc-noncommands-list: new constant.
 +	* erc-send-distinguish-noncommands: use it. (First filter function for sending! yay!)
 +	* erc-send-current-line: nearly completely rewritten.
 +	  - now handles multiline input. (yay!)
 +	  - now uses the three hooks from above.
 +	* erc-process-line: new arg, no-command: don't process this line as a command.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.12, erc-button.el 1.7, erc-speak.el 1.18, erc.el 1.188:
 +	hook handling rewrite phase 1.
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.187: * Rework erc-server-PRIVMSG-or-NOTICE
 +	* New function: erc-is-message-ctcp-p
 +	* New function: erc-format-privmessage
 +	* New function: erc-mark-message
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* CREDITS 1.1, HISTORY 1.1:
 +	Initial checkin.
 +
 +2002-01-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.186: * erc-put-text-properties: make OBJECT optional
 +	* erc-put-text-property: same
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +	* Make erc-display-line-buffer: add the "\n" even when the string would be invisible.
 +	* same: make the \n invisible, too (:
 +
 +2002-01-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.8, erc.el 1.185:
 +	Rewrote channel tracking using window-configuration-change-hook instead of defadvices.
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.6, erc.el 1.184:
 +	* Macro define-erc-highlight-customization: Ease up defining
 +	  erc-{fool,pal,..}-highlight-props defcusts.
 +	* defcusts:
 +	  - erc-fool-highlight-props
 +	  - erc-pal-highlight-props
 +	  - erc-dangerous-host-highlight-props
 +	  - erc-keyword-highlight-props
 +
 +	  Customizable to either nil or "Hide message".
 +	* erc-string-invisible-p: check for invisible chars in string
 +	* erc-display-line-buffer: use it.
 +	* erc-put-text-properties: put a list of props into a piece of text.
 +	* erc-server-PRIVMSG-or-NOTICE: use it; set appropriate
 +	  highlight-props for entire incoming message. This set of changes
 +	  allows you to e.g. auto-ignore fools.
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.7:
 +	Added highlight detection support to the Mark column.
 +	Now p, k, f, and d indicate pal, keyword, fool and dangerous-host related activity.
 +
 +	* erc.el 1.183:
 +	Highlight tracking finished. All necessary info should now be in erc-modified-channels.
 +
 +	* erc.el 1.182, erc-ibuffer.el 1.6, erc-speedbar.el 1.7:
 +	Added highlight tracking to track-modified-channels
 +	   no display code yet, the info is just kept in erc-modified-channels
 +	Added erc-modified column to ibuffer
 +	speedbar update
 +
 +	* erc-ibuffer.el 1.5: Added erc-members column
 +
 +	* erc-ibuffer.el 1.4: *** empty log message ***
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.11:
 +	* Fix a slight typo. The hook function should be called in
 +	  erc-server-376-hook (-:
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.3: *** empty log message ***
 +
 +2002-01-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.2: Fixup, it sort of works now. Try it
 +
 +	* erc-ibuffer.el 1.1: Initial version
 +
 +2002-01-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.181: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.10: * fix two bad things:
 +	  - fix the "proc trick": pass proc as an arg through
 +	    ...-insinuate-... to ...-show-entry
 +	  - hook highlighting into the 376 hook. This one is bound to get
 +	    called (-:
 +	* We now only append to hooks only.
 +	* Highlighting of changing records gets updated automatically.
 +
 +2002-01-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.180: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.9: * nearly complete rewrite of erc-bbdb:
 +	  -  Removed code duplication in erc-bbdb-NICK and -JOIN.
 +	  -  Made erc-bbdb-show-entry more general and intelligent.
 +	  -  erc-bbdb-insinuate-entry is now erc-bbdb-insinuate-and-show-entry
 +	     (note the different arglist!):
 +	  -  erc-search-name-and-create now creates "John Doe" users if name
 +	     is not specified.
 +	  -  No sign of "mail" anywhere anymore. It's all finger-host. (-:
 +	  -  erc-bbdb-popup-p is now called erc-bbdb-popup-type.
 +	  -  New customize values:
 +	     . erc-bbdb-irc-channel-field     channel field name
 +	     . erc-bbdb-irc-highlight-field   (see below)
 +	     . erc-bbdb-auto-create-on-nick-p auto-create record on join
 +
 +	* Highlighting based on BBDB is now here! Specify which type of
 +	  highlighting a person in the BBDB (whose nick you know) and have
 +	  fun! Read help to erc-bbdb-init-highlighting for details. Changes:
 +	  -  new function erc-bbdb-init-highlighting: gets called on server
 +	     connect.
 +	  -  new function erc-bbdb-highlight-record: highlights a person's
 +	     nick names.
 +
 +2002-01-24  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-button.el 1.6:
 +	* Fix the erc-button-alist regexp for EmacsWiki stuff. delYsid's version
 +	  is better (-:
 +
 +	* erc-button.el 1.5: * Added an Ewiki: specifier to the url-regexp.
 +	  <nickname> EmacsWiki: EmacsIRCClient tells you <bla>
 +	  should highlight "EmacsWiki: EmacsIRCClient" and allow you to
 +	  browse to the wiki when the button is activated.
 +	* new custom: erc-emacswiki-url.
 +	* new function: erc-browse-emacswiki: use it.
 +
 +2002-01-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.8:
 +	erc-bbdb-NICK: Added regexp-quote around fingerhost search.
 +
 +2002-01-10  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.179:
 +	* Channel saving/killing on quit from server implemented:
 +	 - defcust erc-save-queries-on-quit: Save server's channel buffers on quitting from server
 +	 - defcust erc-kill-queries-on-quit: Kill server's channel buffers on quitting from server
 +	 - Macro erc-with-all-buffers-of-server: Run a form inside all the server's query buffers
 +	 - Functions erc-{kill,save}-query-buffers: use it.
 +	* Added indent-tabs-mode: t to Local Variables section.
 +
 +2002-01-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-replace.el 1.2: * fix stupid documentation errors.
 +
 +2002-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.178:
 +	* (toplevel): Revert previous change. This resulted ina  recursive load...
 +	   You have to put (require 'erc-button) into your .emacs for now
 +
 +2002-01-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.177:
 +	* Added require for erc-button. This is devel. so I need testers :)
 +
 +	* erc-button.el 1.4: * Added proper file headers (GPL).
 +
 +2002-01-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.3: * erc-button-alist: Added entry for finger
 +
 +	* erc-button.el 1.2: * Removed bogus usage of :button-keymap.
 +	P
 +	   Does anyone know what this was supposed to do anyway?
 +
 +	* erc-button.el 1.1: * Initial version.
 +	* This module allows a way of buttonizing text in IRC buffers.
 +	  Default it is used for URLs, but other things could be added.
 +	  see if you can find another use, erc-button-alist
 +
 +See ChangeLog.01 for earlier changes.
 +
-     Copyright (C) 2002, 2006 Free Software Foundation, Inc.
++    Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
diff --cc ChangeLog.03
index 3606668,0000000..cf0f4f7
mode 100644,000000..100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@@ -1,2151 -1,0 +1,2151 @@@
 +2003-12-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.595 (erc-cmd-HELP):
 +	Changed to prefer giving help for erc-cmd-* functions over
 +	   similarly-named Elisp functions (e.g., erc-cmd-LIST vs. list).
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.594 (erc-query-buffer-p): Added this function.
 +
 +2003-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.593 (erc-cmd-SV): Use erc-emacs-build-time.
 +
 +	* erc-compat.el 1.15: erc-emacs-build-time: New variable.
 +
 +	* erc.el 1.592 (erc-cmd-SAY):
 +	Reintroduced the feature where the spaces between
 +	"/SAY" and the rest of the line were being sent with the message.
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.591 (erc-server-buffer-p):
 +	Fixed a bug where this function sometimes would return
 +	    nil when it should return t.
 +
 +2003-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.590 (erc-generate-new-buffer-name):
 +	Really fixed a bug where ERC would reuse
 +	    a connected server buffer when erc-reuse-buffers is non-nil.
 +	(erc-cmd-JOIN): Now we tell the user when he attempts to join the same
 +	    channel twice on the same server.
 +
 +	* erc.el 1.589 (erc-generate-new-buffer-name):
 +	Fixed a bug where ERC would reuse a connected server buffer when erc-reuse-buffers is non-nil.
 +
 +	* erc.el 1.588 (erc-cmd-SAY):
 +	Fixed a bug where the spaces between "/SAY" and the rest of the
 +	    line were being sent with the message.
 +
 +	* erc-list.el 1.15: Fixed another typo.
 +
 +	* erc-list.el 1.14: Fixed a typo.
 +
 +	* erc-list.el 1.13:
 +	Added text to the top of the channel list buffer describing the keybinding for
 +	function erc-chanlist-join-channel.
 +
 +	* erc-list.el 1.12: Minor appearance changes.  No functional change.
 +
 +	* erc-list.el 1.11:
 +	Implemented function erc-chanlist-join-channel.  Added variable
 +	erc-chanlist-channel-line-regexp.  Got rid of function
 +	erc-chanlist-pre-command-hook.  Changed the logic for how channel lines are
 +	highlighted.
 +
 +2003-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-list.el 1.10:
 +	Removed a bunch of unused code.  No semantic change.
 +
 +	* erc-list.el 1.9: Added lots of functionality.
 +
 +2003-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.58, erc.el 1.587:
 +	New custom type erc-message-type, use it in erc-hide-list and erc-track-exclude-types
 +
 +2003-12-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.57 (track-when-inactive): New module.
 +	(erc-track-visibility): New option.
 +	(erc-buffer-activity): New variable.
 +	(erc-buffer-activity-timeout): New variable.
 +	(erc-user-is-active): New function.
 +	(erc-buffer-visible): New function.
 +	(erc-modified-channels-update): Replace get-buffer-window call
 +	with call to erc-buffer-visible.
 +	(erc-track-modified-channels): Ditto.
 +
 +2003-12-14  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-track.el 1.56 (erc-modified-channels-update):
 +	Force update of modeline.  Makes sure
 +	that the tracked channels disappear in other buffers too.
 +
 +2003-12-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.586 (define-erc-module):
 +	New optional argument LOCAL-P.  If non-nil, then
 +	mode will be created as buffer-local rather than a global mode.
 +	(erc-cmd-CTCP): Fix indentation from last commit.
 +
 +	* erc-compat.el 1.14 (erc-define-minor-mode):
 +	Deal with :global and :group keywords.
 +
 +	* erc-nickserv.el 1.13 (erc-current-network):
 +	Make server regex more permissive.
 +
 +	* erc.el 1.585 (erc-cmd-CTCP):
 +	Don't add a space to end of command when ARGS are
 +	empty.  This fixes a bug whereby requests of the form "VERSION " were
 +	being sent, and ignored.
 +
 +2003-11-27  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.9: From Adrian Aichner <adrian@xemacs.org>
 +	* erc-log.el (erc-log-file-coding-system): Use 'binary
 +	coding-system under XEmacs (instead of 'emacs-mule).
 +	* erc-log.el (erc-w32-invalid-file-characters): Removed as no
 +	longer needed.
 +	* erc-log.el (erc-generate-log-file-name-long): Use
 +	`convert-standard-filename', which exists in XEmacs too.
 +
 +2003-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-identd.el 1.1: Code provided by johnw, thanks!
 +
 +2003-11-09  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.584 (erc-latest-version): Clean up docstring.
 +	Remove requirement for w3, wrap REQUIRE statement in IGNORE-ERRORS.
 +	Update viewcvs url to correct location.
 +	(erc-ediff-latest-version): Make sure that we find the uncompiled
 +	erc.el, error if not.
 +
 +2003-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.583: Add more info to /sv
 +
 +2003-11-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.582: Added optional argument BUFFER to erc-server-buffer-p.
 +
 +2003-11-04  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.6: Add sachac
 +
 +2003-11-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.581 (erc-server-366):
 +	chnl is 4th element of parsed, not fifth.
 +	(erc-channel-end-receiving-names): Pass correct number of arguments
 +	to delete-if-not.
 +
 +	* erc.el 1.580 (erc-update-current-channel-member):
 +	 Use erc-downcase when comparing
 +	nick entries.  Cleanup indentation.
 +
 +2003-11-01  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-sound.el 1.4: Added a (provide 'erc-sound) line.
 +
 +	* erc.el 1.579 (erc-cmd-NAMES): send to TGT, not CHANNEL.
 +
 +2003-10-29  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.21, erc.el 1.578, CREDITS 1.6:
 +	Merged Jeremy Maitin-Shepard's patch for time-sensitive nick completion.
 +
 +2003-10-27  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.19, debian/changelog 1.24:
 +	New Debian package 4.0.cvs.20031027
 +
 +2003-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.577: Fix typo tuncate->rruncate
 +
 +2003-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.80: From Stephan Stahl <stl@isogmbh.de>:
 +	 * (erc-dcc-send-block): Kill buffer if transfer completed correctly.
 +
 +2003-10-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.55 (erc-track-disable):
 +	Do not deactivate all advices for `switch-to-buffer',
 +	just disable the erc specific one. (Bug#217022).
 +
 +2003-10-18  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.8 (erc-log-file-coding-system): New variable.
 +	(erc-save-buffer-in-logs): Use it.
 +
 +2003-10-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.576 (erc-interpret-mirc-color): New boolean defcustom
 +
 +	* erc.el 1.575: Do not use -nowait on darwin (thanks johnw)
 +
 +2003-10-15  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.574 (define-erc-module):
 +	Set erc-FOO-mode appropriately in erc-FOO-enable
 +	and erc-FOO-disable.
 +
 +2003-10-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.12 (erc-mode):
 +	Reset idletime on connect. Fixes an annoying bug which
 +	flooded the server with aways on reconnect.
 +	(erc-autoway-reset-idletime): Accept optional args so we can hook it
 +	onto erc-server-001-hook.
 +
 +2003-10-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.573 (erc-hide-list): Add a nice defcustom type
 +
 +2003-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.18, debian/changelog 1.23, debian/control 1.8:
 +	Debian snapshot 20031008
 +
 +	* erc-speedbar.el 1.11:
 +	Patch from Eric M. Ludlam <eric@siege-engine.com>:
 +	 - (erc-install-speedbar-variables): Add functions list (needs new speedbar?)
 +	 - (erc-speedbar-buttons): Add doc.  Clear the buffer
 +	 - (erc-speedbar-sort-channel-members): New function.
 +	 - (erc-speedbar-expand-channel): Call new sort function.  Change some visuals.
 +	 - (erc-speedbar-insert-user): Change some visuals based on channel data.
 +	 - (erc-speedbar-line-text, erc-speedbar-item-info): New functions
 +	Add proper elisp file header.
 +
 +2003-10-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.22 (erc-match-syntax-table): New variable.
 +	(erc-match-current-nick-p): Use it.
 +
 +	* erc.el 1.572 (erc-quit-reason-zippy, erc-part-reason-zippy): Use
 +	`erc-replace-regexp-in-string' rather than
 +	`replace-regexp-in-string'.
 +	(erc-command-indicator-face): New face, used to show commands if
 +	`erc-hide-prompt' is nil and `erc-command-indicator' is non-nil.
 +	(erc-command-indicator): Clean up doc-string.
 +	(erc-display-prompt): New optional argument FACE, use this rather
 +	than `erc-prompt-face' to fontify the prompt if non-nil.
 +	(erc-send-current-line): Pass in `erc-command-indicator-face' to
 +	`erc-display-prompt'.
 +
 +	* erc-compat.el 1.13 (erc-replace-regexp-in-string): New function.
 +	Alias for `replace-regexp-in-string' on Emacs 21.
 +	Argument massaging for `replace-in-string' for XEmacs.
 +
 +2003-09-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.571 (erc-keywords): Removed. Wasn't used by anything.
 +
 +2003-09-25  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.570: ERC-HIDE-PROMPT: add custom group
 +	ERC-COMMAND-INDICATOR: new variable.
 +	ERC-COMMAND-INDICATOR: new function.
 +	ERC-DISPLAY-PROMPT: new argument, PROMPT, used to override default
 +	prompt.
 +	ERC-SEND-CURRENT-LINE: pass ERC-COMMAND-INDICATOR to ERC-DISPLAY-PROMPT.
 +
 +2003-09-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.569 (erc-parse-line-from-server):
 +	Ignore empty lines as required by RFC.
 +
 +2003-09-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.568: Add lag time calculation
 +
 +2003-09-13  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.17, debian/README.Debian 1.7, debian/changelog 1.22:
 +	New debian release
 +
 +	* erc-notify.el 1.22:
 +	Call erc-notify-install-message-catalogs on load, not on module init
 +
 +	* erc.el 1.567 (erc-update-modules):
 +	Use `load' instead of `require'.  XEmacs appears
 +	to have the NOERROR arg only sometimes... Strange
 +
 +	* erc.el 1.566: No fboundp if we have a defvar
 +
 +	* erc.el 1.565: Properly defvar erc-ping-handler
 +
 +2003-09-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.564 (erc-setup-periodical-server-ping):
 +	check if erc-ping-handler is
 +	    bound before referencing it
 +
 +2003-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.563 (erc-cmd-NICK):
 +	Warn about exceeded NICKLEN if we know it.
 +
 +	* erc.el 1.562: Make erc-server-PONG obey erc-verbose-server-ping.
 +	Cancel old `erc-ping-handler' timer when restablishing connection in the same
 +	buffer.
 +
 +	* debian/changelog 1.21, Makefile 1.16: New debian snapshot
 +
 +	* erc-dcc.el 1.79, erc-xdcc.el 1.6:
 +	Use new function erc-dcc-file-to-name to convert spaces to underscores
 +
 +	* erc-xdcc.el 1.5: Add autoload for erc-xdcc-add-file
 +
 +2003-09-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.78: indent fixes and copyright update
 +
 +	* erc.el 1.561:
 +	erc-send-ping-interval: New defcustom which defaults to 60.
 +	Every 60 seconds, we send PING now.
 +	This should fix the "connection silently lost" bug.
 +	Please test this change extensively, and report problems.
 +
 +2003-09-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.560 (erc-default-coding-system):
 +	Test for undecided and utf-8
 +	before setting.
 +
 +2003-09-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.559 (erc-modules): Add some more symbols to the set
 +
 +	* erc.el 1.558 (erc-modules):	* erc.el 1.558 (erc-modules): Add :greedy t to the set in 
 +
 +	* erc-dcc.el 1.77:
 +	More autoloads which make dcc autoload upon ctcp dcc query received.
 +
 +	* erc-dcc.el 1.76 (erc-cmd-DCC): Add Autoload.
 +	(pcomplete/erc-mode/DCC): Ditto, makes DCC autoloadable just by using
 +	completion.
 +	Also only offer "send" if fboundp make-network-process.
 +
 +	* erc-autojoin.el 1.6: Update copyright
 +
 +	* erc-autojoin.el 1.5 (erc-autojoin-add):
 +	Only add the channel if it is not already there.
 +
 +	* erc-notify.el 1.21:
 +	Use `define-erc-module' instead of old `erc-notify-initialize'.
 +	Now defines the global minor mode erc-notify-mode, and should also
 +	be controllable via `erc-modules' with symbol `notify'.
 +
 +	* erc.el 1.557 (erc-modules):
 +	Fix paren-in-column-zero bug in docstring.
 +	Add a sort of bogus, but still better :type.
 +	Add autojoin and netsplit by default.
 +	(erc-update-modules): Dont barf with an error if `require' fails.
 +	We can still error out if the mode is not defined.
 +
 +2003-08-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.556:
 +	* make 353 (NAMES reply) output go into the appropriate channel buffer
 +	  (if it exists) or into the active erc buffer (if not).
 +
 +2003-08-29  mtoledo  <mtoledo@confusibombus>
 +
 +	* erc.el 1.555:
 +	Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today.
 +
 +2003-08-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.554: Fix typo in varname which led to a compiler warning
 +
 +	* AUTHORS 1.5: Added lawrence
 +
 +2003-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.75:
 +	Set process and file-coding system to 'binary (for Windows)
 +
 +	* erc-stamp.el 1.30: Rename custom group erc-timestamp to erc-stamp.
 +
 +2003-08-07  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-fill.el 1.23 (erc-fill-disable):
 +	Remove erc-fill, not erc-fill-static from
 +	erc-insert-modify-hook.
 +
 +2003-08-05  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.553 (erc-send-current-line):
 +	Now we display the prompt for previously entered commands
 +	    based on the value of customization variable erc-hide-prompt.  This change is
 +	    closely related to revision 1.552 by wencem.
 +
 +2003-08-04  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.552 (erc-send-current-line):
 +	If we're sending a command, don't display
 +	the prompt.
 +
 +2003-08-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.54: patch from David Edmondson (dme AT dme DOT org)
 +
 +	This patch makes button 3 on the erc-track buffer names in the
 +	modeline show the selected buffer in another window. It's analogous to
 +	button 2 which shows the buffer in the current window.
 +
 +2003-07-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.551 (erc-display-line-1):
 +	Fixed bad indentation on one line.  No semantic change.
 +
 +2003-07-29  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.21:
 +	Quote open paren in docstring of erc-text-matched-hook
 +
 +	* erc.el 1.550: Anchor match only at beginning in erc-ignored-user-p.
 +
 +	* erc-button.el 1.47: New variable erc-button-wrap-long-urls.
 +	Modified erc-button-add-buttons:
 +	  New optional argument REGEXP.
 +	  If we're buttonising a URL and erc-button-wrap-long-urls is
 +	  non-nil, try and wrap them
 +
 +	Modified erc-button-add-buttons-1:
 +	  Pass regexp to erc-button-add-buttons.
 +
 +2003-07-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.549 (erc-network-name):
 +	Improved docstring.  Removed an unnecessary call to erc-server-buffer.
 +
 +2003-07-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.548: By lawrence:
 +	(erc-ignored-user-p): Use anchored regexp.
 +	(smiley): Fix missing quote in `remove-hook' call.
 +
 +2003-07-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-nets.el 1.4, erc-nickserv.el 1.12, erc.el 1.547:
 +	Changed all references to Openprojects into references to Freenode.
 +
 +2003-07-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.546:
 +	Now variable erc-debug-irc-protocol is defvar'ed instead of defcustom'ed.
 +	Made the docstring clearer too.
 +
 +	* erc.el 1.545: Fixed a wrong-type-argument error from window-live-p.
 +
 +2003-07-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.7 (erc-log-setup-logging):
 +	set buffer-file-name to "", as (basic-save-buffer)
 +	    will prompt for a buffer name before invoking hooks. the buffer-file-name
 +	    will be overridden by (erc-save-buffer-in-logs) anyway - the main danger
 +	    of doing this is write-file-contents hooks. Let's see if anyone complains.
 +	(erc-save-buffer-in-logs): return t, so that further write hooks are not run
 +
 +2003-07-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.74 (erc-dcc-open-network-stream):
 +	-nowait still crashes emacs cvs - disable for now
 +
 +2003-07-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.544 (erc): Minor docstring modification.
 +
 +2003-07-01  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-match.el 1.20 (erc-match-current-nick-p):
 +	match only on word boundaries
 +
 +	* erc-log.el 1.6 (erc-log-setup-logging):
 +	not sure how this crept in again - make sure we set
 +	    buffer-file-name to nil, since otherwise it is not possible to open
 +	    previous correspondence in another buffer while a conversation is open
 +
 +2003-06-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.543 (erc-network-name):
 +	Now makes some intelligent guesses if the server didn't tell
 +	    us the network name.
 +
 +2003-06-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.542 (erc-default-coding-system): Use utf-8 as the default
 +	encoding for outgoing stuff and undecided as the default for
 +	incoming stuff.
 +	(erc-coding-sytem-for-target): New.
 +	(erc-encode-string-for-target): Use it.
 +	(erc-decode-string-from-target): Use it.  Removed the flet
 +	erc-default-target hack and documented the dynamically bound
 +	variable `target' instead.
 +
 +2003-06-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.541 (erc-log-irc-protocol):
 +	Now we keep point on the bottom line of the window
 +	    displaying the *erc-protocol* buffer if it is at the end of the
 +	    *erc-protocol* buffer.
 +
 +	* erc.el 1.540:
 +	Added some text to the docstring for variable erc-debug-irc-protocol.
 +
 +2003-06-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.73 (erc-dcc-auto-mask-p):
 +	Fixed a docstring typo that caused a load-time error.
 +
 +	* erc-dcc.el 1.72 (erc-dcc-auto-mask-p):
 +	Changed reference to undefined variable erc-dcc-auto-mask-list
 +	    to erc-dcc-auto-masks.
 +	Changed default value of variable erc-dcc-auto-masks to nil and added text to its
 +	    docstring.
 +
 +	* erc-notify.el 1.20 (erc-notify-timer and erc-notify-QUIT):
 +	Added network name to notify_off message.
 +
 +	* erc.el 1.539 (erc-network-name):
 +	Now returns the name of the IRC server if the network name
 +	    cannot be determined.
 +
 +	* erc-notify.el 1.19 (erc-notify-JOIN and erc-notify-NICK):
 +	Added argument ?m to call to erc-display-message.
 +
 +	* erc-dcc.el 1.71 (erc-dcc-do-LIST-command):
 +	Fixed a bug where I assumed (plist-get elt :type)
 +	    returns a string -- it really returns a symbol.
 +
 +	* erc-notify.el 1.18 (erc-notify-timer):
 +	Now we include the network name in the notify_on message.
 +
 +	* erc.el 1.538:
 +	New function: erc-network-name.  Returns the name of the network that the
 +	    current buffer is associate with.  Not every server sends the 005 messages
 +	    that enable the network name to be known.  If the network name is
 +	    not known, the string "UNKNOWN" is returned.
 +
 +	* erc-dcc.el 1.70 (erc-dcc-chat-setup):
 +	Added a comment.  Fixed a bug where a DCC CHAT buffer has no
 +	    prompt when it first appears.
 +
 +	* erc-dcc.el 1.69 (erc-dcc-chat-parse-output):
 +	Now a DCC chat buffer displays the nick using
 +	    erc-nick-default-face just like in a channel buffer.
 +
 +2003-06-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.537 (erc-display-prompt):
 +	Fixed incorrect indentation.  No semantic change.
 +
 +	* erc.el 1.536 (erc-strip-controls):
 +	Minor change to regexp that matches IRC color control
 +	    codes.  I was seeing usage as follows: ^C07colored text^C^C04other color.
 +	    Now we strip a ^C followed by zero, one, or two digits.  Before this change,
 +	    we stripped a ^C followed by one or two digits.
 +
 +	* erc-dcc.el 1.68 (erc-dcc-do-LIST-command):
 +	Improved format of output of /DCC LIST.  Now the
 +	    "Size" column for a DCC GET includes the percentage of the file that has
 +	    been retrieved.
 +	(erc-dcc-do-GET-command): Now it works if erc-dcc-default-directory is set.
 +
 +2003-06-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.5:
 +	* added quickstart information to the comments up the top
 +
 +2003-06-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.535:
 +	Default to open-network-stream on MS Windows. (thanks lawrence)
 +
 +2003-06-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.534 (erc-process-input-line):
 +	refactor so that wrong-number-of-arguments is
 +	    caught when using do-not-parse-args - this lets do-not-parse-args
 +	    commands display help messages on incorrect syntax in a uniform manner.
 +	    This no longer raises a bad-syntax error - was this a catch-all to stop a
 +	    backtrace? Does it belong?
 +	(erc-cmd-APPENDTOPIC): the correct way to display help when you want to
 +	    accept an abitrary string is to (signal 'wrong-number-of-arguments nil).
 +	    This fixes a bug where people could not /at topics with a space in them.
 +
 +2003-06-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.533:
 +	Re-add the last few changes which weren't merged for some reason.
 +
 +	* erc.el 1.532 (erc-cmd-APPENDTOPIC): show help when given no arguments
 +
 +	Patch from MrBump. Fixes problem with erc-set-topic inserting ^C characters
 +	into the topic. Also removes dependency on CL.
 +
 +2003-06-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.531:
 +	Added comment to explain (eval-after-load "erc" '(erc-update-modules)).
 +
 +2003-06-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.20: Add completion for /unignore
 +
 +2003-05-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.12 (erc-encode-coding-string): The default binding,
 +	if encode-coding-string was not available, must be a defun that
 +	takes multiple arguments.  Did that.
 +
 +2003-05-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.530:
 +	Add handlers for 313 and 330 (by arne@rfc2549.org, thanks)
 +
 +2003-05-30  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.529:
 +	patch from MrBump to make /mode #foo +b work again (erc-cmd-BANLIST only
 +	temporarily changes them now)
 +
 +2003-05-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.528 (erc-select):
 +	server is now defaulted with erc-compute-server.
 +	A few cosmetic fixes.
 +	(erc-default-coding-system): Renamed from erc-encoding-default.
 +	(erc-encoding-default): Renamed to erc-default-coding-system.
 +	(erc-encoding-coding-alist): Documentation updated to cover regexps.
 +	(erc-encode-string-for-target): Now considers keys of
 +	erc-encoding-coding-alist to be regexps.  Rely on erc-compat
 +	wrt. MULE support.
 +	(erc-decode-string-from-target): New function.
 +	(erc-send-current-line): eq -> char-equal fix.
 +	(erc-server-TOPIC): topic is now decoded with
 +	erc-decode-string-from-target.
 +	(erc-parse-line-from-server): Line from server is no longer decoded
 +	here.
 +	(erc-server-PRIVMSG-or-NOTICE): Message from a user is decoded here,
 +	sspec -> sender-spec for clarity.  Cosmetic if -> when fix.
 +	(erc-server-TOPIC): sspec -> sender-spec
 +	(erc-server-WALLOPS): Ditto.
 +
 +	* erc-compat.el 1.11 (erc-decode-coding-string):
 +	Now requires coding-system as an argument.
 +
 +2003-05-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.527:
 +	erc-part|quit-hook is only run on a part|quit directed to our nick, reflect that in the docstring to avoid confusion
 +
 +2003-05-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-truncate.el 1.3:
 +	* erc-truncate-buffer-to-size: use fboundp. Scheme takes its toll...
 +
 +2003-05-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el 1.2: remove require of erc-log
 +	(erc-truncate-buffer-to-size): use erc-save-buffer-in-logs when it's
 +	there, else, dont.
 +
 +2003-04-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.4, erc-truncate.el 1.1, erc.el 1.526: erc.el:
 +		* erc-cmd-QUIT: Remove references to code in erc-log.el, to
 +		  not force autoloading of erc-log.el
 +		* erc-server-PART: ditto.
 +		* erc-quit-hook: new hook, run when /quit command is
 +		  processed.
 +		* erc-cmd-QUIT: use it.
 +		* erc-part-hook: new hook, run then PART message is
 +		  processed.
 +		* erc-cmd-PART: use it.
 +		* erc-connect-pre-hook: new hook, run before connection to IRC
 +		  server is started.
 +		* erc: use it.
 +		* erc-max-buffer-size: Move truncation variables and functions
 +		  to erc-truncate.el
 +		* erc-truncate-buffer-on-save: moved to erc-log.el
 +		* erc-initialize-log-marker: new function.
 +	erc-log.el:
 +		* erc-truncate-buffer-on-save: New defcust here; from erc.el
 +		* erc-truncate-buffer-on-save: Put it in group `erc-log'
 +		* erc-log-channels-directory: Remove trailing slash from
 +		  default value.
 +		* Add functions to erc-connect-pre-hook, erc-part-hook and
 +		  erc-quit-hook to avoid getting autoloaded.
 +
 +	erc-truncate.el:
 +		* Contains the truncation functions and defcusts from erc.el.
 +		* define-erc-module clause added; new erc-truncate-mode.
 +
 +2003-04-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.525 (erc):
 +	Check wether erc-save-buffer-in-logs is bound, too
 +
 +	* erc.el 1.524 (erc):
 +	Check wether erc-logging-enabled is bound before using it - not
 +	everyone is using erc-log.el!
 +
 +2003-04-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.3:
 +	* while we're at it, remove the (declare (ignore ignore)) statements.
 +
 +	* erc-log.el 1.2:
 +	* add autoload statement for erc-log-mode/etc. Sorry for the delay.
 +
 +	* erc-log.el 1.1, erc.el 1.523: * erc.el:
 +		- move variables and functions to erc-log.el:
 +			 defgroup `erc-log'
 +	                 defcustom `erc-log-channels-directory'
 +			 defcustom `erc-log-insert-log-on-open'
 +			 defcustom `erc-generate-log-file-name-function'
 +			 defun `erc-save-buffer-in-logs' (autoloads from erc-log.el)
 +	 		 defuns `erc-generate-log-file-name-*'
 +			 defun `erc-current-logfile'
 +			 defun `erc-logging-enabled' (autoloads from erc-log.el)
 +		- erc-truncate-buffer-to-size: fix for double-saving bug when
 +		  writing out truncated buffer contents. Thanks, lawrence mitchell <wence@gmx.li>!
 +		- erc-remove-text-properties-region: Fix case for read-only text.
 +		- erc-send-current-line: update insert-marker before calling the hooks.
 +		                         also, wrap (erc-display-prompt) so that it doesn't toggle
 +					 buffer-modified-p.
 +		- erc-interpret-controls: remove /very/ old commented-out function
 +		- erc-last-saved-position: make it a marker
 +		- erc: use it.
 +
 +	* erc-log.el: (thanks, lawrence mitchell <wence@gmx.li>!)
 +		- Move logging code from erc.el here
 +		- define-erc-module log: add; minor mode erc-log-mode is the
 +		  same as adding the `erc-save-buffer-in-logs' to
 +		  erc-send-post-hook and `erc-insert-post-hook'.
 +		- erc-w32-invalid-file-characters: add.
 +		- erc-enable-logging: add.
 +		- erc-logging-enabled: use it.
 +		- erc-logging-enabled: autoload.
 +		- erc-save-buffer-in-logs: fix for truncating saved buffer with read-only text.
 +		- erc-save-buffer-in-logs: use erc-last-saved-position.
 +		- erc-save-buffer-in-logs: fix saving half-written messages on
 +		  the prompt when saving the log file. (simply uses
 +		  erc-insert-marker as an upper bound for saving).
 +
 +2003-04-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.522:	* erc.el 1.522: erc-modules: added 
 +
 +2003-04-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* Makefile 1.15 (UNCOMPILED): Added erc-compat.el.
 +	(clean): Remove .elc files, too.
 +	Patch by Hynek Schlawack <hynek+erc@hys.in-berlin.de>
 +
 +2003-04-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.46:
 +	erc-button-keymap: set the parent keymap to erc-mode-map
 +
 +2003-04-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.521:
 +	erc-official-location: shouldn't the official location be the base URL of erc?
 +
 +	* erc.el 1.520:
 +	erc-modules: updated the docstring to make the semantics clearer
 +
 +2003-04-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.519:
 +	Fix problem where % in NOTICE produced errors (from mmc)
 +
 +2003-04-18  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.518 (erc-toggle-debug-irc-protocol):
 +	moved a reference to 'buf' inside the let
 +	    statement which defines it. it's difficult to tell what the original
 +	    intentions were here - at the moment the debug window is displayed when
 +	    toggling either way.
 +
 +	* README 1.3, erc.el 1.517:
 +	(erc-update-modules: added a condition in for erc-nickserv -> erc-services
 +
 +	* erc-pcomplete.el 1.19:
 +	- that change to erc-update-modules making it require the modules first means
 +	  we don't need any special case handling here, so i reverted the previous
 +	  change
 +
 +	* erc.el 1.516:
 +	- don't require 'erc-auto, since windows users don't have access to make.
 +	  instead, we handle it in (erc-update-modules)
 +
 +2003-04-17  Damien Elmes  <erc@repose.cx>
 +
 +	* README 1.2, Makefile 1.14:
 +	Updated Makefile and documentation to reflect the new release
 +
 +	* erc.el 1.515:
 +	- note the previous change also updated the release number to erc 4.0!
 +	(erc-connect): fix a bug introduced by the previous release
 +
 +	* erc.el 1.514:
 +	fixed about 20 instances of (message (format ...)) which will break if the
 +	format returns a string with %s in it
 +
 +	* erc.el 1.513: erc-error-face: make it red, not pink
 +
 +	* erc-pcomplete.el 1.18:
 +	since pcomplete is autoloaded via erc-completion-mode, and completion is in
 +	erc-modules by default, we remove completion when pcomplete is added
 +
 +	* erc.el 1.512 (define-erc-module): no need for delete, use delq
 +
 +	* erc-members.el 1.5 (erc-nick-channels):
 +	(erc-person-channels) takes one arg
 +	(erc-format-user): again, they all take an arg
 +
 +	* erc.el 1.511:
 +	- require erc-auto when loading, so the default `erc-modules' can be loaded.
 +	  this makes erc-auto no longer a convenience but a necessity - all the name
 +	  of user friendliness.
 +	(define-erc-module): the enable and disable routines now update erc-modules
 +	    accordingly
 +	erc-modules: new variable controllig the modules which erc has loaded/will
 +	    load. when customising, it will automatically enable modules. it won't
 +	    automatically disable modules which are removed, yet.
 +	(erc-update-modules): enable all modules in `erc-modules'
 +
 +	* erc-dcc.el 1.67 (erc-dcc-open-network-stream):
 +	use the -nowait equiv if available
 +	erc-dcc-server-port: removed
 +	erc-dcc-port-range: allows a range of values, so you can have more than one
 +	    dcc
 +	(erc-dcc-server): support erc-dcc-port-range
 +	(erc-dcc-chat): use OCHAT for outgoing chat for now. we need to fix the
 +	    issues with allowing more than one chat with the same person
 +
 +	* erc.el 1.510:
 +	erc-log-channels: removed; set the directory to start logging
 +	(erc-directory-writeable-p): create directory if it doesn't exist, check if
 +	    it's writeable
 +	(erc-logging-enabled): don't reference erc-log-channels
 +
 +2003-04-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.509 (erc):
 +	but when inserting the contents of a previous logfile, use the logfile
 +	    name, not ""!
 +
 +	* erc.el 1.508 (erc):
 +	set buffer-file-name to "", since we have a custom saving function and
 +	    it's not needed. this enables one to open a log file with previous
 +	    correspondence, while talking to the person at the same time
 +
 +2003-03-29  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.507 (erc-prepare-mode-line-format):
 +	Now strips all text properties from the target before
 +	    putting it in the mode line.  Keeps the mode line looking consistent.
 +	(erc-channel-p): Improved docstring.
 +
 +2003-03-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.506 (erc-generate-log-file-name-with-date): New function.
 +	(erc-generate-log-file-name-function): Make it available.
 +
 +2003-03-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.505:
 +	Fix erc-prompt and erc-user-mode custom :type (Closes: #185794)
 +
 +2003-03-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.504:
 +	erc-server-hook-list: correct documentation of ordering of (proc parsed)
 +
 +2003-03-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.53 (erc-modified-channels-string):
 +	Make it a risky-local-variable.
 +
 +2003-03-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.52 (erc-track-modified-channels):
 +	Use (point-min) if we don't find a
 +	parsed-property, so it won't error out with nil...
 +
 +2003-03-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.51 (erc-track-switch-buffer):
 +	removed call to erc-modified-channels-update, as
 +	    this is done correctly on buffer switching in both emacs and xemacs now
 +
 +2003-03-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.50 (erc-find-parsed-property):
 +	simplified a little, so it shouldn't return nil anymore
 +
 +	* erc.el 1.503: erc-send-post-hook: document narrowing which occurs
 +
 +2003-03-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.49 (erc-find-parsed-property): New function.
 +	(erc-track-modified-channels): Use it instead of relying on
 +	point-min.
 +
 +2003-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.502:
 +	Fix erc-set-topic to accept a channel name as first word
 +
 +2003-03-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.66:
 +	Small patch (<10 lines, also slightly modified by Jorgen Schäfer) from
 +	David Spreen <netzwurm@debian.org> to add hostmask-authentication to
 +	DCC auto-accept.
 +
 +	erc-dcc-auto-mask-list: New variable
 +	(erc-dcc-handle-ctcp-send): Check erc-dcc-auto-mask-list
 +	(erc-dcc-auto-mask-p): New function
 +	erc-dcc-send-request: Docstring now mentions erc-dcc-auto-mask-list
 +
 +2003-03-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.11 (erc-clear-input-ring):
 +	New function.  Erases the contents of the input ring for
 +	   the current ERC buffer.
 +
 +2003-03-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.501:
 +	(erc-display-line-1) and (erc-send-current-line): Now these functions reset erc-insert-this
 +	    to t as soon as possible after consuming the value of that variable.  See the comments in
 +	    the code for the strange symptom this fixes.
 +	(erc-bol): Changed to call point-at-eol instead of line-end-position.  This increases XEmacs
 +	    portability, since XEmacs doesn't have line-end-position.  Patch suggested by Scott Evans
 +	    on the ERC mailing list.
 +
 +2003-03-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.500: banlist*: patch from mrbump to avoid using cl packages
 +
 +2003-03-04  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.499:
 +	Changed erc-noncommands-list from a constant to variable, so that users can
 +	    add their own erc-cmd-* functions to the list.  Improved the docstring too.
 +
 +2003-03-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.498 (erc-server-353):
 +	Now the output of "/NAMES #channel" appears in the currently
 +	    active ERC buffer, even if the user is not a member of #channel.
 +
 +	* erc.el 1.497 (erc-cmd-DEOP):
 +	Fixed a syntax error: invalid read syntax ")" caused by my last change.
 +
 +2003-03-01  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.496 (erc-cmd-DEOP):
 +	Fixed a wrong-type-argument error caused by calling split-string
 +	    on a list instead of on a string.  Removed the call to split-string entirely,
 +	    because it wasn't needed.
 +
 +	* erc.el 1.495 (erc-cmd-HELP):
 +	Changed to use intern-soft instead of intern.  Now "/HELP floob"
 +	    doesn't create a void function symbol erc-cmd-FLOOB.
 +
 +2003-02-25  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.494 (erc-cmd-SERVER):
 +	remove erroneous references to line, use server instead
 +
 +2003-02-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.493 (erc-toggle-debug-irc-protocol):
 +	Fixed a bug where the global value of
 +	    kill-buffer-hook was being modified instead of the buffer-local value.
 +
 +2003-02-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.492 (erc-cmd-KICK):
 +	Now supports any number of words in the REASON string.  Examples
 +	    of the /KICK command are:
 +	      /KICK franl You don't belong here
 +	      /KICK franl Bye
 +	      /KICK franl
 +	      /KICK #channel franl Go away now
 +	      /KICK #channel franl Bye
 +	      /KICK #channel franl
 +
 +2003-02-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.29 (erc-insert-timestamp-right):
 +	Make the timestamp rear-nonsticky, so
 +	C-e works at the beginning of the next line.
 +
 +2003-02-16  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.28:
 +	* s/choose/choice/ in customize options, as kensanata requested.
 +
 +2003-02-15  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.491 (erc-toggle-debug-irc-protocol):
 +	Now if the *erc-protocol* buffer is killed,
 +	    logging is turned off.  Prior to this change, the buffer would come back
 +	    into existence (generally unbeknownst to the user) after being killed.
 +
 +2003-02-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.490 (erc-send-current-line):
 +	we can't inhibit everything here when not connected,
 +	    as the user will expect commands like /server still to work. the
 +	    erc-cmd-handler should recover from errors instead
 +
 +2003-02-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.489:
 +	* we now run erc-after-connect on 422 (no motd) messages as well as the motd
 +	  messages
 +	(erc-login): revert the previous change
 +
 +	* erc.el 1.488 (erc-login): register that we're connected
 +
 +2003-02-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-members.el 1.4: * Provide erc-members
 +	* Fix excessive )
 +	* Comment out broken self-tests
 +
 +2003-02-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.487 (erc-connect):
 +	notify the user we're trying to connect when using asych
 +	    connections
 +
 +	* erc.el 1.486 (erc-connect): support an asyncronous connection
 +	(erc-process-sentinel): ditto
 +
 +	* erc-track.el 1.48:
 +	* advise switch-to-buffer in the case of xemacs, since it doesn't have
 +	  window-configuration-change-hook
 +
 +	* erc.el 1.485 (erc-send-current-line):
 +	if not connected, refuse to send either a message or
 +	    a command
 +
 +	* erc.el 1.484: (erc-save-buffer-in-logs):
 +	    - check for a sensibile region before saving the buffer. if the
 +	      connection process is killed early on, there is not a sensible region
 +	      to save
 +	    - don't set buffer-file-name on save. we don't need it, and it means we
 +	      can now find-file a log while an existing query is open with that
 +	      user
 +
 +	* erc.el 1.483 (erc-process-input-line):
 +	when displaying the help for a function, if no
 +	    documentation exists, don't fall over
 +	(erc-cmd-SAY): new function for quoting lines begining with /
 +	(erc-server-NICK):
 +	    - fix a bug where the "is now known as" message doesn't appear on newly
 +	      created /query buffers
 +	    - when a user changes their nick, update the query to point to the new
 +	      nick
 +
 +	* erc.el 1.482 (erc-send-current-command):
 +	don't reject multi-line commands. since
 +	    multiline-p is used as the no-command arg to erc-process-current-line,
 +	    multi-line text is never interpreted as a command. i believe this is the
 +	    correct behavior - it allows people to post the output of things like df
 +	    (sans header). if you want to change this, please provide a rationale
 +	    in the changelog
 +
 +	* erc.el 1.481 (erc-send-current-line):
 +	only match the first line when determining if a
 +	    multi-line command is allowed
 +
 +2003-02-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-bbdb.el 1.21 (erc-bbdb-highlight-record):
 +	Use alternate strings, not character
 +	classes to split the nick-field.
 +
 +2003-02-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.479 (erc-process-sentinel):
 +	Now we set erc-connected to nil every time we disconnect
 +	    from a server, not just when an unexpected disconnect happens.
 +
 +	* erc.el 1.478 (erc-connected):
 +	Removed redundant defvar of this variable.  Improved the
 +	    docstring.
 +	(erc-login): Changed to send a correct RFC2812 USER message (see section
 +	    3.1.3 of RFC2812 for the documentation of the semantics of each argument
 +	    of the USER message.
 +
 +2003-02-02  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.477 (erc-cmd-NOTICE): fix from mrbump
 +
 +2003-01-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.476 (erc-cmd-JOIN):
 +	Now we only send one JOIN command to the server when a channel
 +	    key is provided.
 +
 +2003-01-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.475 (erc-remove-channel-member):
 +	Fixed so that it runs erc-channel-members-changed-hook
 +	    with the channel buffer current, as is documented in the docstring for variable
 +	    erc-channel-members-changed-hook: "The buffer where the change happened is
 +	    current while this hook is called."
 +
 +2003-01-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.474:
 +	(erc-ignored-user-p),(erc-cmd-IGNORE),(erc-cmd-UNIGNORE): Now nicks are ignored
 +	    on a per-server basis.  Now, erc-ignore-list is only valid in server
 +	    buffers!  Do not reference it in channel buffers.
 +
 +	* erc.el 1.473 (erc-cmd-IGNORE):
 +	Now says "Ignore list is empty" if it erc-ignore-list is empty
 +	    instead of showing an empty list.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.11 (services): Defined a module
 +
 +2003-01-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.472 (erc-process-ctcp-query):
 +	Display recipient of CTCP query if it's not
 +	our current nick.
 +
 +	* erc.el 1.471 (erc-cmd-WHOIS):
 +	Accept an optional second argument SERVER.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.27 (stamp): erc-add-timestamp must always be added
 +	with the APPEND parameter -- not only when adding it on the right.
 +
 +2003-01-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-members.el 1.3 (erc-channel-members-changed-hook): Obsolete, use
 +	erc-members-changed-hook instead.  When it is set, add its content
 +	to erc-members-changed-hook.
 +	(erc-update-channel-member): Obsolete, use erc-update-member
 +	instead.  Defalias to that effect.
 +	(erc-remove-channel-member): New and already obsolete.  Use
 +	erc-remove-nick-from-channel instead.
 +	(erc-update-channel-info-buffer): Obsolete, use ignore instead.
 +	Yes, these have to go.
 +	(erc-channel-member-to-user-spec): Obsolete, use erc-format-user
 +	instead.
 +	(erc-format-user): New.
 +	(erc-ignored-reply-p): New, use it.
 +
 +	* erc-members.el 1.2:
 +	Further along the way.  Any function from erc.el that uses
 +	channel-members should end up in this file, rewritten to use
 +	erc-members.
 +
 +	(erc-person): Call erc-downcase before getting
 +	something from the hash.
 +	(erc-nick-in-channel): Checking wether erc-process must be used is
 +	unnecessary -- this will be done in erc-person.
 +	(erc-nick-channels): New.
 +	(erc-add-nick-to-channel, erc-update-member): Call erc-downcase
 +	before putting something into the hash.
 +	(erc-buffer-list-with-nick): New.
 +	(erc-format-nick, erc-format-@nick): New, backwards incompatible.
 +	Must check for other places that call these!
 +	(erc-server-PRIVMSG-or-NOTICE): Use the new version.
 +
 +	* erc-compat.el 1.10 (view-mode-enter): defalias to view-mode, if
 +	view-mode-enter is not fboundp and view-mode is -- as is the case
 +	in XEmacs.  We need view-mode-enter in erc-match.el.
 +
 +2003-01-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.470 (erc-default-server-handler):
 +	Minor performance improvement: allow the lambda
 +	    expression to be byte-compiled.
 +
 +2003-01-23  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.469 (erc-cmd-BANLIST):
 +	in the absence of a fill-column, use the screen width
 +
 +2003-01-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.468:
 +	patch from MrBump to delay fetching the banlist until /bl is run, so we don't
 +	fetch it when joining a channel anymore
 +
 +	* erc-ring.el 1.10:
 +	* instead of adjusting hooks when loaded, provide (erc-ring-mode). you'll
 +	  need to run (erc-ring-mode 1) now to get the ring
 +	* (erc-previous-command), (erc-next-command):
 +	    - check if the ring exists and create it if necessary
 +	    - don't do anything if the ring is empty
 +
 +	* erc-pcomplete.el 1.17:
 +	Put "how to use" documentation in the comments up the top
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.4 (erc-autojoin-version): New.
 +
 +	* erc-autojoin.el 1.3 (erc-autojoin-add): Added body.
 +	(erc-autojoin-remove): Added body.
 +	(erc-autojoin): Provide it.
 +
 +2003-01-21  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.467: erc-cmd-*: removed a bunch of references to force
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.2 (erc-autojoin-channels-alist): More doc.
 +
 +2003-01-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.1:
 +	new, based on resolve's mail, and the stuff on the wiki
 +
 +	* erc-members.el 1.1: new
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.6, debian/changelog 1.20, debian/scripts/install 1.11, 
 +	  debian/scripts/startup.erc 1.4, Makefile 1.13:
 +	Prepare for 20030119 debian package
 +
 +	* erc-dcc.el 1.65: <rant>
 +	* (erc-decimal-to-ip): Since XEmacs decides that return a completely
 +	and utterly wrong number from string-to-number if it is larger than
 +	the integer boundary, instead of sanely converting the thing to
 +	a float, we now (concat dec ".0").
 +	</rant>
 +
 +	* erc.el 1.466:
 +	* (erc-log-irc-protocol): Use erc-propertize, not propertize
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.45 (erc-button-add-buttons): Added regexp-quote for
 +	the list case, too.
 +
 +2003-01-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.64 (erc-dcc-member): fix for case where a prop is nil
 +
 +	* erc-dcc.el 1.63 (erc-dcc-member):
 +	fix for xemacs's version of plist-member
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.17: Delete empty strings from the ison-list
 +
 +	* erc-track.el 1.47:
 +	* (erc-track-switch-buffer): Call erc-modified-channels-update here.
 +
 +	* erc-track.el 1.46: * toplevel: require 'erc-match
 +
 +	* erc-track.el 1.45: * (erc-track-mode): Make autoload interactive
 +
 +	* erc-button.el 1.44: * (button): Make the autoload interactive
 +
 +	* erc.el 1.465:
 +	* (erc-mode): Comment out the case-table stuff, breaks xemacs
 +	* (erc-downcase): Revert.
 +
 +	* erc-dcc.el 1.62:
 +	* (erc-dcc-handle-ctcp-send): Use erc-decimal-to-ip on the ip we get...
 +
 +	* erc-speak.el 1.25:
 +	Eliminate reference to erc-nick-regexp, which no longer exists
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.26 (erc-timestamp-right-column): New, default nil.
 +	(erc-insert-timestamp-right): Use it, if non-nil.  Verbose
 +	doc string.
 +
 +2003-01-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.464 (erc-downcase): Use the old behavior in non-CVS Emacs.
 +
 +	* erc.el 1.463 (erc-cmd-QUIT): Remove &rest. The correct fix follows.
 +	(erc-cmd-GQUIT): Pass "" to erc-cmd-QUIT.
 +	(erc-mode): Use the case-table only in CVS Emacs. See comment.
 +
 +	* erc.el 1.462 (erc-cmd-QUIT): make reason optional.
 +
 +	* erc.el 1.461 (erc-cmd-GQUIT): Fixed typo.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.460:
 +	* (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
 +
 +	* erc.el 1.459: * (erc-mode): Define a proper case-table.
 +	* (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
 +
 +	* erc-button.el 1.43: * (erc-button-add-buttons): regex-quote the nick
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.42 (button): erc-channel-members-changed-hook no
 +	longer has erc-recompute-nick-regexp.
 +	(erc-button-alist): Use channel-members instead of
 +	erc-nick-regexp.
 +	(erc-button-add-buttons): Split some code into
 +	erc-button-add-buttons-1, and now handle strings, lists, and
 +	alists.  Regular expressions in lists and alists are enclosed in
 +	< and >.
 +	(erc-button-add-buttons-1): New.
 +	(erc-nick-regexp): Deleted.
 +	(erc-recompute-nick-regexp): Deleted.
 +
 +	* erc-button.el 1.41: Remove require cl again.
 +	(erc-mode-map): No longer bind widget-backward and widget-forward.
 +	(erc-button-alist): Explain why byte-compiling makes no sense, and
 +	remove all calls to byte-compile.
 +	(erc-button-keymap): Define it the standard way, without exposing
 +	the list nature of the keymap.
 +	(erc-button-marker-list): Deleted.
 +	(erc-button-add-buttons): Simplify.  In particular, create the
 +	button using the real callback, instead of using the intermediate
 +	erc-button-push, and only store the data as described for
 +	erc-button-alist.
 +	(erc-button-remove-old-buttons): Simplify.  No more list munging.
 +	Instead, just remove all the properties that we add in
 +	erc-button-add-button.
 +	(erc-widget-press-button): Deleted.
 +	(erc-button-click-button): New, for mouse clicks.  Moves point to
 +	where the mouse is, and calls erc-button-push.
 +	(erc-button-push): Instead of matching again, just use the
 +	erc-callback and erc-data properties at point to do the right
 +	thing.
 +	(erc-button-entry): Deleted.
 +	(erc-button-next): Use error instead of the beep plus message
 +	combo.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.11 (erc-autoaway-set-back):
 +	Don't pass a force argument to erc-cmd-GAWAY.
 +
 +	* erc.el 1.458 (erc-cmd-AWAY): Removed usage of the force variable.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.40 (button):
 +	erc-recompute-nick-regexp is no longer added to
 +	erc-channel-members-changed-hook unconditionally, but only if
 +	erc-button-mode is enabled, and if it is disabled, it is removed
 +	again.
 +	(erc): Require cl for delete-if.
 +	(erc-button-remove-old-buttons): Rewrote using delete-if to
 +	prevent exceesive consing.  Having the marker list is still ugly,
 +	so another solution needs to be found.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.457 (erc-banlist-store):
 +	Don't assume there's always a setter in the banlist reply.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.39 (erc-button-url-regexp): Changed regexp according
 +	to a suggestion by Max Froumentin <mf@w3.org>.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.456:
 +	fix erc-remove-channel-member again to not error out on nil as first arg...
 +
 +	* erc.el 1.455: * (erc-occur): New function
 +
 +2003-01-17  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.454: erc-banlist-*: return nil so further hooks are called
 +
 +	* erc.el 1.453 (erc-server-368):
 +	supress "end of ban list" messages - use /listbans now
 +
 +	* erc.el 1.452 (erc-send-current-line):
 +	removed the check for leading whitespace again - the
 +	    only time we want to prohibit multi-line commands is if / is the first
 +	    thing on the line
 +	(erc-get-arglist): new defun for reading a function's arglist which should
 +	    work with older copies of emacs. we use help-function-arglist if it's
 +	    available, though, since that has support for reading subrs, etc
 +
 +	* erc.el 1.451 (erc-cmd-JOIN): fixed (again)
 +
 +	* erc.el 1.450: * fixed call to erc-cmd-NICK when connecting
 +	* support for listing bans and mass unbanning, again thanks to MrBump
 +
 +	* erc.el 1.449 (erc-set-topic):
 +	patch from MrBump (Mark Triggs, mst@dishvelled.net) to strip
 +	    control chars and topic attribution in C-c C-t
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.448:
 +	* (erc-remove-channel-member): Do not use delq, modify the list using setcdr like delq does.
 +	In theory, this should be way faster since the list doesnt get traverse two times.
 +	Measurement didn't show any real difference though :(, this system is flawed for channels with >300 users it seems...
 +	Also moved some defcustoms up.
 +
 +2003-01-16  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.447: moved misplaced paren
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.446 (erc-cmd-UNIGNORE):
 +	reference argument directly - no string matching
 +
 +	* erc.el 1.445 (erc-extract-command-from-line):
 +	hmm, thinko in the canonicalisation. should
 +	    be fixed
 +
 +2003-01-16  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.444 (erc-send-current-line):
 +	Changed the regexp used to match /COMMANDs so that leading
 +	    whitespace is taken into account.
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.61: * (erc-dcc-do-SEND-command): Fix it
 +
 +	* erc-ezbounce.el 1.4, erc-lang.el 1.2: Arglist changes...
 +
 +	* erc.el 1.443: Various docstring fixes and additions.
 +
 +	* erc-notify.el 1.16:
 +	* (erc-cmd-NOTIFY): Change the function arglist to (&rest args)
 +
 +	* erc-netsplit.el 1.8: * (erc-cmd-WHOLEFT): Has no args...
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-fill.el 1.22:
 +	erc-fill-column: default to 78, so things like docstrings don't get wrapped
 +	    in an ugly manner
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.442:
 +	* (erc-cmd-default): Take a substring, now /mode works again.
 +	* (erc-cmd-AWAY): Put do-not-parse-args t
 +	* (erc-cmd-GAWAY): Ditto, and fix it.
 +	* (erc-cmd-CTCP): Switch to argument system.
 +	* (erc-cmd-KICK): Do the same.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.60:
 +	* (erc-cmd-DCC): Fixed for the new scheme, simplified.
 +	* (erc-dcc-do-CHAT-command): Ditto.
 +	* (erc-dcc-do-CLOSE-command): Ditto.
 +	* (erc-dcc-do-LIST-command): Ditto.
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.441:
 +	erc-error-face: setting a background doesn't work so well with multi-line
 +	    messages, so we don't. fg colour is negotiable ;-)
 +	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
 +	(erc-send-current-line): allow multi-line messages provided they don't start
 +	    with a slash - there's no need to prohibit them if the slash isn't the
 +	    first character
 +
 +	* erc.el 1.440: * bad-syntax now reports like incorrect-args
 +	* bunch of extra cmds fixed, nick, sv etc.
 +
 +	* erc.el 1.439 (erc-cmd-HELP): fixed
 +	(erc-extract-command-from-line): when deterimining canon-defun, make sure we
 +	    have a valid symbol
 +	(erc-cmd-KICK): fixed
 +
 +	* erc.el 1.438:
 +	* removed duplicate do-no-parse-args properties for the defaliased defuns
 +	(erc-process-input-line): show function signature when incorrect args
 +	(erc-extract-command-from-line): canonicalise defaliases before extracting
 +	    plist
 +	(erc-cmd-CLEAR): fixed
 +	(erc-cmd-UNIGNORE): fixed again
 +
 +	* erc.el 1.437 (erc-cmd-SET): fixed
 +	(erc-cmd-UNIGNORE): fixed
 +	(erc-process-input-line): report when incorrect arguments are provided to a
 +	    command, and show the command's docstring
 +
 +	* erc.el 1.436 (erc-cmd-APPENDTOPIC): fixed
 +	(erc-process-input-line): more informative error message than 'bad syntax'
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.435: * (erc-cmd-IGNORE): fixed
 +
 +	* erc.el 1.434: * (erc-cmd-NAMES): fixed
 +
 +	* erc.el 1.433:
 +	* (erc-cmd-CLEARTOPIC): Simplify, fix doc, make interactive
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.432 (erc-cmd-JOIN):
 +	correct invite behavior, and document it.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.431: * (erc-cmd-PART): Put 'do-not-parse-args t
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.430 (erc-cmd-JOIN): new cmd argument syntax
 +	(erc-process-input-line): check if (erc-extract-command-from-line) returned a
 +	    list, and apply if that's the case
 +
 +	* erc.el 1.429:
 +	erc-cmd-*: remove optional force and references to `force' in the code
 +	(erc-cmd-AMSG): call erc-trim-string, not trim-string
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.428:
 +	* (erc-cmd-CLEARTOPIC): LINE is now ARGS and already parsed.
 +	Set erc-cmd-TOPIC to 'do-not-parse-args for now.
 +	(comment: I think we should have 'first, so that only first word is parsed...
 +	 Or we could autodetect erc-channel-p in the parser before that somehow...)
 +
 +	* erc.el 1.427: * (erc-cmd-OP): LINE is PEOPLE now, and already parsed.
 +
 +	* erc-notify.el 1.15:
 +	* (erc-cmd-NOTIFY): Arg LINE is now ARGS, and already parsed.
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.25 (erc-insert-timestamp-right):
 +	Prefer erc-fill-column to window-width,
 +	because on wide screens the timestamp could wander off too far to the
 +	right.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.426: This is the "everything is suddenly broken!" release
 +	You know, this is CVS, you can still go back, and wait until the transition
 +	is finished, but here is patch one, which basicly breaks every command
 +	which is typed on the prompt.
 +	Hit me, we can still revert, but something needs to be done about this.
 +	* (erc-extract-command-from-line): intern-soft the function here.
 +	If the function symbol has a property 'do-not-parse-args, operate as before,
 +	otherwise, split the arguments prior to calling the command handler.
 +	* (erc-process-input-line): Updated to accomodate the change above.
 +	* (erc-send-distinguish-noncommands): Ditto.
 +	* (erc-cmd-NAMES): Ditto.
 +	* (erc-cmd-ME): Put 'do-not-parse-args property.
 +
 +	* erc-dcc.el 1.59:nick:	* erc-dcc.el 1.59: * erc-dcc-list: Renamed 
 +	* (erc-dcc-member). Treat :nick as either a nick!user@host or nick,
 +	do appropriate comparisons, simplified.
 +	* (erc-dcc-list-add): New functions
 +	various callers of (cons (list ...) erc-dcc-list) updated.
 +	Other stuff I'm to bored to document now
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.24 (erc-insert-timestamp-right):
 +	Removed redundant code that overrid the
 +	window-width. Now substracts (length string) from every found
 +	indentation positions.
 +
 +2003-01-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.425:
 +	* (erc-cmd-AMSG): Remove useless call to erc-display-message.
 +
 +	* erc-dcc.el 1.58:
 +	* erc-dcc-chat/send-request: New variables, control how to treat
 +	incoming dcc chat or send requests. Can be set to 'ask, which behaves
 +	like it did before, 'auto, which accepts automatically, and
 +	'ignore, which ignores those type of requests completely.
 +	* (erc-cmd-CREQ): New user-level command.
 +	* (erc-cmd-SREQ): Ditto.
 +
 +	* erc.el 1.424: * (erc-cmd-AMSG). New command.
 +
 +	* erc-xdcc.el 1.4: * (erc-xdcc): delete empty strings from ARGS
 +
 +	* erc-dcc.el 1.57: * erc-dcc-ipv4-regexp: New constant
 +	* (erc-ip-to-decimal): Use it.
 +	* erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:	* erc-dcc-host: :type
 +	* (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
 +	* Some docstring/comment fixes.
 +
 +	* erc-stamp.el 1.23:
 +	* (erc-insert-timestamp-right): Subtract (length string) from
 +	POS in any case, otherwise, linewrap occurs.
 +
 +	* erc-dcc.el 1.56:
 +	* Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
 +	  and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
 +	* Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
 +	* Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
 +
 +2003-01-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-xdcc.el 1.3:
 +	* erc-xdcc-help-text: New variable which makes replies to the originator
 +	much more flexible.
 +	* erc-xdcc-help-format: Removed.
 +	* (erc-xdcc-help): Handle the new variable.
 +	* (erc-xdcc): Simplified
 +
 +	* erc-xdcc.el 1.2: * erc-xdcc-handler-alist: New variable.
 +	* (erc-xdcc): Move code for list and send sub-commands into
 +	* (erc-xdcc-help): New function.
 +	* (erc-xdcc-list): New function.
 +	* (erc-xdcc-send): New function.
 +
 +2003-01-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.423 (erc-server-JOIN):
 +	Oops, send MODE command only when *we* joined a channel.
 +
 +	* erc.el 1.422:
 +	Fixing ERCs behavior wrt IRCnet's !channels have a different name for
 +	JOIN than in reality (e.g. you can join !forcertest or !!forcertest
 +	and really get to !ABCDEforcertest)
 +
 +	(erc-cmd-JOIN): Removed erc-send-command MODE.
 +	(erc-server-JOIN): Ask for MODE now.
 +
 +2003-01-12  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.55:
 +	(erc-dcc-get-filter), (erc-dcc-get-file): store size as a string, not an
 +	    integer. check size > 0 for the case where a size wasn't provided, since
 +	    string-to-int will return 0 on an empty string
 +
 +2003-01-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.54: * Use RAWFILE arg with find-file-noselect
 +	* Fix alist/plist conversion left-over
 +	* Add verbose-info about sending blocks.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.53: * (pcomplete-erc-mode/DCC): Fixes
 +
 +	* erc-xdcc.el 1.1: Initial version.
 +
 +	* erc-pcomplete.el 1.16:
 +	* (erc-pcomplete): Fix so that cycle-completion works again.
 +	* (pcomplete-parse-erc-arguments): If there is a space after the last word
 +	before point, we need to return a "" arg, and it's position.
 +
 +	* erc-dcc.el 1.52: Fix to pcomplete/erc-mode/DCC
 +
 +	* erc-dcc.el 1.51: * (pcomplete/erc-mode/DCC): New function
 +
 +	* erc-dcc.el 1.50: *** empty log message ***
 +
 +	* erc-dcc.el 1.49: Move code around, just basic changes
 +
 +2003-01-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.22 (erc-insert-timestamp-right):
 +	Check wether erc-fill-column is
 +	available before using it. Else default to fill-column or if
 +	everything else fails, the window width of the current window. For the
 +	fill-columns, use them directly as the starting position for the
 +	timestamp.
 +
 +2003-01-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.21:
 +	erc-insert-timestamp-right: use correct window's window-width. If
 +	                  buffer is not in a window, use erc-fill-column.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.48:	* erc-dcc.el 1.48: * (erc-dcc-do-LIST-command): Fix 
 +
 +	* erc-dcc.el 1.47:
 +	* buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
 +	  Keep This info in erc-dcc-member :sent and :confirmed plist values
 +	* :	* :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
 +	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-conntected, which now prints a msg...
 +
 +	* erc-dcc.el 1.46:
 +	* (erc-dcc-chat-accept): Renamed from erc-dcc-chat. Callers updated.
 +	* (erc-dcc-chat): Renamed from erc-dcc-chat-request.
 +	Callers updated, and interactive form added.
 +	* (erc-dcc-server-accept): No longer do any type-specific stuff.
 +	* (erc-dcc-chat-sentinel): Call erc-dcc-chat-setup if event is "open from "
 +	from here, otherwise call erc-dcc-chat-close.
 +
 +	* (
 +
 +	* erc-dcc.el 1.45: *** empty log message ***
 +
 +	* erc-dcc.el 1.43: Moved some functions around.
 +	Doc string fixes.
 +	"/dcc send nick filename" works now
 +
 +2003-01-11  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.421 (erc-send-command): Fixed flood protect message.
 +
 +	* erc-button.el 1.38 (erc-button-syntax-table): Make `-' a legal nick
 +	constituent.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.42: Some more steps toward dcc send.
 +
 +2003-01-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.14 (erc-notify-timer):
 +	Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-JOIN): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-NICK): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-QUIT): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-cmd-NOTIFY): Now "/notify -l" lists the nicks on your notify list.  Now
 +	    when you remove a nick from your notify list, you no longer recieve a spurious
 +	    signoff notification for that nick.  Changed to make it IRC-case-insensitive when
 +	    comparing nicks.
 +
 +	* erc.el 1.420 (erc-ison-p):
 +	Fixed so it calls erc-member-ignore-case instead of member.
 +
 +	* erc.el 1.419 (erc-member-ignore-case):
 +	New function.  Just like member-ignore-case, but obeys
 +	    the IRC protocol case matching rules.
 +
 +2003-01-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.41:
 +	(erc-dcc-do-GET-command), (erc-dcc-get-file): use the plist syntax, this
 +	    fixes dcc get again
 +
 +2003-01-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.418: erc-complete-functions: New variable.
 +	erc-mode-map: Bind \t to 'erc-complete-word
 +	erc-complete-word: New function.
 +
 +	* erc-pcomplete.el 1.15 (erc-pcomplete-mode):
 +	Use new erc-complete-functions
 +	(erc-pcomplete): Check that we're in the input line, else return nil.
 +
 +	* erc-button.el 1.37 (erc-button-mode): Use new erc-complete-functions
 +	erc-button-old-tab-command: Removed.
 +	(erc-button-next-or-old): Removed
 +	(erc-button-next): check that we're not in the input line, else just return nil.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.40: cleanup
 +
 +	* erc-dcc.el 1.39:
 +	* (erc-dcc-chat-request): No longer use erc-send-ctcp-message.
 +
 +	* erc-dcc.el 1.38:
 +	* (erc-dcc-no-such-nick): Also call delete-process if we have a peer already
 +
 +	* erc-dcc.el 1.37:
 +	* (erc-dcc-no-such-nick): New function, server event handler for event 401.
 +	If we send a CTCP message requesting something dcc related, we set up an
 +	entry in erc-dcc-list before sending the request (for the server proc object
 +	for listening conns for example).  But if that nick does not exist
 +	on that server, we now nicely cleanup erc-dcc-list again.
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.36: Moved code around a bit, and doc fixes
 +
 +	* erc-dcc.el 1.35: *** empty log message ***
 +
 +	* erc-dcc.el 1.34: Rename erc-dcc-plist to erc-dcc-list
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.33 (erc-dcc-server (erc-dcc-chat-setup):
 +	use erc's (erc-setup-buffer) to determine how to
 +	    display new DCC windows
 +	(erc-dcc-chat-buffer-killed): buffer-local hook for DCC buffers to close the
 +	    process
 +	(erc-dcc-chat-close): code common to a killed buffer or a disconnection from
 +	    the other side
 +	(erc-dcc-chat-sentinel): use (erc-dcc-chat-close)
 +	(erc-dcc-server-accept): use (erc-log) instead of (message)
 +
 +	* erc.el 1.417:
 +	(erc), (erc-setup-buffer): factor out window generation code so DCC can use
 +	    it too
 +
 +	* erc-dcc.el 1.32:
 +	(erc-dcc-do-CLOSE-command), (erc-dcc-do-LIST-command): work with erc-dcc-plist
 +
 +	* erc-dcc.el 1.31:
 +	erc-dcc-alist: became erc-dcc-plist, so we can more easily grab particular
 +	    properties
 +	dcc catalog: unify use of DCC: and [dcc] (either's fine, but let's be
 +	    consistent)
 +	(erc-dcc-member): takes an arbitrary list of constraints now
 +	(erc-dcc-proc-member): removed, as (erc-dcc-member) can be used for this
 +	(erc-dcc-do-CHAT-command): use the catalog to show the user what's going on
 +	(erc-dcc-chat-server): removed
 +	(erc-dcc-server): takes name sentinel and filter arguments, can be used for
 +	    both send and chat now
 +
 +	.. this release means all send/get support is broken until we fix up the
 +	things that still expect to be using an alist. this include /dcc list, /dcc
 +	close
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.9 (erc-previous-command):
 +	If you have a partially typed input line and press M-p,
 +	    you lose what you typed.  Now we save it so you can come back to it.
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-ring.el 1.8 (erc-add-to-input-ring): s/nullp/null/
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-ring.el 1.7 (erc-add-to-input-ring):
 +	set up the ring if it's not already setup
 +
 +	* erc-dcc.el 1.30 (erc-dcc-member): case insensitive match of nicknames
 +	(erc-dcc-do-CHAT-command): echo what we're doing (at least for now)
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.29: (temporarily) fix erc-process setting...
 +
 +	* erc-dcc.el 1.28: * (erc-dcc-chat-send-line): Removed
 +
 +	* erc.el 1.416:
 +	Check if target is stringp (we can now also have 'dcc as value...)
 +
 +	* erc-dcc.el 1.27 (erc-dcc-chat-send-input-line):
 +	New function, used for
 +	erc-send-input-line-function.
 +	Use erc-send-current-line now.
 +
 +	* erc-dcc.el 1.26: evt to elt...
 +
 +	* erc-dcc.el 1.25: Remove () from a var (how silly!)
 +
 +	* erc-dcc.el 1.24: * (erc-dcc-get-host): Use format-network-address.
 +	* (erc-dcc-host): Change semantic.  If erc-dcc-host is set, use it.
 +	Otherwise, try to figure out the host by calling erc-dcc-get-host.
 +	* (erc-dcc-server-port): New variable.
 +	* erc-dcc-chat-log: Renamed to erc-dcc-server-accept
 +
 +	* erc-dcc.el 1.23 (erc-dcc-do-CHAT-command):
 +	Change arg of call to erc-dcc-chat-request from elt to nick
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.415 (erc-send-current-line):
 +	Now rejects multi-line commands (i.e., lines that
 +	    start with "/" and contain newlines).
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-button.el 1.36:
 +	Functionality to use TAB to jump to the next button:
 +
 +	(erc-button-next-or-old): New function.
 +	(erc-button-next): New function.
 +	erc-button-keymap: added erc-button-next
 +	erc-button-old-tab-command: New variable.
 +	define-erc-module button: Add and remove 'erc-button-next-or-old as
 +	appropriate.
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.414:
 +	New variable: erc-auto-reconnect (defaults to t).  If non-nil, ERC will
 +	    automatically reconnect to a server after an unexpected disconnection.
 +	(erc-process-sentinel): Changed to refer to variable erc-auto-reconnect.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.413:
 +	* erc-send-input-line-function: New variable, used for dispatch...
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.22 (erc-dcc-chat-sentinel):
 +	check event type before killing process
 +	(erc-dcc-chat-log): new, handles the setup of dcc chats for incoming
 +	    connections
 +	(erc-dcc-chat): use (erc-dcc-chat-setup)
 +	(erc-dcc-chat-setup): code common to incoming and outgoing DCC chats
 +	(erc-dcc-chat-request): request a DCC chat with another user
 +	(erc-dcc-proc-member): locate a member in erc-dcc-alist by process
 +
 +	The very first ERC to ERC DCC chat was held between delysid and resolve today!
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.44 (erc-all-buffer-names):
 +	Check for erc-dcc-chat-mode too
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.6, erc.el 1.412 (erc-kill-input):
 +	Resets erc-input-ring-index to nil, so that invoking this
 +	    command conceptually puts you after your most recent input in the input
 +	    history.
 +	(erc-previous-command and erc-next-command): Changed so that history movement
 +	    is more intuitive.  Also preserves the blank input line that marks the
 +	    place after the newest command in the history ring (i.e., you'll see a
 +	    blank command once every trip around the ring in either direction).
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.21 (erc-dcc-chat): Add docstring
 +	Add self-test.
 +	Fix error if /dcc chat nick doesnt find the nick
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.12:
 +	Changed so that "make" works correctly under Cygwin.  Before this change, the
 +	pathname passed to Emacs on the command line under Cygwin had the form
 +	"/cygwin/c/...", which prevented emacs from finding the file.  Now the pathname
 +	has the form "c:/...".  This works for any drive letter.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.35: reindent some code, and add TODO to comments
 +
 +	* erc-dcc.el 1.20: *** empty log message ***
 +
 +	* erc-dcc.el 1.19: Make dcc-chat-ended a notice
 +	Remove now bogus comment
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.18 (erc-pack-int): from erc-packed-int
 +	(erc-unpack-int): new
 +
 +	* erc-dcc.el 1.17 (erc-unpack-str): added
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.411 (erc-server-482):
 +	New handler, handles KICK reply if you're not channel-op
 +
 +	* erc-dcc.el 1.16: Document SEND in erc-dcc-alist.
 +	Move sproc, parent-proc and file into erc-dcc-alist
 +
 +	* erc-dcc.el 1.15: stubs
 +
 +	* erc-dcc.el 1.14 (erc-dcc-get-host):
 +	Change :iface to :local since Kim committed it now to CVS emacs
 +
 +	* erc-dcc.el 1.13 (erc-dcc-get-host):
 +	New function, requires the not-yet-in-CVS-emacs local-address.patch to process.c.
 +	Some other minor additions
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.410 (erc-cmd-IGNORE):
 +	Now returns t to prevent "Bad syntax" error.
 +	(erc-cmd-UNIGNORE): Now returns t to prevent "Bad syntax" error.
 +	(erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
 +
 +	* erc.el 1.409 (erc-scroll-to-bottom):
 +	Temporarilly bind resize-mini-windows to nil so that
 +	    users who have it set to a non-nil value will not suffer from premature
 +	    minibuffer shrinkage due to the below recenter call.  I have no idea why
 +	    this works, but it solves the problem, and has no negative side effects.
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.12:
 +	erc-dcc-ctcp-query-chat-regexp: The IP is not really an IP, but a
 +	number (no . allowed there).
 +	(erc-dcc-send-ctcp-string): use let* here to avoid cluttering up the
 +	match data.
 +	Also, use erc-decimal-to-ip to get the IP.
 +	(erc-ip-to-decimal): Removed some pasted ERC timestamps
 +	(erc-decimal-to-ip): New function.
 +	erc-dcc-chat-mode-map: Return map in the initialization.
 +
 +2003-01-07  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-match.el 1.19 (erc-match-fool-p):
 +	Changed to call erc-match-directed-at-fool-p instead of
 +	     erc-directed-at-fool-p.
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.11 (erc-cmd-DCC):
 +	Change (cond ... (t nil)) to (when ...)
 +
 +	* erc-dcc.el 1.10: Use erc-current-nick-p
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.408:
 +	erc-join-buffer: Added 'window-noselect to docstring and :type.
 +	erc-auto-query: Added 'window-noselect to :type.
 +	(erc): Treat erc-join-buffer being 'window-noselect appropriately.
 +
 +	* erc.el 1.407 (erc-current-nick-p): New function.
 +	(erc-nick-equal-p): New function.
 +	(erc-already-logged-in), (erc-server-JOIN), (erc-auto-query),
 +	(erc-server-PRIVMSG-or-NOTICE): Use erc-current-nick-p.
 +	(erc-update-channel-member): Use erc-nick-equal-p.
 +
 +	* erc-match.el 1.18 (erc-match-current-nick-p):
 +	Renamed from erc-current-nick-p
 +	(erc-match-pal-p): Renamed from erc-pal-p
 +	(erc-match-fool-p): Renamed from erc-fool-p
 +	(erc-match-keyword-p): Renamed from erc-keyword-p
 +	(erc-match-dangerous-host-p): Renamed from erc-dangerous-host-p
 +	(erc-match-directed-at-fool-p): Renamed from erc-directed-at-fool-p
 +	(erc-match-message): Use erc-match-TYPE-p instead of erc-TYPE-p
 +
 +	* erc.el 1.406:
 +	Support for IRCnets' "nick/channel temporarily unavailable"
 +
 +	(erc-nickname-in-use): New function (mostly copied from erc-server-433).
 +	(erc-server-433): Use erc-nickname-in-use
 +	(erc-server-437): New function.
 +	erc-server-hook-list: Added (437 erc-server-437).
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.21: Add autoload cookie
 +
 +	* erc-notify.el 1.13:
 +	Now also pass SERVER argument to signon/off hooks, and provide a erc-notify-signon/off function for echo-area printing
 +
 +	* erc-notify.el 1.12 (erc-notiy-QUIT):
 +	Change use of delq to delete, delq does not work with strings
 +
 +2003-01-06  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.405 (erc-ctcp-query-VERSION):
 +	v%s -> %s, so we are no longer vVersion...
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.404: Small change to erc-ison-p, and fixme tag
 +
 +2003-01-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.403 (erc):
 +	Fixed bug where variable "away" would be nil in new channel buffers
 +	       even if the user is away when joining the channel.
 +	(erc-strip-controls): Fixed a bug where erc-strip-controls accidentally
 +	       removed all text properties from the string.
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.9:
 +	Some stub functions, some code, nothing really works yet
 +
 +	* erc.el 1.402 (erc-ison-p): New function
 +
 +	* erc-dcc.el 1.8: Some functions which will be needed for dcc send
 +
 +	* erc-dcc.el 1.7 (erc-ip-address-to-decimal):
 +	New function, thanks lawrence
 +
 +	* erc-dcc.el 1.6: Again, simplify code, fix stuff, DCC CHAT works now
 +
 +	* erc-dcc.el 1.5: Many fixes, chat nearly works now
 +
 +	* erc-netsplit.el 1.7: Also detect fast netsplit/joins
 +
 +	* erc-dcc.el 1.4: some more fixes
 +
 +	* erc-dcc.el 1.3: Fixup stage 1, now dcc get works
 +
 +	* erc-dcc.el 1.2: make /dcc LIST work
 +
 +	* erc-dcc.el 1.1:
 +	Initial checkin, dont use it!  its really far from complete.  Hackers: help!
 +
 +	* erc-notify.el 1.11:
 +	New function erc-notify-NICK, and added signon/off hooks which were missing
 +
 +2003-01-05  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.401 (erc-truncate-buffer-to-size):
 +	set inhibit-read-only to t for the
 +	deletion. This is usually done by the function calling the hook, but
 +	not if it's called interactively. Also, rewrote some weird if/if
 +	combination.
 +
 +	* erc-track.el 1.43 (erc-track-shortennames):
 +	Documentation fix (erc-all-buffers is really
 +	erc-all-buffer-names)
 +
 +	These changes make server buffers be tracked as well, as there are
 +	quite a few interesting things going on there (e.g. CTCP etc.)
 +	(erc-all-buffer-names): Check for (eq major-mode 'erc-mode) instead of
 +	erc-default-recipients.
 +	(erc-track-modified-channels): Don't require a default target (e.g.,
 +	this-channel being non-nil)
 +
 +2003-01-03  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.400:
 +	erc-auto-query: can now be set to a symbol to control how new messages should
 +	    be popped up (or not popped up, as the case may be)
 +	(erc-query): new function which handles the bulk of what (erc-cmd-QUERY) did
 +	    previously
 +	(erc-cmd-QUERY): use (erc-query)
 +	(erc-auto-query): use (erc-query)
 +
 +	* erc.el 1.399 (erc-current-logfile):
 +	Downcase result of log generation function, as IRC is
 +	case insensitive. Fixes problems where "/query user" results in a different
 +	log file to a query from "User". Avoided adding an extra flag to control this
 +	behavior - if you think this was the wrong decision, please correct it and
 +	I'll remember it for next time.
 +
 +See ChangeLog.02 for earlier changes.
 +
-     Copyright (C) 2003, 2006 Free Software Foundation, Inc.
++    Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
diff --cc ChangeLog.04
index 71a0272,0000000..75c2b71
mode 100644,000000..100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@@ -1,2080 -1,0 +1,2080 @@@
 +2004-12-29  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-interpret-controls-p): Changed docstring to
 +	reflect the new meaning if this is set to 'remove.
 +	(erc-controls-interpret): Rephrased docstring to be more accurate.
 +	(erc-controls-strip): New function that behaves like the
 +	recently-removed erc-strip-controls -- it removes all IRC color
 +	and highlighting control characters.
 +	(erc-controls-highlight): Changed to support the new 'remove value
 +	that variable erc-interpret-controls-p might have.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-ibuffer.el, erc-list.el, erc-page.el, erc-speedbar.el:
 +	Changed all calls to erc-interpret-controls (which no longer
 +	exists) to call erc-controls-interpret (the new name of the same
 +	function).
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-interpret): Added this function to
 +	replace the recently-removed erc-interpret-controls.  Also added
 +	a (require 'erc) to solve a byte-compile problem.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-controls-interpret): Added this function to replace
 +	the recently-removed erc-interpret-controls.
 +
 +2004-12-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Check for
 +	logging even better (via lawrence).
 +
 +2004-12-26  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Much saner
 +	logging detection (via lawrence).
 +
 +2004-12-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-highlight): Treat single C-c
 +	correctly.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: Deleted IRC control character processing
 +	and implemented a sane version in erc-goodies.el as a module.
 +
 +	* erc.el (erc-merge-controls, erc-interpret-controls,
 +	erc-decode-controls, erc-strip-controls, erc-make-property-list,
 +	erc-prepend-properties): Removed.
 +
 +	(erc-interpret-controls-p, erc-interpret-mirc-color, erc-bold-face
 +	erc-inverse-face, erc-underline-face, fg:erc-color-face0,
 +	fg:erc-color-face1, fg:erc-color-face2, fg:erc-color-face3,
 +	fg:erc-color-face4, fg:erc-color-face5, fg:erc-color-face6,
 +	fg:erc-color-face7, fg:erc-color-face8, fg:erc-color-face9,
 +	fg:erc-color-face10, fg:erc-color-face11, fg:erc-color-face2,
 +	fg:erc-color-face13, fg:erc-color-face14, fg:erc-color-face15,
 +	bg:erc-color-face1, bg:erc-color-face2, bg:erc-color-face3,
 +	bg:erc-color-face4, bg:erc-color-face5, bg:erc-color-face6,
 +	bg:erc-color-face7, bg:erc-color-face8, bg:erc-color-face9,
 +	bg:erc-color-face10, bg:erc-color-face11, bg:erc-color-face2,
 +	bg:erc-color-face13, bg:erc-color-face14, bg:erc-color-face15,
 +	erc-get-bg-color-face, erc-get-fg-color-face,
 +	erc-toggle-interpret-controls): Moved.
 +
 +	* erc-goodies.el (erc-beep-p, irccontrols, erc-controls-highlight,
 +	erc-controls-propertize): New.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit.
 +	 Moved some functions from erc.el to erc-goodies.el, and
 +	transformed them to erc modules in the process.
 +	- imenu autoload stuff moved. I don't know why it is here at all.
 +	- Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
 +	smiley,   unmorse, erc-occur (the last isn't a module, but still
 +	moved)
 +	(erc-input-line-position, erc-add-scroll-to-bottom,
 +	erc-scroll-to-bottom, erc-make-read-only, erc-noncommands-list,
 +	erc-send-distinguish-noncommands, erc-smiley, erc-unmorse,
 +	erc-occur): Moved from erc.el to erc-goodies.el.
 +	(smiley): Module moved from erc.el to erc-goodies.el.
 +	(scrolltobottom, readonly, noncommands, unmorse): New modules.
 +
 +2004-12-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-away-status): Use `a', not `away' - that's
 +	why it's there.
 +	(erc-update-mode-line-buffer): The values of `mode-line-process'
 +	and `mode-line-buffer-identification' are normally lists.
 +	Conform.
 +
 +2004-12-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-ctcp-query, erc-process-ctcp-reply): Display
 +	message in the active window, not the server window.
 +
 +2004-12-16  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Check for
 +	'erc-track-mode variable with boundp. From Adrian Aichner
 +	<adrian@xemacs.org>.
 +
 +2004-12-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-upcase-first-word): New function. The old way used
 +	in erc-send-ctcp-message would eat consecutive whitespace etc.
 +	(erc-send-ctcp-message, erc-send-ctcp-notice): Use it.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Fix braino with my previous
 +	patch. It always helps to C-x C-s before `cvs commit'.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Only upcase the ctcp command,
 +	and not the entire message. Revision 1.707 had broken /me.
 +	Shouting is bad! :)
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-networks-alist): Change undernet to Undernet as
 +	is used in `erc-server-alist', so that completion works when using
 +	`erc-server-select'.  This should fix Debian bug #282003 (erc:
 +	cannot connect to Undernet).
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el: (def-edebug-spec): Only run this if 'edebug is
 +	available.
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: The last change to `erc-mode-line-format' introduced a
 +	bug in Xemacs - it can't handle the #(" "...) strings at all.  The
 +	following changes fix the bug and simplify the mode-line handling
 +	considerably.  (erc-mode-line-format): Now defined as a string
 +	which will be formatted using `format-spec' and take the place of
 +	`mode-line-buffer-identification' in the mode line.
 +	(erc-header-line-format): Now defined as a string to be formatted
 +	using `format-spec'.
 +	(erc-prepare-mode-line-format): Removed.
 +	(erc-format-target, erc-format-target-and/or-server,
 +	erc-format-away-status, erc-format-channel-modes): New functions.
 +	Basically the old `erc-prepare-mode-line-format' split apart.
 +	(erc-update-mode-line-buffer): Set
 +	`mode-line-buffer-identification' to the formatted
 +	`erc-mode-line-format', set `mode-line-process' to ": CLOSED" if
 +	the connection has been terminated, and set `header-line-format'
 +	(if it is bound) to the formatted `erc-header-line-format', then
 +	do a `force-mode-line-update'.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Disable modules removed with `customize'.
 +	(erc-update-modules): Try to give a more descriptive error
 +	message.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-complete.el, erc.el, erc-list.el, erc-nets.el,
 +	erc-nicklist.el, erc-pcomplete.el, erc-replace.el, erc-speak.el,
 +	erc-truncate.el: (erc-buffers, erc-coding-systems, erc-display,
 +	erc-mode-line-and-header, erc-ignore, erc-query,
 +	erc-quit-and-part, erc-paranoia, erc-scripts, erc-old-complete,
 +	erc-list, erc-networks, erc-nicklist, erc-pcomplete, erc-replace,
 +	erc-truncate): New customization groups.  (erc-join-buffer,
 +	erc-frame-alist, erc-frame-dedicated-flag, erc-reuse-buffers): Use
 +	'erc-buffers as `:group'.  (erc-default-coding-system,
 +	erc-encoding-coding-alist): Use 'erc-coding-systems as `:group'.
 +	(erc-hide-prompt, erc-show-my-nick, erc-prompt,
 +	erc-input-line-position, erc-command-indicator, erc-notice-prefix,
 +	erc-notice-highlight-type, erc-interpret-controls-p,
 +	erc-interpret-mirc-color, erc-minibuffer-notice,
 +	erc-format-nick-function): Use 'erc-display as `:group'.
 +	(erc-mode-line-format, erc-header-line-format,
 +	erc-header-line-uses-help-echo-p, erc-common-server-suffixes,
 +	erc-mode-line-away-status-format): Use 'erc-mode-line-and-header
 +	as `:group'.
 +	(erc-hide-list, erc-ignore-list, erc-ignore-reply-list,
 +	erc-minibuffer-ignored): Use 'erc-ignore as `:group'.
 +	(erc-auto-query, erc-query-on-unjoined-chan-privmsg,
 +	erc-format-query-as-channel-p): Use 'erc-query as `:group'.
 +	(erc-kill-buffer-on-part, erc-kill-queries-on-quit,
 +	erc-kill-server-buffer-on-quit, erc-quit-reason-various-alist,
 +	erc-part-reason-various-alist, erc-quit-reason, erc-part-reason):
 +	Use 'erc-quit-and-part as `:group'.
 +	(erc-verbose-server-ping, erc-paranoid, erc-disable-ctcp-replies,
 +	erc-anonymous-login, erc-show-channel-key-p): Use 'erc-paranoia as
 +	`:group'.
 +	(erc-startup-file-list, erc-script-path, erc-script-echo): Use
 +	'erc-scripts as `:group'.
 +	(erc-nick-completion, erc-nick-completion-ignore-case,
 +	erc-nick-completion-postfix): Use 'erc-old-complete as `:group'.
 +	(erc-chanlist-progress-message, erc-no-list-networks,
 +	erc-chanlist-frame-parameters, erc-chanlist-hide-modeline,
 +	erc-chanlist-mode-hook): Use 'erc-list as `:group'.
 +	(erc-server-alist, erc-networks-alist): Use 'erc-networks as
 +	`:group'.
 +	(erc-settings): Use `defvar' instead of `defcustom' since this is
 +	only a draft which doesn't work.
 +	(erc-nicklist-window-size): Use 'erc-nicklist as `:group'.
 +	(erc-pcomplete-nick-postfix,
 +	erc-pcomplete-order-nickname-completions): Use 'erc-pcomplete as
 +	`:group'.
 +	(erc-replace-alist): Use 'erc-replace as `:group'.
 +	(erc-speak-filter-timestamp): Use 'erc-speak as `:group'.
 +	(erc-max-buffer-size): Use 'erc-truncate as `:group'.
 +
 +2004-12-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Go to the end of the buffer
 +	before recentering. This allows editing multiple lines more
 +	conveniently in CVS Emacs. This also undos a change by antifuchs
 +	who said this goto-char would mess up redisplay. Extensive testing
 +	couldn't reproduce that problem.
 +
 +2004-12-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-send-ctcp-message): upcase the ctcp message (so that
 +	version becomes VERSION, for example).
 +	(erc-iswitchb): Make the argument optional in non-interactive
 +	invocation, so erc-iswitchb can be substituted directly for
 +	iswitchb in code.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Allow for the
 +	fact that `erc-track-mode' isn't bound when file is loaded.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): New customizable
 +	variable.  (erc-track-remove-from-mode-line): New function.
 +	Remove `erc-modified-channels-string' from the mode-line.
 +	(erc-track-add-to-mode-line): New function.  Add
 +	`erc-modified-channels-string' to the mode-line using the value of
 +	`erc-track-position-in-mode-line' to determine whether to add it
 +	to the beginning or the end of `mode-line-modes' (only available
 +	with GNU Emacs versions above 21.3) or to the end of
 +	`global-mode-string'.
 +	(erc-track-mode, erc-track-when-inactive-mode): Use the new
 +	functions.
 +
 +2004-12-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use (buffer-name) and not
 +	(erc-default-target) for the buffer name - buffer names are case
 +	sensitive.
 +
 +2004-12-11  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-message-type): Added the message "MODE" to the known
 +	erc-message-type widget, so that (for example) people can tell
 +	erc-track-exclude-types to ignore mode changes. The others tag
 +	also needed to be made an inline list, so that it's merged with
 +	the given constants, instead of being inserted as a list.
 +
 +2004-12-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el, erc.el: Update to get ERC look nicely in CVS Emacs.
 +
 +	* erc.el (erc-mode-line-format): When on CVS emacs, use the new
 +	format.
 +
 +	* erc-track.el (track module): When on CVS emacs, modify
 +	mode-line-modes instead of global-mode-string. The latter is way
 +	to far too the right.
 +
 +2004-11-18  Mario Lang <mlang@delysid.org>
 +
 +	* Makefile, debian/changelog: debian release 20041118-1
 +
 +2004-11-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-buttonize-nicks): Set default value to
 +	`t'.  Updated documentation and customization `:type' to reflect
 +	usage.
 +
 +2004-10-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* AUTHORS: Added self.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Added local variables for this file.
 +	(erc-list-version): New.
 +	(erc-cmd-LIST): Take &rest rather than &optional arguments, as was
 +	done in revision 1.21.  Allow for input when called interactively.
 +	(erc-prettify-channel-list, erc-chanlist-toggle-sort-state): Use
 +	`unless' instead of when not.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): Fixed so
 +	that the contents are only shown once. (MOTD): Display lines in
 +	the server buffer if it's the first MOTD sent upon connection.
 +	This is to avoid the problem of having the MOTD of one server
 +	showing up in another server's buffer if it took a while to get
 +	connected.
 +	(004): Fixed to show the user modes and channel modes correctly.
 +	(303): Now displays the nicknames returned by ISON instead of the
 +	user's nickname.
 +	(367, 368): Moved up into 300's section of the code.  Added
 +	documentation.  Use `multiple-value-bind' to set variables in 367.
 +	(391): Fixed so that the server name is shown correctly.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Use CPROC instead of
 +	`erc-process' in debug message.  Should fix a bug where an error
 +	saying "Buffer *scratch* has no process" would occur when
 +	disconnected.
 +	(erc-cmd-SV): Check for X toolkit after checking for more specific
 +	features.  (erc--kill-server): Set `quitting' to non-nil so that
 +	we don't automatically reconnect.
 +
 +2004-10-05  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-ignored-user-p): Don't require regexes to match the
 +	beginning.
 +
 +2004-09-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: group erc: Moved to 'applications (patch by bojohan)
 +
 +2004-09-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: (erc-button-remove-old-buttons): Remove 'keymap
 +	not 'local-map.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Typo fix of the last
 +	commit.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Run `erc-join-hook'
 +	without arguments as specified in the docstring.
 +
 +2004-08-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-current-line): Removed unused variable SENTP.
 +
 +2004-08-19  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: ERC-SEND-COMPLETED-HOOK used to be run when the prompt
 +	was already displayed. We restore this behavior (thanks to bojohan
 +	and TerryP for noticing). We also fix the docstring of
 +	ERC-SEND-COMPLETED-HOOK, since the hook is (and used to be) called
 +	even if nothing was sent to the server.
 +	(erc-send-completed-hook): Fixed docstring.
 +	(erc-send-current-line): Add incantation for
 +	erc-send-completed-hook.
 +	(erc-send-input): Remove incantation for erc-send-completed-hook.
 +
 +2004-08-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: response-handler 368: Use s368, not s367.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Don't scroll when we're not
 +	connected anymore.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: Handle /mode #emacs b output without
 +	errors and such. First, handle unknown format specs gracefully
 +	(that is, give a useful error). Then, provide handlers for the
 +	banlist replies.
 +
 +	* erc-backend.el: New handler for 367 and 368. Removed from default
 +	handler.
 +
 +	* erc.el: Provide english catalog for s367 and s368.
 +	(erc-format-message): Give an error message when we don't find an
 +	entry.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: erc-fill-variable could be confused about really
 +	long nicks. We put an upper limit on the length of the fill prefix.
 +	(erc-fill-variable): Adjust fill-prefix.
 +	erc-fill-variable-maximum-indentation: New variable.
 +
 +2004-08-17  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-send-input): Fixed a bug where this function
 +	referenced variable "input" instead of variable "str".
 +
 +2004-08-16  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-highlight-line): Fixed a bug where
 +	this function failed to set the correct face for highlighting the
 +	current line.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el (erc-fill-variable): Don't fuck up when the
 +	looking-at didn't work.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-single-line): Call the hooks to change the
 +	appearance for something only if we actually inserted something,
 +	doh.
 +	(erc-display-command): Display the prompt outside of the area that
 +	set the text properties on.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: Refactored erc-send-current-line. This should fix some
 +	dormant bugs, and make the whole thing actually readable. Yay.
 +	Some changes in behavior were made. Whitespace at the end of lines
 +	sent is not removed anymore, but that shouldn't bother anyone.
 +	Additionally, errors in commands or hooks shouldn't prevent the
 +	prompt from showing up again now.
 +	(erc-parse-current-line): Removed.
 +	(erc-send-current-line): Refactored.
 +	(erc-send-input): New function.
 +	(erc-send-single-line): New function.
 +	(erc-display-command): New function.
 +	(erc-display-msg): New function.
 +	(erc-user-input): New function.
 +
 +2004-08-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SERVER): Use newer keyword call interface to
 +	erc-select, and handle the error if it can't resolve the host.
 +
 +2004-08-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: erc-backend.el (404 response handler):
 +	New function. We now support "cannot send to channel".
 +
 +	* erc.el (erc-define-catalog call): Added s404. erc.el
 +	(erc-ctcp-ECHO-reply, erc-ctcp-CLIENTINFO-reply,
 +	erc-ctcp-FINGER-reply, erc-ctcp-PING-reply, erc-ctcp-TIME-reply,
 +	erc-ctcp-VERSION-reply): Display reply in the active window, not
 +	the server window.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Actually make it left
 +	to right, doh.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Evaluate left-to-right
 +	so we don't surprise a user.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Parentophobia! Another
 +	paren-fix.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: PRIVMSG NOTICE response handler: Killed one paren
 +	too much. Poor paren. Got resurrected.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el: Make server buffers showing up in the mode line
 +	optional. Thanks to Daniel Knapp on the EmacsWiki for this patch.
 +
 +	erc-track-exclude-server-buffer: New variable.
 +	(erc-track-modified-channels): Return a server buffer only if
 +	erc-track-exclude-server-buffer is nil.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-DESCRIBE): Don't parse arguments.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el: (erc-truncate-buffer-to-size): Use
 +	erc-insert-marker, not (point-max), to decide the length of the
 +	buffer. A long input line shouldn't make the buffer smaller.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-macs.el, erc-members.el: The change to hashes for channel
 +	members has been made some time ago.  Clean up the various tries to
 +	do this in the past.
 +
 +	erc-macs.el: Removed.  erc-members.el: Removed.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc-ibuffer.el, erc-members.el, erc.el: Nothing
 +	big changed here. Really. Uhm, maybe the info-buffers are gone or
 +	so.  Can't really remember. Don't worry, nothing important is
 +	missing.
 +
 +	erc-speedbar.el looks nice btw, did you know?
 +
 +	Adjusted various places in erc.el, erc-backend.el, erc-ibuffer.el
 +	and erc-members.el - too numerous to list here, sorry.
 +
 +	* erc.el: erc-use-info-buffers: Removed.  erc-info-mode-map:
 +	Removed.
 +	(erc-info-mode): Removed.
 +	(erc-find-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffers): Removed.
 +
 +	* erc-members.el: erc-update-member renamed to
 +	erc-update-channel-member for better clarity.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: This change improves the help output on a bogus command
 +	invocation. We display the command as it would be typed by the
 +	user, not as it is seen by Emacs.
 +
 +	(erc-get-arglist): Is now called erc-function-arglist, and returns
 +	now an arglist without the enclosing parens.
 +	(erc-command-name): New function.
 +	(erc-process-input-line): Pass the command name, not the function
 +	name.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-input-line): Fix bug when the command
 +	doesn't have an arglist or no documentation. Thanks bojohan again
 +	:)
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list),
 +	(erc-remove-entry-from-list): Update docstring, a TEST argument is
 +	not given.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Really fix this docstring.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Fix double evaluation in macro, and
 +	fix docstring.
 +
 +2004-08-10  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-cmd-JOIN): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-backend.el: Define an "Edebug specification" for the
 +	`define-erc-response-handler' macro. This means that one can step
 +	through response handlers defined by this macro with edebug. Maybe
 +	more macros would benefit from this?
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/CTCP): New function.
 +	Completion for the /CTCP command.  (erc-pcomplete-ctcp-commands):
 +	New variable. List of ctcp commands.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-list.el: Clean up docstrings.
 +	(erc-prettify-channel-list): Extend properties to cover the entire
 +	line, including the newline, to make it look
 +	better.
 +	(erc-chanlist-highlight-line): Ditto.
 +	(erc-chanlist-mode-hook): Make it a defcustom.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-compute-full-name): Typo fix, should be full-name,
 +	not name.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc): Setup the buffer to be shown in a window at the
 +	end of this function. This enables 'window-noselect to work
 +	properly.
 +	(erc, erc-send-current-line): Fix some
 +	goto-char/open-line/goto-char to goto-char/insert.
 +
 +2004-08-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-parse-user): Live with bogus info from bouncers.
 +
 +2004-07-31  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select): Change the docstring to reflect the new
 +	arguments; include the arguments in the docstring for non-cvs
 +	emacs. Change the parameters to call erc-compute-* instead of
 +	using the erc-* variables directly.
 +	(erc-compute-server): Made argument optional.
 +	(erc-compute-nick): ditto.
 +	(erc-compute-full-name): ditto.  (erc-compute-port): ditto.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where channel-banlist was
 +	not reset to nil before fetching an updated banlist from the
 +	server.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where the
 +	'received-from-server property on variable channel-banlist was not
 +	being reset to nil.  This fixes the symptom where one types
 +	/BANLIST and sees "No bans for channel: #whatever" when you know
 +	there are bans.
 +
 +2004-07-23  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-select-read-args): Use erc-compute-nick to
 +	calculate the default nickname
 +
 +2004-07-20  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-process-sentinel-1): New function. This is an
 +	auxiliary function refactored out of erc-process-sentinel to
 +	decide a server buffer's fate (whether it should be killed, and
 +	whether erc should attempt to auto-reconnect).  Michael Olson
 +	<mwolson@gnu.org> helped with this.
 +	(erc-kill-server-buffer-on-quit): New variable. Used in
 +	erc-process-sentinel-1 to decide whether to kill a server buffer
 +	when the user quit normally.
 +	(erc-process-sentinel): Auxiliary function erc-process-sentinel-1
 +	split out.  The function body has `with-current-buffer' wrapped
 +	around it, to ensure separation of messages if multiple
 +	connections were being made.  Use `if' instead of `cond' in places
 +	where the decision is binary.  The last (useless, since the server
 +	connection is closed) prompt in the server buffer is removed.
 +	Color "erc terminated" and "erc finished" messages with
 +	erc-error-face.  Mark the buffer unmodified so that, if not killed
 +	automatically, the user is not prompted to save it.
 +
 +2004-07-16  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select-read-args): New function. Prompts the user
 +	for arguments to pass to erc-select and erc-select-ssl.
 +	(erc-select): Use (erc-select-read-args) when called interactively
 +	to get its arguments.  When non-interactively, use keyword
 +	arguments.
 +	(erc-select-ssl): Ditto.
 +	(erc-compute-port): New function. Parallel to erc-compute-server,
 +	but comes up with a default value for an IRC server's port.
 +
 +2004-07-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Quote the current nickname.
 +
 +2004-07-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-mode): Remove explicit invocation of
 +	erc-chanlist-mode-hook, since it's automatically invoked by
 +	define-derived-mode
 +
 +2004-07-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-current-nick-p): Quote current nick for
 +	regexp parsing.
 +
 +2004-06-27  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-nickserv.el (erc-nickserv-identify-mode): Fix erroneous
 +	parentheses in call to `completing-read'.
 +
 +2004-06-23  Alex Schroeder <alex@gnu.org>
 +
 +	* Makefile (release): Depend on autoloads, and copy erc-auto.el
 +	into the tarball.
 +
 +2004-06-14  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed minor bug where each line
 +	received from a server was logged as two lines (one with text and
 +	one blank).
 +
 +2004-06-08  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-frame-parameters): Made customizable.
 +	(erc-chanlist-header-face): Changed to use defface with some
 +	reasonable defaults instead of make-face, and removed the
 +	associated -face variable.
 +	(erc-chanlist-odd-line-face): Ditto.
 +	(erc-chanlist-even-line-face): Ditto.
 +	(erc-chanlist-highlight-face): New variable. Holds a face used for
 +	highlighting the current line.
 +	(erc-cmd-LIST): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +	(erc-chanlist-post-command-hook): Change to move the highlight
 +	overlay instead of refontifying the entire buffer.
 +	(erc-chanlist-dehighlight-line): Added to detach the highlight
 +	overlay from the buffer.
 +
 +2004-05-31  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-mode-line-format: Add column numbers.
 +
 +2004-05-31  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-autojoin.el: Typo fix.
 +
 +	* erc-dcc.el (erc-dcc-do-GET-command): Use expand-file-name.
 +	(erc-dcc-get-file): XEmacs set-buffer-multibyte compatibility.
 +
 +	* erc-log.el: Append `erc-log-setup-logging' to
 +	`erc-connect-pre-hook' so that `erc-initialize-log-marker' is run
 +	first (markers are needed by `erc-log-setup-logging').
 +	(erc-enable-logging): Docstring fix.
 +	(erc-log-setup-logging): Move `erc-log-insert-log-on-open' to (1-
 +	(point-max)) when doing `erc-log-insert-log-on-open'.  Modified
 +	version of a patch by Lawrence Mitchell.
 +	(erc-log-all-but-server-buffers): Do `save-excursion' as well.
 +	(erc-current-logfile): Pass buffer name as target
 +	argument to `erc-generate-log-file-name-function' if
 +	`erc-default-target' is nil.
 +	(erc-generate-log-file-name-with-date): Use expand-file-name.
 +	(erc-generate-log-file-name-short): Ditto.
 +	(erc-save-buffer-in-logs): Do `save-excursion' and test whether
 +	erc-last-saved-position is a marker.
 +
 +	* erc-members.el: Avoid miscompiling macro `erc-log' and
 +	`with-erc-channel-buffer' by requiring 'erc at compile time.
 +
 +	* erc-sound.el: Use expand-file-name.
 +
 +	* erc.el (erc-debug-log-file): Ditto.
 +	(erc-find-file): Ditto.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-BANLIST): Added a missing "'"
 +	that was preventing /BANLIST from working.  In erc-backend.el,
 +	added server repsonse handler for 367 and 368 reponses to get
 +	/BANLIST working.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Removed an eval-when-compile that was preventing the
 +	byte-compiled version of this file from loading.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Undid part of my last change.  I suspect it was wrong.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Silenced several byte-compiler warnings.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed problem where this function
 +	misformatted IRC protocol text if multiple lines were received from
 +	the server at one time.
 +
 +2004-05-25  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Cosmetic changes to the
 +	informational text in the *erc-protocol* buffer.
 +
 +2004-05-24  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol, erc-process-filter): Now the lines
 +	inserted in the *erc-protocol* buffer are prefixed with the name
 +	of the network to/from which the data is going/coming.  This makes
 +	reading the *erc-protocol* buffer much easier when connected to
 +	multiple networks.
 +
 +2004-05-23  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-backend.el: Fixes server message parsing so that command
 +	arguments specified after the colon are not treated specially. All
 +	arguments are added to the `command-args' field, and the
 +	`contents' points to the last element in the `command-args' list.
 +	This allows ERC to connect to networks such as Undernet.  Although
 +	keeping `contents' allows many of the response handlers to
 +	continue to work as-is, many other are probably broken by this
 +	patch.
 +
 +2004-05-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Add comment that C-c C-a can be useful if you write
 +	ChangeLog entries using Emacs' standard functions.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Ignore errors when attempting to require dframe
 +	(there are a couple implementations of speedbar, one of which uses
 +	of dframe).
 +	(erc-speedbar-version): New.
 +	(erc-speedbar-goto-buffer): Use dframe functions if dframe is
 +	available.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autojoin.el: Added local variables for this file.
 +	(erc-autojoin-add): The channel name is in `erc-response.contents'.
 +
 +2004-05-17  Mario Lang <mlang@delysid.org>
 +
 +	* erc-log.el: Dont autoload a define-key statement, erc-mode-map
 +	might not be known yet
 +
 +2004-05-16  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-parse-server-response): Revert to original
 +	`erc-parse-line-from-server' version, since new version breaks for
 +	a number of edge cases.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): New
 +	function.  Added to `erc-default-server-functions'.  Display
 +	unknown responses to the user.
 +	(221): Don't show nickname in modes list.
 +	(254): Fixed to use 's254.
 +	(303): Added docstring.
 +	(315, 318, 323, 369): Ignored responses grouped together.
 +	(391): New.
 +	(406, 432): Use ?n, not ?c in `erc-display-message'.
 +	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
 +	502): All error responsess with no arguments grouped together.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-message-type-member): Use `erc-response.command'.
 +	`erc-track-exclude-types' should be respected again.
 +	(erc-cmd-TIME): Fixed to work with and without server given as
 +	argument.
 +	(erc-define-catalog): Added, s391, s431, s445, s446, s451, s462,
 +	s463, s464, s465, s483, s484, s485, s491, s501, s502.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Typo fix.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* Makefile (erc-auto.el): Pass -f flag to rm so that we don't fail
 +	if erc-auto.elc doesn't exist.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-with-buffer): Autoload.
 +	(erc-parse-server-response): XEmacs' `replace-match' only replaces
 +	subexpressions when operating on buffers, not strings, work around
 +	it.
 +	(461): Command with invalid arguments is `second', not `third'.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-notify.el (erc-notify-NICK): Use `erc-response.contents' to
 +	get nickname.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-track.el: Indentation fixes.
 +	(track-when-inactive): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-notify.el (notify): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-notify-timer, erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (services, erc-nickserv-identify-mode): Use
 +	`erc-server-FOO-functions', not `erc-server-FOO-hook.
 +	(erc-nickserv-identify-autodetect): Use new accessors for PARSED
 +	argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-netsplit.el (netsplit): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-netsplit-JOIN, erc-netsplit-MODE, erc-netsplit-QUIT): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-menu.el (erc-menu-definition): Only allow listing of
 +	channels if `erc-cmd-LIST' is fboundp.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-match.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-get-parsed-vector-nick, erc-get-parsed-vector-type): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-chanlist, erc-chanlist-322): Use new accessors
 +	for PARSED argument.  Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-ezbounce.el (erc-ezb-notice-autodetect): Use new accessors
 +	for PARSED argument.
 +	(erc-ezb-initialize): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-dcc-no-such-nick): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-bbdb.el (erc-bbdb-whois, erc-bbdb-JOIN, erc-bbdb-NICK): Use
 +	new accessors for PARSED argument.
 +	(BBDB): Use `erc-server-FOO-functions', not `erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autojoin.el (autojoin): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-autojoin-add, erc-autojoin-remove): Use new accessors for
 +	PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autoaway.el (autoaway): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-backend): Require.
 +	(erc-disconnected-hook, erc-join-hook, erc-quit-hook)
 +	(erc-part-hook, erc-kick-hook): Docstring fix, we now use
 +	`erc-server-FOO-functions', rather than `erc-server-FOO-hook'.
 +	(erc-event-to-hook-name, erc-event-to-hook): Remove.
 +	(erc-once-with-server-event)
 +	(erc-once-with-server-event-global): Use `erc-get-hook'
 +	(erc-process-filter): Use `erc-parse-server-response'.
 +	(erc-cmd-IDLE, erc-cmd-BANLIST, erc-cmd-MASSUNBAN): New accessors
 +	for PARSED argument.  Rename all `erc-server-FOO-hook' to
 +	`erc-server-FOO-functions'.
 +	(erc-server-364-hook, erc-server-365-hook, erc-server-367-hook)
 +	(erc-server-368-hook, erc-server-KILL-hook)
 +	(erc-server-PONG-hook, erc-server-200-hook, erc-server-201-hook)
 +	(erc-server-202-hook, erc-server-203-hook, erc-server-204-hook)
 +	(erc-server-205-hook, erc-server-206-hook, erc-server-208-hook)
 +	(erc-server-209-hook, erc-server-211-hook, erc-server-212-hook)
 +	(erc-server-213-hook, erc-server-214-hook, erc-server-215-hook)
 +	(erc-server-216-hook, erc-server-217-hook, erc-server-218-hook)
 +	(erc-server-219-hook, erc-server-241-hook, erc-server-242-hook)
 +	(erc-server-243-hook, erc-server-244-hook, erc-server-249-hook)
 +	(erc-server-261-hook, erc-server-262-hook, erc-server-302-hook)
 +	(erc-server-323-hook, erc-server-342-hook, erc-server-351-hook)
 +	(erc-server-381-hook, erc-server-382-hook, erc-server-391-hook)
 +	(erc-server-392-hook, erc-server-393-hook, erc-server-394-hook)
 +	(erc-server-395-hook, erc-server-402-hook, erc-server-404-hook)
 +	(erc-server-407-hook, erc-server-409-hook, erc-server-411-hook)
 +	(erc-server-413-hook, erc-server-414-hook, erc-server-415-hook)
 +	(erc-server-422-hook, erc-server-423-hook, erc-server-424-hook)
 +	(erc-server-431-hook, erc-server-436-hook, erc-server-437-hook)
 +	(erc-server-441-hook, erc-server-443-hook, erc-server-444-hook)
 +	(erc-server-445-hook, erc-server-446-hook, erc-server-451-hook)
 +	(erc-server-462-hook, erc-server-463-hook, erc-server-464-hook)
 +	(erc-server-465-hook, erc-server-467-hook, erc-server-471-hook)
 +	(erc-server-472-hook, erc-server-473-hook, erc-server-483-hook)
 +	(erc-server-491-hook, erc-server-502-hook): Remove.
 +	(erc-call-hooks, erc-parse-line-from-server): Remove
 +	(erc-server-hook-list): Remove.  Remove top-level call too.
 +	(erc-server-ERROR, erc-server-INVITE, erc-server-JOIN)
 +	(erc-server-KICK, erc-server-MODE, erc-server-NICK)
 +	(erc-server-PART, erc-server-PING, erc-server-PONG)
 +	(erc-server-PRIVMSG-or-NOTICE, erc-server-QUIT)
 +	(erc-server-TOPIC, erc-server-WALLOPS, erc-server-001)
 +	(erc-server-004, erc-server-005, erc-server-221, erc-server-252)
 +	(erc-server-253, erc-server-254, erc-server-301, erc-server-303)
 +	(erc-server-305, erc-server-306, erc-server-311-or-314)
 +	(erc-server-312, erc-server-313, erc-server-317, erc-server-319)
 +	(erc-server-320, erc-server-321, erc-server-322, erc-server-324)
 +	(erc-server-329, erc-server-330, erc-server-331, erc-server-332)
 +	(erc-server-333, erc-server-341, erc-server-352, erc-server-353)
 +	(erc-server-366, erc-server-MOTD, erc-server-379)
 +	(erc-server-401, erc-server-403, erc-server-405, erc-server-406)
 +	(erc-server-412, erc-server-421, erc-server-432, erc-server-433)
 +	(erc-server-437, erc-server-442, erc-server-461, erc-server-474)
 +	(erc-server-475, erc-server-477, erc-server-481, erc-server-482)
 +	(erc-server-501): Move to erc-backend.el
 +	(erc-auto-query, erc-banlist-store, erc-banlist-finished)
 +	(erc-banlist-update, erc-connection-established)
 +	(erc-process-ctcp-query, erc-display-server-message): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el: (erc-parse-server-response)
 +	(erc-handle-parsed-server-response, erc-get-hook)
 +	(define-erc-response-handler): New functions.
 +	(erc-response): New struct for server responses.
 +	(erc-server-responses): New variable.
 +	(erc-call-hooks): Move from erc.el and rework.
 +	(ERROR, INVITE, JOIN, KICK, MODE, NICK, PART, PING, PONG)
 +	(PRIVMSG, NOTICE, QUIT, TOPIC, WALLOPS, 001, MOTD, 376, 004)
 +	(252, 253, 254, 250, 301, 303, 305, 306, 311, 312, 313, 315)
 +	(317, 318, 319, 320, 321, 322, 324, 329, 330, 331, 332, 333)
 +	(341, 352, 353, 366, 369, 379, 401, 403, 405, 406, 412, 421)
 +	(432, 433, 437, 442, 461, 474, 477, 481, 482, 501, 323, 221)
 +	(002, 003, 371, 372, 374, 375, 422, 251, 255, 256, 257, 258)
 +	(259, 265, 266, 377, 378, 314, 475, 364, 365, 367, 368, 381)
 +	(382, 391, 392, 393, 394, 395, 200, 201, 202, 203, 204, 205)
 +	(206, 208, 209, 211, 212, 213, 214, 215, 216, 217, 218, 219)
 +	(241, 242, 243, 244, 249, 261, 262, 302, 342, 351, 402, 404)
 +	(407, 409, 411, 413, 414, 415, 423, 424, 431, 436, 441, 443)
 +	(444, 445, 446, 451, 462, 463, 464, 465, 467, 471, 472, 473)
 +	(483, 491, 502, 005, KILL): Move from erc.el and rework using
 +	`define-erc-response-handler' and erc-response struct.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: A few bug fixes to avoid errors after disconnect,
 +	including the "Selecting deleted buffer" bug.
 +	(erc-channel-user-op-p, erc-channel-user-voice-p): Make sure NICK
 +	is non-nil (`erc-current-nick' can return nil).
 +	(erc-server-buffer): Make sure the buffer isn't a #<killed
 +	buffer>.
 +	(erc-server-buffer-live-p): New function.
 +	(erc-display-line, erc-join-channel, erc-prepare-mode-line-format,
 +	erc-away-p): Use `erc-server-buffer-live-p' to make sure process
 +	buffer exists.
 +	(erc-send-current-line): If there is no server buffer, let the
 +	user know.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-log.el: C-c C-l keybinding now defined in
 +	erc-log.el.
 +	(erc-log-version): New.
 +	(erc-cmd-JOIN): Fix applied for bug where /join -invite causes
 +	errors when there's no `invitation'.
 +
 +2004-05-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-JOIN): Make sure `chnl' is non-nil before trying
 +	to join anything (chnl is not set if /join -invite is used but
 +	there's no `invitation').
 +
 +2004-05-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Define C-c C-l keybinding outside of `erc-log-mode',
 +	making it available all the time; autoload definition.
 +	(erc-log-version): New.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, Makefile, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-chess.el, erc-dcc.el, erc-ezbounce.el,
 +	erc-fill.el, erc-ibuffer.el, erc-imenu.el, erc-lang.el,
 +	erc-list.el, erc-log.el, erc-macs.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-nets.el, erc-netsplit.el, erc-nickserv.el,
 +	erc-notify.el, erc-page.el, erc-ring.el, erc-speak.el,
 +	erc-speedbar.el, erc-stamp.el, erc-track.el, erc-truncate.el,
 +	erc-xdcc.el, erc.el: Applied all relevant bug fixes and code
 +	cleanup made between the time of the ERC_4_0_RELEASE tag until now.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-info-buffer): Correct bug in sorting
 +	of channel users.  Tiny change from Andreas Schwab
 +	<schwab@suse.de>.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-fill.el (erc-fill-variable): Fix docstring.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-button.el (erc-button-add-button): Use 'keymap
 +	text-property, rather than 'local-map, since it's cross-emacs
 +	compatible.  Pass :mouse-down-action into `widget-convert-button'
 +	as 'erc-button-click-button, to make XEmacs happy.  Replace bogus
 +	reference to erc-widget-press-button with erc-button-press-button.
 +	(erc-button-click-button): New (ignored) first argument, to make
 +	XEmacs behave when pressing buttons.
 +	(erc-button-press-button): New (ignored) &rest argument.
 +
 +2004-05-09  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-log.el (erc-conditional-save-buffer): Fix docstring
 +	reference to erc-save-queries-on-quit.
 +	(erc-conditional-save-queries): Ditto.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Updated copyright years.  Added local variables
 +	for this file; fixed indenting.
 +	(erc-speedbar): New group.
 +	(erc-speedbar-sort-users-type): New variable.
 +	(erc-speedbar-buttons): Handle query buffers (fixes a bug where an
 +	error would be thrown if the current buffer was a query).  Ignore
 +	unknown buffers.
 +	(erc-speedbar-expand-channel): Show limit and key with channel
 +	modes. Sort users according to `erc-speedbar-sort-users-type'.
 +	(erc-speedbar-insert-user): Fixed bug where only nicks with more
 +	info were being listed, and those were shown twice.
 +	(erc-speedbar-goto-buffer): Don't use dframe functions, as dframe
 +	isn't available with the default speedbar.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-sort-channel-users-alphabetically): New function.
 +	(erc-server-412, erc-server-432, erc-server-475): New functions.
 +	(erc-server-412-hook, erc-server-432-hook, erc-server-475-hook):
 +	Use them.
 +	(erc-server-401, erc-server-403, erc-server-405)
 +	(erc-server-421, erc-server-474, erc-server-481): Use catalog
 +	messages.
 +	(erc-define-catalog): Added s401, s403, s405, s412, s421, s432,
 +	s474, s475, and s481.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Added documentation to Commentary, Usage.
 +	Removed `outline-mode' from file local variables.
 +	(erc-services-mode): Use `erc-nickserv-identify-mode' to add
 +	hooks.
 +	(erc-nickserv-identify-mode): New function.
 +	(erc-nickserv-identify-mode): New variable.
 +	(erc-prompt-for-nickserv-password, erc-nickserv-passwords):
 +	Changed docstring.
 +	(erc-nickserv-identify-autodetect): Use
 +	`erc-nickserv-call-identify-function'. Docstring change.
 +	(erc-nickserv-identify-on-connect,
 +	erc-nickserv-identify-on-nick-change,
 +	erc-nickserv-call-identify-function): New functions.
 +	(erc-nickserv-identify): PASSWORD is not optional.  Autoload
 +	function.
 +
 +2004-05-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-hook, erc-quit-hook, erc-part-hook,
 +	erc-kick-hook, erc-connect-pre-hook): Now customizable.
 +	(erc-nick-changed-functions): New hook.
 +	(erc-server-NICK): Run `erc-nick-changed-functions' with the
 +	arguments NEW-NICK and OLD-NICK.
 +	(erc-channel-user-voice-p, erc-channel-user-voice-p): Shortened
 +	docstring.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: New section on function/variable naming and coding
 +	conventions.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-wash-quit-reason): Quote regexp special characters
 +	in NICK, LOGIN and HOST.
 +
 +2004-05-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-server-parameters): Typo fix in docstring.
 +	(erc-input-line-position): `:type' is now a choice between integer
 +	and nil.  (erc-mode-map): Bind `erc-get-channel-mode-from-keypress'
 +	to C-c C-o instead of C-c RET (C-c C-m).  (erc-cmd-GQUIT): Use
 +	REASON as argument when calling `erc-cmd-QUIT'.
 +
 +2004-05-03  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nicklist.el: Initial version.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Added local variables for file, fixed indenting.
 +	(erc-menu-version): New variable.
 +	(erc-menu-definition): "List channels": New.  "Join channel": Use
 +	`erc-connected' as test.  "Start a query": New.  "List channel
 +	operators": New.  "Input action": Moved up.  "Set topic": Fixed
 +	test so it's only active in channels.  "Leave this channel": Moved
 +	down.  "Track hidden channel buffers": Removed.  "Enable/Disable
 +	ERC Modules": New.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-mode-map): Removed binding for
 +	`erc-save-buffer-in-logs' (moved to erc-log.el).
 +	(erc-cmd-QUERY, erc-cmd-OPS): Now interactive.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Added local variables for this file.
 +	(erc-log-channels-directory): Added directory as a choice in
 +	`:type'.
 +	(define-erc-module): Define and undefine key binding (C-c
 +	C-l) for `erc-save-buffer-in-logs' here.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added local variables for this file.
 +	(erc-networks-alist): Fixed `:type' to work better in
 +	customization.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added local variables for file.  (erc-keywords):
 +	Use `list' instead of `cons' in `:type'.  Fixes bug where mismatch
 +	was shown in customization.  (erc-current-nick-highlight-type):
 +	Escape parentheses in docstring.  Added keyword, nick-or-keyword as
 +	options in `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Added local variables for file.
 +	(erc-away-timestamp-format): Allow nil as a choice in `:type'.
 +	(erc-timestamp-intangible): Changed `:type' to boolean.
 +	(erc-timestamp-right-column): Added `:group' and `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Added bbdb, log, match, sound, and stamp
 +	as `:type' options; changed documentation for autojoin, fill,
 +	pcomplete, track.  (erc-prompt-for-channel-key): New variable.
 +	(erc-join-channel): Only prompt for key if
 +	`erc-prompt-for-channel-key' is non-nil.  (erc-format-my-nick): New
 +	function.  (erc-send-message, erc-send-current-line): Use it.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-track.el: (erc-track-modified-channels): Fix indentation.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-hide-fools): Docstring fix.
 +	(erc-log-matches-types-alist): Added `current-nick' to valid
 +	choices.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-page.el, erc-ezbounce.el, erc-speak.el, erc-match.el,
 +	erc-track.el (erc-ezbounce, erc-page, erc-speak): Groups defined.
 +	(erc-match, erc-track): `erc' is parent group.
 +	(erc-ezb-regexp, erc-ezb-login-alist): Added `:group'.
 +
 +2004-04-20  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: Fixed erc-fill-static so it breaks the lines at the
 +	right column and respects timestamps. Patch by Simon Siegler
 +	<simon@trz-kril.de>
 +	(erc-fill-static): Major rewrite and split up into some functions.
 +	(erc-count-lines): Removed.
 +	(erc-fill-regarding-timestamp): New function.
 +	(erc-timestamp-offset): New function.
 +	(erc-restore-text-properties): New function.
 +	(erc-fill-variable): Respect leftbound timestamp.  This is still
 +	broken if someone has both erc-timestamp-only-if-changed-flag set
 +	and erc-insert-timestamp-function set to
 +	'erc-insert-timestamp-left, but otherwise it works now.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-SV): Show features gtk, mac-carbon, multi-tty.
 +	Fixed so that arguments fit the format (build date was not being
 +	shown).
 +
 +2004-04-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-channel-topic); Error if `channel-topic' is
 +	unbound.  Remove %-sign substitution.
 +	(erc-update-mode-line-buffer): Escape %-signs in `channel-topic'
 +	here.
 +
 +2004-04-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-send-action, erc-ctcp-query-ACTION,
 +	erc-ctcp-reply-ECHO-hook): Let `erc-display-message-highlight'
 +	propertize the message.
 +	(erc-display-message-highlight): Allow for any erc-TYPE-face.
 +	(erc-cmd-JOIN): Display error message instead of throwing an error
 +	if there's no `invitation'.
 +	(erc-cmd-PART): Allow for no reason if channel is provided.  Fixes
 +	bug where user would part the current channel with the other
 +	channel's name as reason when no reason was given.
 +	(erc-server-vectors, erc-debug-missing-hooks): Added docstring.
 +	(erc-server-JOIN): Moved `erc-join-hook' to JOIN-you section.
 +	`erc-join-hook' called by `run-hook-with-args', sending the ARGS
 +	`chnl' and the channel's buffer.  Changed an instance of if
 +	without else to when.
 +	(erc-server-477): New function.
 +	(erc-server-477-hook): Use `erc-server-477'.
 +	(erc-define-catalog): Added `no-invitation'.
 +
 +2004-04-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Local variables for file added.
 +	(erc-nickserv-passwords): Customization: Network symbols updated
 +	to reflect `erc-nickserv-alist'.  Allow user to type in network
 +	symbol.
 +	(erc-nickserv-alist): Now customizable variable.
 +
 +2004-04-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Make sure `line'
 +	is a string to avoid errors upon startup.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-version): New variable.
 +	(erc-auto-discard-away): Updated docstring.
 +	(erc-autoaway-no-auto-back-regexp): New variable.
 +	(erc-autoaway-reset-idletime): Use it.	Hopefully a better solution
 +	which allows for aliases to "/away" and any other text that the
 +	user wants to ignore when `erc-auto-discard-away' is non-nil.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Forgot /gaway in
 +	regexp.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): If the user sends
 +	an "/away" command, don't call `erc-autoaway-set-back', fixes bug
 +	where ERC would send "/away" when user was already away and sent an
 +	"/away reason".  Changed `l' to `line' for better understanding.
 +	(erc-autoaway-set-back): Changed `l' to `line' for better
 +	understanding.
 +
 +2004-04-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-set-channel-key): Now able to remove key.
 +	(erc-set-channel-limit): Now able to remove limit.
 +	(erc-get-channel-mode-from-keypress): Fixed docstring.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-channel): Allow for optional channel key.
 +	(erc-set-modes): Need to set `channel-key' to nil in case of mode
 +	changes during split.
 +	(erc-show-channel-key-p): New variable.
 +	(erc-prepare-mode-line-format): Only show key if
 +	`erc-show-channel-key-p' is non-nil.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 + 	* erc.el (channel-key): New variable.
 +	(erc-update-channel-key): New function.
 +	(erc-set-modes, erc-parse-modes, erc-update-modes, erc,
 +	erc-update-channel-info-buffer): Deal with channel keys.
 +	(erc-prepare-mode-line-format): Show channel key in header-line.
 +	(erc-server-NICK): Show nick change in server buffer as well.
 +	(erc, erc-send-command, erc-banlist-store, erc-banlist-update,
 +	erc-load-irc-script-lines,
 +	erc-arrange-session-in-multiple-windows, erc-handle-login,
 +	erc-find-channel-info-buffer): Changed when not to unless.
 +	(erc-server-MODE): Changed if without else to when.
 +
 +2004-03-27  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use `truncate-string-to-width'
 +	instead of `truncate-string' alias.
 +	(erc-nickname-in-use): Ditto.
 +
 +2004-03-27  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-list): Fixed error caused by erc-cmd-LIST
 +	passing a non-sequence to erc-chanlist.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Add new hook `erc-join-hook', which is run when we join a
 +	channel.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Replaced existing notice user notification system and
 +	the configuration options, which consisted of
 +	`erc-echo-notices-in-minibuffer-flag' and
 +	`erc-echo-notices-in-current-buffer' with two new hooks,
 +	`erc-echo-notice-hook' and `erc-echo-notice-always-hook'.
 +
 +	When user notification is needed, `erc-echo-notice-always-hook' is
 +	first run using `run-hook-with-args', then `erc-echo-notice-hook'
 +	is run using `run-hook-with-args-until-success'.
 +
 +	In addition to these hooks, a large number of functions, which are
 +	described in the documentation strings of those hooks, were added
 +	which can be used to achieve a large variety of different
 +	behaviors.
 +
 +	The current default behavior, which is identical to the existing
 +	default behavior, is for `erc-echo-notice-always-hook' to be set to
 +	`(erc-echo-notice-in-default-buffer).
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: (erc-modified-channels-display): Added a space
 +	before opening bracket.
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-query-as-channel-p): New variable.
 +	(erc-server-PRIVMSG-or-NOTICE): If `erc-format-query-as-channel-p'
 +	is nil, messages in the query buffer are formatted like private
 +	messages.
 +
 +	(erc-server-252-hook, erc-server-253-hook, erc-server-254-hook,
 +	erc-server-256-hook, erc-server-257-hook, erc-server-258-hook,
 +	erc-server-259-hook, erc-server-371-hook, erc-server-372-hook,
 +	erc-server-374-hook, erc-server-374-hook, erc-server-442-hook,
 +	erc-server-477-hook): Removed, now defined in
 +	`erc-server-hook-list'.
 +	(erc-display-server-message): New function.
 +	(erc-server-252, erc-server-253, erc-server-254, erc-server-442):
 +	New functions.
 +	(erc-server-hook-list): Added 250, 256, 257, 258, 259, 265, 266,
 +	377, 378, 477 - using `erc-display-server-message'.  251, 255 now
 +	use `erc-display-server-message'.  Added 252, 253, 254, 442 -
 +	using respective erc-server-* functions.  371, 372, 374, 375 now
 +	defined here.
 +	(erc-define-catalog): Added s252, s253, s254, s442.
 +	(erc-server-001, erc-server-004, erc-server-005): Fixed
 +	documentation.
 +
 +2004-03-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Commentary: Changed `erc-stamp-mode' to
 +	`erc-timestamp-mode'.
 +	(erc-insert-timestamp-left): Use `erc-timestamp-face' on filler
 +	spaces as well.
 +
 +2004-03-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-send-action): Use `erc-input-face'.
 +	(erc-display-message-highlight): If the requested highlighting
 +	type doesn't match, just display the string with no highlighting
 +	and warn about it with `erc-log'.. (erc-cmd-JOIN): If user is
 +	already on the requested channel, switch to that channel's buffer.
 +	(erc-ctcp-query-ACTION): Use `erc-action-face' for nick as well.
 +	(erc-header-line-use-help-echo-p): New variable.
 +	(erc-update-mode-line-buffer): Use `help-echo' for header-line if
 +	`erc-header-line-use-help-echo-p' is non-nil.
 +
 +2004-03-18  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-nets.el: Use two arguments version of `make-obsolete', if
 +	third argument is not supported (for XEmacs).
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* CREDITS: added CREDITS entry for Adrian Aichner
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* erc-xdcc.el, erc.el, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-dcc.el, erc-ezbounce.el, erc-imenu.el,
 +	erc-list.el, erc-log.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-netsplit.el, erc-notify.el, erc-speedbar.el,
 +	erc-stamp.el, erc-track.el, erc-truncate.el:
 +	(erc-coding-sytem-for-target): Removed.
 +	(erc-coding-system-for-target): New.
 +	(erc-autoaway-use-emacs-idle): Typo fix.
 +	(erc-auto-set-away): Ditto.
 +	(erc-auto-discard-away): Ditto.
 +	(autojoin): Ditto.
 +	(erc-button-alist): Ditto.
 +	(erc-dcc-auto-masks): Ditto.
 +	(erc-dcc-chat-send-input-line): Ditto.
 +	(erc-ezb-get-login): Ditto.
 +	(erc-unfill-notice): Ditto.
 +	(erc-save-buffer-in-logs): Ditto.
 +	(match): Ditto.
 +	(erc-log-matches-types-alist): Ditto.
 +	(erc-match-directed-at-fool-p): Ditto.
 +	(erc-match-message): Ditto.
 +	(erc-update-member): Ditto.
 +	(erc-ignored-reply-p): Ditto.
 +	(erc-menu-definition): Ditto.
 +	(erc-netsplit-QUIT): Ditto.
 +	(erc-notify-list): Ditto.
 +	(erc-speedbar-update-channel): Ditto.
 +	(erc-speedbar-item-info): Ditto.
 +	(erc-stamp): Ditto.
 +	(erc-timestamp-intangible): Ditto.
 +	(erc-add-timestamp): Ditto.
 +	(erc-timestamp-only-if-changed-flag): Ditto.
 +	(erc-show-timestamps): Ditto.
 +	(erc-track-priority-faces-only): Ditto.
 +	(erc-modified-channels-alist): Ditto.
 +	(erc-unique-substrings): Ditto.
 +	(erc-find-parsed-property): Ditto.
 +	(erc-track-switch-direction): Ditto.
 +	(erc-truncate-buffer-to-size): Ditto.
 +	(erc-xdcc): Ditto.
 +	(erc-auto-reconnect): Ditto.
 +	(erc-startup-file-list): Ditto.
 +	(erc-once-with-server-event): Ditto.
 +	(erc-once-with-server-event-global): Ditto.
 +	(erc-mode): Ditto.
 +	(erc-generate-new-buffer-name): Ditto.
 +	(erc): Ditto.
 +	(erc-open-ssl-stream): Ditto.
 +	(erc-default-coding-system): Ditto.
 +	(erc-encode-string-for-target): Ditto.
 +	(erc-decode-string-from-target): Ditto.
 +	(erc-scroll-to-bottom): Ditto.
 +	(erc-decode-controls): Ditto.
 +	(erc-channel-members-changed-hook): Ditto.
 +	(erc-put-text-property): Ditto.
 +	(erc-add-default-channel): Ditto.
 +
 +2004-03-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Cancel ping timer upon
 +	disconnect.
 +	(erc-cmd-PART): Use same regexp as `erc-cmd-QUIT' when no #channel
 +	is provided.
 +	(erc-nick-uniquifier, erc-manual-set-nick-on-bad-nick-p): `:group'
 +	was missing, added.
 +	(erc-part-reason-zippy, erc-part-reason-zippy): Removed FIXME
 +	comments.  I see no problem allowing typed in reasons.
 +
 +2004-03-16  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: (erc-insert-timestamp-left): Added support for
 +	`erc-timestamp-only-if-changed-flag' and added docstring.
 +	(erc-timestamp-only-if-changed-flag): Updated documentation.
 +
 +2004-03-13  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-network-name): No longer marked as obsolete.
 +	Why was this function made obsolete?  There is no other function
 +	that performs this task.  Some of us use these functions in our
 +	personal ERC configs.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-buffer-filter): Use `with-current-buffer'.
 +	(erc-process-input-line): Append newline to documentation.  Fixes a
 +	bug whereby the prompt would be put on the same line as the output.
 +	(erc-cmd-GQUIT): Only try and send QUIT if the process is alive.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-log.el: Only add top-level hooks if `erc-enable-logging' is
 +	non-nil.
 +
 +2004-03-10  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nets.el: From Adrian Aichner (adrian /at/ xemacs /dot/ org)
 +	* erc-nets.el: XEmacs make-obsolete only takes two arguments.
 +
 +2004-03-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-determine-network): Use `erc-session-server' if
 +	`erc-announced-server' is nil to avoid error if server does not
 +	send 004 (RPL_MYINFO) message.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-server-alistm erc-settings): Use lowercase
 +	"freenode", as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Use lowercase "freenode",
 +	as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el (pcomplete/erc-mode/DCC): Append "send" as a list.
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-networks-alist): Changed "Freenode" to
 +	"freenode".
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Improved the docstring.	Made
 +	message to user more accurate	depending on whether a single
 +	channel is being listed or not.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-determine-network): Make matching logic simpler
 +	(suggested by Damian Elmes).
 +	(erc-current-network, erc-network-name): Add `make-obsolete' form.
 +	(erc-set-network-name): Indentation fix.
 +	(erc-ports-list): Add docstring.  Rework function body to use
 +	`nconc'.
 +
 +2004-03-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el, erc-notify.el: (require 'erc-nets): added
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-network-name): Function definition moved to
 +	erc-nets.el.  The functions `erc-determine-network' and
 +	`erc-network' in erc-nets.el do what this did before.  Deprecated.
 +	Use (erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Changed copyright notice.  Now require
 +	erc-nets.  erc-nets.el now takes care of network-related functions
 +	and variables.
 +	(erc-nickserv-alist): Changed network symbols to match those in
 +	`erc-networks-alist' in erc-nets.el.
 +	(erc-nickserv-identify-autodetect): Use `erc-network'.
 +	(erc-nickserv-identify): Use `erc-network'.  Changed wording for
 +	interactive use, now shows current nick.
 +	(erc-networks): Removed.  Use `erc-networks-alist' as defined in
 +	erc-nets.el.
 +	(erc-current-network): Function definition moved to erc-nets.el.
 +	The functions `erc-determine-network' and `erc-network' in
 +	erc-nets.el do what this did before.  Deprecated.  Use
 +	(erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added commentary, `erc-nets-version'.
 +	(erc-server-alist): Changed Brasnet to BRASnet.
 +	(erc-networks-alist): All networks (except EFnet and IRCnet) now
 +	have a MATCHER.  (erc-network): New variable.
 +	(erc-determine-network): New function. Determine the network the
 +	user is on.  Use the server parameter NETWORK, if provided, else
 +	parse the server name and search for a match (regexp and loop by
 +	wencem) in `erc-networks-alist'.  Return the name of the network
 +	or "Unknown" as a symbol.
 +	(erc-network): New function.  Returns value of `erc-network'.  Use
 +	this when the current buffer is not the server process buffer.
 +	(erc-current-network): Returns the value of `erc-network' as
 +	expected by users who used the function as it was defined in
 +	erc-nickserv.el.  Deprecated.
 +	(erc-network-name): Returns the value of `erc-network' as expected
 +	by users who used the function as it was defined in erc.el.
 +	Deprecated.
 +	(erc-set-network-name): New function.  Added to
 +	`erc-server-375-hook' and `erc-server-422-hook'.
 +	(erc-unset-network-name): New function.  Added to
 +	`erc-disconnected-hook'.
 +	(erc-server-select): Small documentation word change.
 +
 +2004-03-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS: disumu info updated
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-cmd-LIST): Take &rest rather than &optional
 +	arguments.
 +	(erc-chanlist): Construct correct LIST command from list of
 +	channels.
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line-buffer): Add 'help-echo property to
 +	header-line text.  This allows header lines longer than the width
 +	of the current window to be seen.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-directed-at-fool-p): Also check for
 +	"FOOL, "
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Only use nick-or-keyword if
 +	we're matching our nick.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: The highlight type for the current nickname can
 +	now also be 'nick-or-keyword, to highlight the nick of the sender
 +	if that is available, but fall back to highlighting your nickname
 +	in the whole message otherwise.
 +	(erc-current-nick-highlight-type): Adapted docstring accordingly.
 +	(erc-match-message): Added new condition. Also added some comments
 +	to this monster of a function.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-is-valid-nick-p): Don't check for length less or
 +	equal to 9.
 +
 +2004-03-06  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nickserv.el (erc-current-network): the last change resulted
 +	in this function failing when a network identifies itself as
 +	anything other than var.netname.com, so for instance
 +	'vic.au.austnet.org' fails. This version is only a marginal
 +	improvement over the original, but if we want to be more flexible
 +	we'll probably have to do the iteration ourselves instead of using
 +	assoc.
 +
 +2004-03-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: Added erc-server-001 which runs when the server sends
 +	its welcome message.  It sets the current-nick to reflect the
 +	server's settings. This fixes a bug where nicks that were too long
 +	and got truncated by ther server were still set to the old value.
 +	(nickname-in-use): If user wants to try again manually, let user
 +	know that the nick is taken.  If not, go through erc-default-nicks
 +	until none are left, and then try one last time with
 +	erc-nick-uniquifier.  If it's still a bad-nick, make the user
 +	change nick manually.  When applying uniquifier, use NICKLEN if
 +	it's in the server parameters, otherwise use what RFC 2812 says is
 +	the max nick length (9 chars).  Added custom variable
 +	erc-manual-set-nick-on-bad-nick-p, which is set to nil and
 +	erc-nick-change-attempt-count.  Reset erc-default-nicks and
 +	erc-nick-change-attempt-count when the nick has been changed
 +	successfully.  This fixes the bug where ERC would get caught in a
 +	neverending loop of trying to set the same nick if the nick was
 +	too long and the uniquified nick was not available.
 +
 +	* added erc-cmd-WHOAMI
 +
 +	* added custom variable erc-mode-line-away-status-format, use this
 +	instead of   the previous hard-coded setting
 +
 +	* erc-server-315|318|369-hook defvar lines removed - they're
 +	already defined in erc-server-hook-list
 +
 +2004-03-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Initial commit.  Some thoughts on coding standards.
 +
 +2004-03-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: added the variable erc-track-priority-faces-only
 +	which adds the option to ignore changes in a channel unless there
 +	are faces from the erc-track-faces-priority-list in the message
 +	options are nil, 'all, or a list of channel name strings
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el: Changed erc-is-channel-op
 +	and erc-is-channel-voice to erc-channel-user-op-p and
 +	erc-channel-user-voice-p to better match erc-channel-user
 +	structure (and emacs lisp usage)
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el:
 +	erc-track-modified-channels-mode is now erc-track-mode
 +
 +2004-02-29  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added 'keyword option to
 +	erc-current-nick-highlight-type highlights all instances of
 +	current-nick in the message ('nickname option in cvs revisions 1.9
 +	- 1.11 had same effect)
 +
 +2004-02-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: Add Lisp: prefix for the EmacsWiki Elisp area.
 +	(erc-button-alist): Added Lisp: prefix.
 +	(erc-emacswiki-lisp-url): New variable.
 +	(erc-browse-emacswiki-lisp): New function.
 +
 +2004-02-27  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-get-arglist): Use `substitute-command-keys', rather
 +	than hard-coding C-h f for `describe-function'.
 +
 +2004-02-26  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): bind `inhibit-read-only'
 +	to t around call to `erase-buffer'.
 +
 +2004-02-23  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-chess.el, erc-dcc.el, erc-ezbounce.el, erc-list.el,
 +	erc-macs.el, erc-ring.el, erc-stamp.el, erc.el: Normalized buffer
 +	local variable creation.
 +
 +2004-02-17  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-scroll-to-bottom, erc-add-scroll-to-bottom): Mention
 +	`erc-input-line-position' in docstring.
 +
 +2004-02-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-kick-hook): Typo fix.
 +
 +2004-02-13  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Added `erc-kick-hook', which is called when the local
 +	user is kicked from a channel.  Fixed a bug in `erc-cmd-OPS', such
 +	that the command now works.  Added `erc-remove-channel-users', in
 +	order to fix a number of significant bugs relating to channel
 +	parting.
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove last change. This caused a
 +	lot of trouble :(
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Also set 'field property, so C-j
 +	works on an empty prompt.
 +
 +2004-02-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-topic): Ensure that `channel-topic'
 +	does not contain any bare format controls.
 +
 +2004-02-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el (erc-timestamp-intangible): New variable (user
 +	feature request)
 +	(erc-format-timestamp): Use erc-timestamp-intangible.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-button.el: Fixed bug related to nickname buttonizing and text
 +	fields due to erc-stamp.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* CREDITS: Added mention of my change of ERC to use hash tables.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* AUTHORS: Added myself to the list.
 +
 +2004-02-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Jeremy Maitin-Shepard <jbms@attbi.com>:
 +	(erc-remove-channel-user): Use `delq' not `delete'.
 +	(erc-get-buffer): Pass PROC through to `erc-buffer-filter'.
 +	(erc-process-sentinel): Use `erc' rather than `erc-reconnect' for
 +	auto-reconnection.
 +
 +2004-02-02  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-buffer-list-with-nick): Apply `erc-downcase' NICK.
 +
 +2004-01-30  Alex Schroeder <alex@gnu.org>
 +
 +	* erc.el: (erc-get-buffer): Use erc-buffer-filter.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: (erc-get-channel-nickname-list): New function.
 +	(erc-get-server-nickname-list): New function.
 +	(erc-get-server-nickname-alist): New function.
 +	(erc-get-channel-nickname-alist): New function.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list,
 +	erc-remove-entry-from-list): Use `erc-member-ignore-case' to
 +	compare entries.
 +	(erc-add-pal, erc-add-fool): Fix type bug. Use
 +	`erc-get-server-nickname-alist'.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: Adds xemacs compatibility to hash table
 +	channel-members patch.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: (erc-update-undo-list): Rewritten. Update
 +	buffer-undo-list in place.  Deal with XEmacsesque
 +	entries (extents) in the list.
 +	(erc-channel-users): Fix unescaped open-paren in left column in
 +	docstring.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-ring.el: (erc-replace-current-command): Exclude the prompt
 +	from the deleted region and don't redisplay the prompt (because
 +	`erc-display-prompt' flushes `buffer-undo-list').
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list): Use `symbol-value' instead
 +	of `eval'.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-kill-buffer-function): maphash was missing an
 +	argument.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* Makefile, erc-autoaway.el, erc-button.el, erc-ibuffer.el,
 +	erc-lang.el, erc-list.el, erc-match.el, erc-menu.el, erc-page.el,
 +	erc-pcomplete.el, erc-speedbar.el, erc.el: HUGE change by jbms.
 +	This makes channel-members a hash, erc-channel-users.
 +
 +	Modified files: Makefile erc-autoaway.el erc-button.el
 +	erc-ibuffer.el erc-lang.el erc-list.el erc-match.el erc-menu.el
 +	erc-page.el erc-pcomplete.el erc-speedbar.el erc.el
 +
 +	The changes are too numerous to document properly. Have fun with
 +	the breakage.
 +
 +2004-01-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-send-input-line): Add a space to empty lines so the
 +	server likes them.
 +
 +2004-01-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-send-whitespace-lines: New variable.
 +	(erc-send-current-line): Use erc-send-whitespace-lines. Also,
 +	removed superflous test for empty line in the mapc, since the
 +	blank line test should find all. I do like to be able to send an
 +	empty line when i want to!
 +	(erc-send-current-line): Check for point being in input line
 +	before checking for blank lines.
 +
 +2004-01-21  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-display-line-1): Move `erc-update-undo-list' outside
 +	`save-restriction'.  Removing need for temporary variable.
 +	(erc-send-current-line): Fix bug introduced by last change, remove
 +	complement in blank line regexp.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-undo-list): Add logic to catch the case when
 +	`buffer-undo-list' is t, indentation cleanup.
 +	(erc-send-current-line):  Reverse logic for matching blank lines.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-input-line-position): New variable.  If non-nil,
 +	specifies the argument to `recenter' in `erc-scroll-to-bottom'.
 +	(erc-scroll-to-bottom): Use it.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Johan Bockgård <bojohan+news@dd.chalmers.se>:
 +	(erc-update-undo-list): New function.  Update `buffer-undo-list'
 +	so that calling `undo' in an ERC buffer doesn't mess up the
 +	existing text.
 +	(erc-display-line-1): Use it.
 +
 +2004-01-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-beg-of-input-line): Use `forward-line' rather than
 +	`beginning-of-line'.  Docstring fix.
 +	(erc-end-of-input-line): Docstring fix.
 +
 +2004-01-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove the undo list after
 +	displaying the prompt, so the user can't undo ERC changes, which
 +	breaks some stuff anyways. This way the user can still undo his
 +	editing, but not ours.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Should recenter on the bottom
 +	line, not the second-to-last one.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-bol): Fix bug introduced in revision 1.601.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Brian Palmer <bpalmer@gmail.com>
 +	(erc-cmd-JOIN): Use `erc-member-ignore-case', rather than
 +	`member-ignore-case'.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: There was an inconsistency where the values of op and
 +	voice in channel-names could be 'on or 'off after an update, t and
 +	nil before.  The intended version was to have t or nil, so i fixed
 +	it to do so.
 +	(channel-names): Updated docstring.
 +	(erc-update-current-channel-member): Clarified docstring, fixed so
 +	it sets t or nil on an update as well, not only on an add.
 +	(erc-cmd-OPS): Updated not to check for 'on (the only function that
 +	did this!)
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-part-reason-various-alist,
 +	erc-update-mode-line-buffer): Fix docstring
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line): Fix typo.
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-prompt-interactive-input): Removed.
 +	(erc-display-prompt): Removed `erc-prompt-interactive-input'
 +	option.  (erc-interactive-input-map): Removed.
 +
 +	Major docstring fixes.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-OPS): Added this function.
 +	(erc-cmd-IDLE): Switched from using erc-display-message-highlight
 +	to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Switched from using
 +	erc-display-message-highlight to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event): Added a sentence to the
 +	docstring.  Now returns the uninterned symbol that is added to the
 +	server hook.
 +	(erc-cmd-IDLE): Changed to use erc-once-with-server-event instead
 +	of erc-once-with-server-event-global.
 +
 +2004-01-06  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-hide-modeline): New variable.
 +	(erc-chanlist): Now displays message as a notice.  Also hides the
 +	modeline if erc-chanlist-hide-modeline is non-nil.
 +
 +2004-01-05  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-server-PRIVMSG-or-NOTICE): Now nicks appear as
 +	<nick> in query buffers, instead of as *nick*.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): Changed to return
 +	the uninterned symbol that it creates.
 +	(erc-cmd-LIST): Changed to clean up hooks that don't run.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/IDLE): Added to support new
 +	/IDLE command.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): New function.  Like
 +	erc-once-with-server-event, except it modifies the global value of
 +	the event hook.
 +	(erc-cmd-IDLE): New function.  Implements the new /IDLE command.
 +	Usage: /IDLE NICK (erc-seconds-to-string): New function.  Converts
 +	a number of seconds to an Engligh phrase.
 +
 +2004-01-02  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el: Added variable erc-chanlist-mode-hook.
 +
 +See ChangeLog.03 for earlier changes.
 +
-     Copyright (C) 2004, 2006 Free Software Foundation, Inc.
++    Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
diff --cc ChangeLog.05
index ec72c60,0000000..e73045c
mode 100644,000000..100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@@ -1,1228 -1,0 +1,1228 @@@
 +2005-11-23  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SAY): Strip leading space in input line.
 +
 +2005-10-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: Add stuff that needs to be done before the 5.1
 +	release.  Longer-term items can be added to the 5.2 section.
 +
 +	* Makefile (SITEFLAG): New variable that indicates what variant of
 +	"--site-flag" to use.  XEmacs needs "-site-flag".
 +	(INSTALLINFO): New variable indicating how we should call
 +	install-info when installing documentation.
 +	(erc-auto.el, .elc.el): Use $(SITEFLAG).
 +
 +	* NEWS: Note that last release was 5.0.4.
 +
 +	* erc.texi: Initial and incomplete draft of ERC documentation.
 +	Commence collaborate-documentation-hack-mode :^) .
 +
 +2005-10-29  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el (erc-replace-current-command): Revert last change
 +	since it made the prompt disappear when using `erc-next-command'
 +	and `erc-previous-command'.
 +
 +2005-10-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-input-marker): New variable that indicates the
 +	position where text from the user begins, after the prompt.
 +	(erc-mode-map): Bind <HOME> to erc-bol, just like C-a.
 +	(erc): Initialize erc-input-marker.
 +	(erc-display-prompt): Even in case where no prompt is desired by
 +	the user, clear the undo buffer and set the input marker.
 +	(erc-bol, erc-user-input): Simplify by using erc-input-marker.
 +
 +	* erc-pcomplete.el (pcomplete-parse-erc-arguments): Use
 +	erc-insert-marker.
 +
 +	* erc-ring.el (erc-previous-command)
 +	(erc-replace-current-command): Use erc-insert-marker.
 +
 +	* erc-spelling.el (erc-spelling-init): Make sure that even Emacs21
 +	obeys erc-spelling-flyspell-verify.
 +	(erc-spelling-flyspell-verify): Use erc-input-marker.  This should
 +	make it considerably faster when switching to a buffer that has
 +	seen a lot of activity since last viewed.
 +
 +2005-10-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-server-version, 004): Re-added setting of
 +	`erc-server-version'.  It doesn't hurt to set, and it could be
 +	used in modules or users' settings.
 +
 +	* NEWS: Added descriptions of some new features.
 +
 +2005-10-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
 +	as default.
 +	(erc-beep-match-types): New variable.
 +	(erc-text-matched-hook): Doc fix.  Added `erc-beep-on-match' to
 +	customization options.
 +	(erc-beep-on-match): New function.  If the MATCH-TYPE is found in
 +	`erc-beep-match-types', beep.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	New functions to deal with the difference in the number of
 +	arguments accepted by `make-obsolete' and `make-obsolete-variable'
 +	in Emacs and XEmacs.
 +
 +	* erc.el, erc-nets.el: Use `erc-make-obsolete' and
 +	`erc-make-obsolete-variable'.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	Handle `wrong-number-of-arguments' error instead of checking for
 +	xemacs feature as future versions of XEmacs might accept three
 +	arguments.
 +
 +2005-10-18  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
 +	docstrings.
 +
 +2005-10-08  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
 +	Updated my email address.
 +
 +2005-10-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-send-input-line, erc-cmd-KICK, erc-cmd-PART)
 +	(erc-cmd-QUIT, erc-cmd-TOPIC, erc-kill-server, erc-kill-channel):
 +	Adapt to new TARGET parameter of erc-server-send.
 +
 +	* erc-backend.el (erc-server-connect): Don't specify encoding for
 +	erc-server-process, since we set this each time we send a line to
 +	the server.
 +	(erc-encode-string-for-target): Remove.
 +	(erc-server-send): Allow TARGET to be specified.  This was how it
 +	used to be before my more-backend work.  Set encoding of server
 +	process just before sending text to it.  Associate encoding with
 +	text if we are using the queue.
 +	(erc-server-send-queue): Pull encoding from queue.
 +	(erc-message, erc-send-ctcp-message, erc-send-ctcp-notice): Adapt
 +	to new TARGET parameter of erc-server-send.
 +
 +2005-10-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Use erc-view-mode-enter
 +	rather than view-mode.
 +
 +	* erc-backend.el (erc-encode-string-for-target): If given a nil or
 +	empty string, return "".
 +	(erc-server-send-queue): XEmacs fix: Use erc-cancel-timer rather
 +	than cancel-timer.
 +
 +	* erc-compat.el (erc-view-mode-enter): New function that is
 +	aliased to the correct way of entering view-mode.
 +
 +	* erc-match.el (erc-log-matches-make-buffer): Use
 +	erc-view-mode-enter rather than view-mode-enter.
 +
 +2005-10-05  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-backend.el (erc-encode-string-for-target): If str is nil,
 +	pass the empty string to erc-encode-coding-string instead, which
 +	allows one to /part and /quit without providing a reason again.
 +
 +2005-10-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-message, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Encode string for target before sending.
 +
 +	* erc.el (erc-cmd-KICK, erc-cmd-PART, erc-cmd-QUIT, erc-cmd-TOPIC)
 +	(erc-kill-server, erc-kill-channel): Ditto.
 +
 +2005-09-05  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc-page.el (erc-ctcp-query-PAGE): (message text) -> (message
 +	"%s" text).
 +	(erc-cmd-PAGE): Simplify regexp. Put `do-not-parse-args' t.
 +
 +2005-09-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-flood-limit, erc-flood-limit2): Remove since they
 +	are no longer needed.
 +	(erc-send-input): Detect whether we want flood control to be
 +	active.  The previous behavior was to always force the message.
 +	(erc-toggle-flood-control): Adapt to new flood control method.  No
 +	more 'strict.
 +	(erc-cmd-SV): Use concat rather than
 +	format-time-string.
 +	(erc-format-target, erc-format-target-and/or-server): Shorten
 +	logic statements.
 +
 +	* erc-compat.el (erc-emacs-build-time): Use a string
 +	representation rather than trying to coerce a time out of a string
 +	on XEmacs.
 +
 +	* erc-identd.el (erc-identd-start): Use make-network-process
 +	instead of open-network-stream.  Error out if this is not defined.
 +
 +	* erc-backend.el (erc-send-line): New command that sends a line
 +	using flood control, using a callback for display.  It isn't used
 +	yet.
 +
 +2005-09-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias and make-obsolete-variable for
 +	erc-default-coding-system.
 +	(channel-topic, channel-modes, channel-user-limit, channel-key,
 +	invitation, away, channel-list, bad-nick): Rename globally to
 +	erc-{name-of-variable}.
 +
 +2005-09-03  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-message): Simplify regexp.
 +	(erc-cmd-DEOP, erc-cmd-OP): Simplify.
 +
 +2005-08-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Alias erc-send-command to erc-server-send.  ErBot needs
 +	this to work without modification.  Add defvaralias for
 +	erc-process.  Make this and the other backwards-compatibility
 +	functions and variables be marked obsolete as of ERC 5.1.
 +
 +	* erc-backend.el: Add autoload for erc-log macro.
 +	(erc-server-connect): Set some variables before defining process
 +	handlers.  It probably doesn't make any difference.
 +
 +2005-08-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias for erc-announced-server-name, since
 +	this seems to be widely used.
 +
 +2005-08-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc): Remove unnecessary boundp check.
 +
 +	* erc-autoaway.el: Fix compiler warning.
 +
 +	* erc-backend.el (erc-server-version): Since this isn't used by
 +	any code, and isn't generally useful, remove it.
 +	(erc-server-send-queue): Use erc-current-time rather than
 +	float-time.
 +	(004): Don't set erc-server-version.
 +
 +	* erc-dcc.el (erc-dcc-chat-request, erc-dcc-get-parent): Move to
 +	fix a compiler warning.
 +
 +	* erc-ibuffer.el (erc-server): Remove unnecessary boundp check.
 +
 +	* erc-identd.el (erc-identd-start): Use read-string instead of
 +	read-input.
 +
 +	* erc-imenu.el (erc-unfill-notice): Use a while loop instead of
 +	replace-regexp.
 +
 +	* erc-nicklist.el: Add conditional dependency on erc-bbdb.
 +	(erc-nicklist-insert-contents): Tighten some regexps.
 +
 +	* erc-notify.el (erc-notify-list): Docfix.
 +
 +	* erc-spelling.el (erc-spelling-dictionaries): Add :type and
 +	:group to silence a compiler warning.
 +
 +2005-08-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-session-server, erc-session-port)
 +	(erc-announced-server-name, erc-server-version)
 +	(erc-server-parameters): Moved here from erc.el.
 +	(erc-server-last-peers): Moved, renamed from last-peers.
 +	(erc-server-lag): Moved, renamed from erc-lag.
 +	(erc-server-duplicates): Moved, renamed from erc-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server): New customization group hosting all options from
 +	this file.
 +	(erc-server-prevent-duplicates): Moved, renamed from
 +	erc-prevent-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server-auto-reconnect, erc-split-line-length)
 +	(erc-server-coding-system, erc-encoding-coding-alist)
 +	(erc-server-connect-function, erc-server-flood-margin)
 +	(erc-server-flood-penalty): Change group to 'erc-server.
 +	(erc-server-send-ping-interval): Moved, renamed from
 +	erc-ping-interval.
 +	(erc-server-ping-handler): Moved, renamed from erc-ping-handler.
 +	(erc-server-setup-periodical-server-ping): Moved, renamed from
 +	erc-setup-periodical-server-ping.
 +	(erc-server-connect): Add to docstring.  Move more initialization
 +	here.
 +	(erc-server-processing-p): Docfix.
 +	(erc-server-connect): Use 'raw-text like in the original version.
 +	(erc-server-filter-function): Don't reset process coding system.
 +
 +	* erc-stamp.el (erc-add-timestamp): If the text at point is
 +	invisible, don't insert a timestamp.  Thanks to Pascal
 +	J. Bourguignon for the suggestion.
 +
 +	* erc-match.el (erc-text-matched-hook): Don't hide fools by
 +	default, but include it in the available options.
 +
 +2005-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-*.el: s/erc-send-command/erc-server-send/g.
 +	s/erc-process/erc-server-process/g (sort of).  Occasional
 +	whitespace and indentation fixes.
 +
 +	* erc-backend.el: Specify a few local variables for indentation.
 +	Take one item off of the TODO list.
 +	(erc-server-filter-data): Renamed from erc-previous-read.  From
 +	circe.
 +	(erc-server-processing-p): New variable that indicates when we're
 +	currently processing a message.  From circe.
 +	(erc-split-line-length): New option that gives the maximum line
 +	length of a single message.  From circe.
 +	(erc-default-coding-system): Moved here from erc.el.
 +	(erc-split-line): Renamed from erc-split-command and taken from
 +	circe.
 +	(erc-connect-function, erc-connect, erc-process-sentinel-1)
 +	(erc-process-sentinel, erc-flood-exceeded-p, erc-send-command)
 +	(erc-message, erc-upcase-first-word, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Moved here from erc.el.
 +	(erc-server-filter-function): Renamed from erc-process-filter.
 +	From circe.
 +	(erc-server-process): Renamed from `erc-process' and moved here
 +	from erc.el.
 +	(erc-server-coding-system): Renamed from
 +	`erc-default-coding-system'.
 +	(erc-encoding-coding-alist): Moved here from erc.el.
 +	(erc-server-flood-margin, erc-server-flood-penalty):
 +	(erc-server-flood-last-message, erc-server-flood-queue):
 +	(erc-server-flood-timer): New options from circe that allow
 +	tweaking of flood control.
 +	(erc-server-connect-function): Renamed from erc-connect-function.
 +	(erc-flood-exceeded-p): Removed.
 +	(erc-coding-system-for-target)
 +	(erc-encode-string-for-target, erc-decode-string-from-target):
 +	Moved here from erc.el
 +	(erc-server-send): Renamed from erc-send-command.  Adapted from
 +	the circe function by the same name.
 +	(erc-server-send-queue): New function from circe that implements
 +	handling of a flood queue.
 +	(erc-server-current-nick): Renamed from current-nick.
 +	(erc-server-quitting): Renamed from `quitting'.
 +	(erc-server-last-sent-time): Renamed from `last-sent-time'.
 +	(erc-server-last-ping-time): Renamed from `last-ping-time'.
 +	(erc-server-lines-sent): Renamed from `lines-sent'.
 +	(erc-server-auto-reconnect): Renamed from `erc-auto-reconnect'.
 +	(erc-server-coding-system): Docfix.
 +	(erc-server-connect): Renamed from `erc-connect'.  Require SERVER
 +	and PORT parameters.  Initialize several variables here.  Don't
 +	set `erc-insert-marker'.  Use a per-server coding system via
 +	erc-server-default-encoding.
 +
 +	* erc.el (erc-version-string): Changed to indicate we are running
 +	the `more-backend' branch.
 +	(erc-send-single-line): Implement flood control using
 +	erc-split-line.
 +	(erc-send-input): Move functionality of erc-send-single-line in
 +	here.
 +	(erc-send-single-line): Assimilated!
 +	(erc-display-command, erc-display-msg): Handle display hooks.
 +	(erc-auto-reconnect, current-nick, last-sent-time)
 +	(last-ping-time, last-ctcp-time, erc-lines-sent, erc-bytes-sent)
 +	(quitting): Moved to erc-backend.el.
 +	(erc): Docfix.  Don't initialize quite so many things here.
 +
 +2005-08-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/copyright (Copyright): Remove notices for 4 people, since
 +	they didn't contribute legally-significant changes, or have had
 +	these changes overwritten.
 +
 +	* erc-log.el: Remove copyright notice.
 +
 +	* erc.el: Remove 3 copyright notices.
 +
 +2005-08-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-3 package.  This doesn't serve
 +	any purpose other than to thank Romain Francoise for some advice.
 +
 +	* Makefile (debrelease): Allow last upload and extra build options
 +	to be specified.
 +
 +2005-08-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-2 package.
 +
 +	* debian/control (Uploaders): Add Romain Francoise.
 +	(Standards-Version): Update to 3.6.2.
 +	(Depends): Add `emacsen'.
 +
 +	* debian/scripts/startup.erc (load-path): Minor whitespace fixup.
 +
 +	* Makefile (clean): Split target from realclean and make it remove
 +	files that aren't packaged in releases.
 +	(clean, release): Minor cleanups.
 +	(debrelease): Use debuild rather than dpkg-buildpackage since the
 +	former calls lintian.  Minor cleanups.
 +	(debrelease-mwolson): New target that removes old Debian packages,
 +	calls debrelease, and copies the resulting package to my dist dir.
 +	(upload): New target that automates the process of uploading an
 +	ERC release to sourceforge.
 +
 +	* erc.el (erc-mode): Use `make-local-variable' instead of
 +	`make-variable-buffer-local'.
 +
 +2005-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Build 5.0.4-1.
 +
 +	* Makefile (release): Prepare zip file in addition to tarball.
 +
 +	* NEWS: Add item for the undo fix.
 +
 +2005-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Check
 +	erc-announced-name before erc-session-server.  Make sure that we
 +	can never get a stringp (nil) error.
 +	(erc-nicklist-call-erc-command): If given no command, do nothing.
 +	This fixes an error that used to occur when a stray mouse click
 +	was made outside of the popup window, but on the erc-nicklist
 +	menu.
 +
 +	* erc-bbdb.el (erc-bbdb-search-name-and-create): Get rid of the
 +	infinite input loop when you want to create a new record.  Replace
 +	most of that with a completing read of existing nicks.  If no nick
 +	is chosen, create a new John Doe record.  The net effect of this
 +	is that the old behavior is re-instated, with the addition of one
 +	completing read that happens when you do a /whois.
 +
 +2005-07-09  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Docfix.
 +	(erc-update-mode-line-buffer): Use `erc-propertize' instead of
 +	`propertize'.
 +	(erc-propertize): Move to erc-compat.el.
 +
 +	* erc-compat.el (erc-propertize): Move here from erc.el. Always
 +	return a copy of the string (like `propertize' in GNU Emacs).
 +
 +	* erc-nicklist.el (erc-nicklist-icons-directory)
 +	(erc-nicklist-voiced-position)
 +	(erc-nicklist-insert-medium-name-or-icon): Docfix.
 +	(erc-nicklist-insert-contents): Simplify.
 +	(erc-nicklist-mode-map): Bind RET instead of `return'. Bind
 +	`down-mouse-3' instead of `mouse-3'.
 +	(erc-nicklist-kbd-cmd-QUERY): Cleanup regexp.
 +	(erc-nicklist-channel-users-info): Docfix. Simplify.
 +
 +2005-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* images: New directory containing the images that are used by
 +	erc-nicklist.el.  These are from Gaim, and are thought to be
 +	available under the terms of the GPL.
 +
 +	* erc-bbdb.el: Add local variables section to preserve tabs, since
 +	that is the style used throughout this file.  Apply patch from
 +	Edgar Gonçalves as follows.
 +	(erc-bbdb-bitlbee-name-field): New variable that indicates the
 +	field name to use for annotating the "displayed name" of a bitlbee
 +	contact.
 +	(erc-bbdb-irc-highlight-field): Docfix.
 +	(erc-bbdb-search-name-and-create): Prompt the user for the name of
 +	a contact if none was found.  Merge the new entries into the
 +	specified contact.  If new arg SILENT is non-nil, do not prompt
 +	the user for a name or offer to merge the new entry.
 +	(erc-bbdb-insinuate-and-show-entry): New arg SILENT is accepted,
 +	which is passed on to erc-bbdb-search-name-and-create.
 +	(erc-bbdb-whois): Tell erc-bbdb-search-name-and-create to prompt
 +	for name if necessary.
 +	(erc-bbdb-JOIN, erb-bbdb-NICK): Forbid
 +	erc-bbdb-search-name-and-create from prompting for a name.
 +
 +	* erc-nicklist.el: Add local variables section to preserve tabs,
 +	since that is the style used throughout this file.  Apply patch
 +	from Edgar Gonçalves as follows.
 +	(erc-nicklist-use-icons): New option; if non-nil, display an icon
 +	instead of the name of the chat medium.
 +	(erc-nicklist-icons-directory): New option indicating the path to
 +	the PNG files that are used for chat icons.
 +	(erc-nicklist-use-icons): New option indicating whether to put
 +	voiced nicks on top, bottom, or not to differentiate them.  The
 +	default is to put them on the bottom.
 +	(erc-nicklist-bitlbee-connected-p): New variable that indicates
 +	whether or not we are currently using bitlbee.  An attempt will be
 +	made to auto-detect the proper value.  This is bound in the
 +	`erc-nicklist-insert-contents' function.
 +	(erc-nicklist-nicklist-images-alist): New variable that maps a
 +	host type to its icon.  This is set by `erc-nicklist'.
 +	(erc-nicklist-insert-medium-name-or-icon): New function that
 +	inserts an icon or string that identifies the current host type.
 +	(erc-nicklist-search-for-nick): New function that attempts to find
 +	a BBDB record that corresponds with this contact given its
 +	finger-host.  If found, return its bitlbee-nick field.
 +	(erc-nicklist-insert-contents): New function that inserts the
 +	contents of the nick list, including text properties and images.
 +	(erc-nicklist): Populate `erc-nicklist-images-alist'.  Move
 +	nicklist content generation code to
 +	`erc-nicklist-insert-contents'.
 +	(erc-nicklist-mode-map): Map C-j to erc-nicklist-kbd-menu and RET
 +	to erc-nicklist-kbd-cmd-QUERY.
 +	(erc-nicklist-call-erc-command): Make use of
 +	`switch-to-buffer-other-window'.
 +	(erc-nicklist-cmd-QUERY): New function that opens a query buffer
 +	for the given contact.
 +	(erc-nicklist-kbd-cmd-QUERY): Ditto; contains most of the code.
 +	(erc-nicklist-kbd-menu): New function that shows the nicklist
 +	action menu.
 +	(erc-nicklist-channel-users-info): Renamed from
 +	`erc-nicklist-channel-nicks'.  Implement sorting voiced users.
 +
 +2005-06-29  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Fix regexp for Azzurra.
 +
 +2005-06-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autojoin.el (erc-autojoin-add, erc-autojoin-remove): Use
 +	`erc-session-server' if `erc-announced-server-name' is nil.  This
 +	happens when servers don't send a 004 message.
 +
 +	* erc.el (erc-quit-server): Ditto.
 +
 +	* erc-ibuffer.el (erc-server, erc-server-name): Ditto.
 +
 +	* erc-notify.el (erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Ditto.
 +
 +2005-06-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-default-coding-system)
 +	(erc-handle-user-status-change): Docstring fix.
 +	(with-erc-channel-buffer): Removed.
 +	(erc-ignored-reply-p): Replace `with-erc-channel-buffer' with
 +	`erc-with-buffer'.
 +	(erc-display-line-1): Revision 1.730 broke undo. Fix it.
 +
 +2005-06-23  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add entries for Luigi Panzeri and Andreas Schwab.
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Add entries for Azzurra
 +	and OFTC.  Thanks to Luigi Panzeri and Andreas Schwab for
 +	providing these.
 +
 +2005-06-16  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add John Paul Wallington.
 +
 +	* erc.el: Thanks to John Paul Wallington for the following.
 +	(erc-nickname-in-use): Use `string-to-number' instead of
 +	`string-to-int'.
 +
 +	* erc-dcc.el (erc-dcc-handle-ctcp-send)
 +	(erc-dcc-handle-ctcp-chat, erc-dcc-get-file)
 +	(erc-dcc-chat-accept): Ditto.
 +
 +	* erc-identd.el (erc-identd-start): Ditto.
 +
 +2005-06-16  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-mode-map): Suppress `font-lock-fontify-block' key
 +	binding since it destroys face properties.
 +
 +2005-06-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-UNIGNORE): Use `erc-member-ignore-case' instead
 +	of `member-ignore-case'.  Thanks to bpalmer for the heads up.
 +
 +2005-06-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Fix a mistake I made when editing this a
 +	few days ago.  Modes should now be disabled properly.
 +	(erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Remove unnecessary call to
 +	`format'.  Thanks to Andreas Schwab for reporting this.
 +
 +	* debian/changelog: Close "README file missing" bug.
 +
 +	* debian/rules (binary-erc): Install README file.
 +
 +2005-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-with-buffer): Set `lisp-indent-function' so Emacs
 +	Lisp mode knows how to indent erc-with-buffer blocks.
 +	(with-erc-channel-buffer): Ditto.
 +	(erc-with-all-buffers-of-server): Ditto.
 +	(erc-modules): Use pcomplete by default, not completion, since
 +	erc-complete.el is deprecated.  Use `fboundp' instead of
 +	`symbol-value' to check for existence of a function before calling
 +	it.  This was causing an error when untoggling the `completion'
 +	option and trying to save via the customize interface.
 +
 +	* erc-track.el (erc-modified-channels-update): If a buffer is not
 +	currently connected, remove it from the modified channels list.
 +	This should fix the problem where residue was left on the mode
 +	line after quitting ERC.
 +
 +	* erc-list.el (erc-prettify-channel-list): Docfix; thanks to John
 +	Paul Wallington for reporting this.
 +
 +2005-05-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: First draft of entries for the 5.0.3 release.
 +
 +	* debian/README.Debian: Note that ERC will now install correctly
 +	on versions of Emacs or XEmacs that do not have the `format-spec'
 +	library.  Correct some grammar and prune the content a bit.
 +
 +	* debian/scripts/install (emacs20): Remove line since we no longer
 +	need to deal with format-spec.el.
 +
 +	* NEWS: Add entries for the upcoming 5.0.3 release.
 +
 +	* erc.el: Don't require format-spec since this is provided in
 +	erc-compat.el now.
 +	(erc-process-sentinel, erc-setup-periodical-server-ping): Use
 +	`erc-cancel-timer' instead of `cancel-timer'.
 +	(erc-version-string): Update to 5.0.3.
 +
 +	* erc-autoaway.el (autoaway, erc-autoaway-reestablish-idletimer):
 +	Use `erc-cancel-timer' instead of `cancel-timer'.
 +
 +	* erc-compat.el (format-spec, format-spec-make): If we cannot load
 +	the `format-spec' library, provide versions of these functions.
 +	This should keep problems from surfacing with Emacs21 Debian
 +	builds.
 +	(erc-cancel-timer): New function created to take the place of
 +	`cancel-timer' since XEmacs calls it something else.
 +
 +	* erc-track.el (erc-modified-channels-update): Accept any number
 +	of arguments, which are ignored.  This allows it to be run from
 +	`erc-disconnected-hook' without extra bother.
 +	(track): Add `erc-modified-channels-update' to
 +	`erc-disconnected-hook' so that the indicators are removed
 +	correctly in some edge cases.
 +	(erc-modified-channels-display): Make sure that we never pass nil
 +	to the function in `erc-track-shorten-function'.  This happens
 +	when we have deleted buffers in `erc-modified-channels-alist'.
 +	Also, make sure that the buffer has a non-nil short-name before
 +	adding it to the string list.  This should fix some XEmacs
 +	warnings when running /quit with unchecked buffers, as well as get
 +	rid of a stray buffer problem (or so it is hoped).
 +
 +2005-05-31  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-replace.el, erc-speak.el: Clean up comment formatting.
 +
 +	* erc-ring.el (ring, erc-input-ring-index, erc-clear-input-ring):
 +	Clean up docstring formatting.
 +
 +2005-05-30  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Delete superfluous
 +	arg to `format'.
 +	(erc-load-irc-script): Use `insert-file-contents' instead of
 +	`insert-file'. Simplify.
 +
 +2005-05-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Move this up so that it is
 +	evaluated before the `require' statements.  Not a major change.
 +
 +2005-04-27  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-complete-word): Simplify.
 +
 +2005-04-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Use a slightly different approach when
 +	removing CVS and Arch cruft.
 +
 +	* debian/changelog: Update for 5.0.2-1 package.
 +
 +2005-04-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move code
 +	block higher in file to fix a load failure when using Emacs21.
 +	Thanks to Daniel Brockman for the report and fix.
 +
 +2005-04-24  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-backend.el (JOIN): save-excursion so that
 +	`erc-current-logfile' inserts into the correct channel buffers
 +	when using erc-log-insert-log-on-open in combination with autojoin
 +	to multiple channels.
 +
 +2005-04-17  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-log.el: Remove stray whitespace.
 +	* erc.el: Ditto.
 +
 +2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
 +
 +	* erc.el: autoload erc-select-read-args, which, because it parses
 +	erc-select's args, can be called before erc.el is loaded. 
 +
 +2005-04-07  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Remove final newlines from previously-existing ERC
 +	buffers. (Minor bug fix.)
 +
 +2005-04-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Ignore errors from deleting Arch and CVS
 +	metadata.
 +
 +2005-04-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, CREDITS, AUTHORS: Correct name and email address of
 +	Marcelo Toledo.
 +
 +2005-04-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Add entry for spelling module.
 +
 +	* erc-spelling.el: Add autoload line.
 +
 +	* erc-backend.el: Apply latest non-ascii patch from Kai Fan.
 +	(erc-decode-parsed-server-response): Search
 +	erc-response.command-args for channel name.  Decode the
 +	erc-response struct using this channel name as key according to
 +	the `erc-encoding-coding-alist'.
 +
 +	* erc-track.el: Apply patch from Henrik Enberg.
 +	(erc-modified-channels-object): Use optimal amount of whitespace
 +	around modified channels indicator.
 +
 +2005-04-02  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (define-erc-module, erc-with-buffer)
 +	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
 +	edebug-form-spec.
 +
 +	* erc-compat (erc-define-minor-mode): Ditto.
 +
 +2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
 +
 +	* erc-spelling.el: New file.
 +
 +2005-03-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (define-erc-response-handler): Add
 +	`definition-name' property to constructed symbols so that
 +	find-function and find-variable will find them.
 +
 +2005-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el, erc-goodies.el, erc-list.el, erc-notify.el,
 +	erc-ring.el, erc.el: Copyright assignment occurred.
 +
 +	* debian/scripts/install: Make a shell wrapper around the original
 +	Makefile and inline the Makefile.  The problem is that Debian
 +	passes all the Emacs variants at once, rotating them at every
 +	invocation of the install script, which happens once per variant.
 +	This caused each installation to happen N-1 times more often than
 +	it should have.  As a result, we need to only deal with the first
 +	argument.
 +	(ELFILES): Only add format-spec.el if we are compiling for
 +	emacs21.  Don't filter out erc-compat.el.
 +	(SITEFLAG): New variable that indicates that the "nosite" option
 +	should look like.
 +	(.DEFAULT): Use $(FLAVOUR) instead of $@ for clarity.
 +
 +	* debian/rules: Install NEWS file and compress it.
 +
 +	* debian/maint/postinst: Be more cautious about configuration
 +	step.
 +
 +	* debian/copyright (Copyright): Another assignment came in.
 +
 +	* debian/control (Standards-Version): Update to a newer version as
 +	recommended by lintian.
 +
 +	* debian/changelog: Changes made for the Debian package.
 +
 +	* debian/README.Debian: Keep only the General Notes section.
 +
 +	* NEWS: Move old history items here from debian/README.Debian.
 +
 +	* Makefile (SNAPSHOTDATE): Deprecate this option since we hope to
 +	release more often.
 +
 +2005-03-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-define-catalog, `ctcp-request-to'): Fix typo (%: ->
 +	%t:).
 +
 +2005-03-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Replace tabs with spaces
 +	in code indentation.
 +
 +2005-02-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply corrected patch from Henrik
 +	Enberg.
 +
 +2005-02-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply patch from Henrik Enberg.
 +	Check here to see if a message should be hidden, rather than
 +	relying on code in each individual command.
 +	(erc-version-string): Add "(CVS)" to the version string for
 +	clarity.
 +
 +	* erc-backend.el (JOIN, KICK, MODE, NICK, PART, QUIT, TOPIC):
 +	Don't check `erc-hide-list' here.
 +
 +	* erc-list.el, erc-match.el, erc.el, debian/copyright: Update
 +	copyright information as a few more people have assignments
 +	registered.
 +
 +2005-02-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el: Apply patch from Kai Fan for non-ASCII character
 +	support.
 +	(erc-parse-server-response): Add call to
 +	`erc-decode-parsed-server-response'.
 +	(erc-decode-parsed-server-response): New function that decodes a
 +	pre-parsed server response before it can be handled.
 +	(PRIVMSG): Comment out call to `erc-decode-string-from-target'.
 +	(TOPIC): Ditto.
 +
 +2005-02-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-sentinel-1): Don't reconnect on connection
 +	refused. This error is reported differently when using
 +	open-network-stream-nowait.
 +
 +2005-01-26  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-APPENDTOPIC, erc-set-topic): The control
 +	character in `channel-topic' was changed to \C-o - replaced \C-c
 +	with \C-o so that these functions work as expected again.
 +	(erc-get-channel-mode-from-keypress): Doc fix.
 +
 +2005-01-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-button.el, erc-compat.el, erc-goodies.el,
 +	erc-match.el, erc-nets.el, ChangeLog, NEWS: Merged bug fixes made
 +	on release_5_0_branch since 5.0.1 release.
 +
 +2005-01-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-input-action): Quote `erc-action-history-list' so
 +	that input history actually works.
 +	(erc-process-ctcp-query): Fix and simplify logic.
 +	(erc-get-channel-mode-from-keypress): Use `C-' string syntax.
 +	(erc-load-irc-script-lines): Use `erc-command-indicator' instead
 +	of `erc-prompt'.
 +
 +2005-01-23  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Ensure that `viper-comint-mode-hook' runs in
 +	buffers whose `erc-mode-hook' has already run when this file is
 +	loaded.
 +	Explicitly `require' erc.el.
 +
 +2005-01-22  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Remove frobbing of `require-final-newline'.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Remove frobbing of
 +	`require-final-newline'.
 +
 +	* erc-viper.el: New file. This is where all ERC/Viper
 +	compatiibilty code should live. When and if ERC is bundled with
 +	Emacs, some of the hacks in this file should be merged into Viper
 +	itself.
 +
 +2005-01-21  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Set `require-final-newline' to nil in ERC
 +	buffers. This prevents a Viper misfeature whereby extraneous
 +	newlines are inserted into the ERC buffer when switching between
 +	viper states.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Bind `require-final-newline'
 +	to t when calling `write-region' to ensure that further log
 +	entries start on fresh lines.
 +	
 +2005-01-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-face): Reverted my change to the
 +	order faces since it had the unwanted effect of putting the button
 +	face after all others.
 +	(erc-button-face-has-priority): Removed this variable as it is not
 +	necessary anymore - it was used to compensate for the above
 +	mentioned change.
 +
 +	* NEWS: Added the latest fixes.
 +
 +2005-01-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el, erc-match.el:
 +	(erc-button-syntax-table, erc-match-syntax-table): Added \ as a
 +	legal character for nicknames.
 +
 +	* erc-nets.el (erc-server-select): Fixed so that only networks
 +	with servers found in `erc-server-alist' are available as choices.
 +
 +	* erc.el, erc-compat.el, erc-goodies.el:
 +	(erc-replace-match-subexpression-in-string): New function.  Needed
 +	because `replace-match' in XEmacs doesn't replace regular
 +	expression subexpressions in strings, only in buffers.
 +	(erc-seconds-to-string, erc-controls-interpret): Use the new
 +	function.
 +
 +	* erc-button.el (erc-button-add-button): Use the `:button-face'
 +	key combined with an `erc-mode' local `widget-button-face' set to
 +	nil to get the widget overlay face suppressed in XEmacs.
 +
 +2005-01-19  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-face): The face added by this
 +	function is more important than the existing text's face, so we
 +	now prepend erc-button-face to the list of existing faces when
 +	adding a button.  To instead append erc-button-face to existing
 +	faces, set variable `erc-button-face-has-priority' to nil.
 +	(erc-button-face-has-priority): New variable to control how
 +	erc-button-add-face adds erc-button-face to existing faces.
 +	(erc-button-press-button): Silenced a byte-compiler warning about
 +	too few arguments in a call to `error'.
 +
 +2005-01-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* NEWS: Added list of 5.0.1 fixes.
 +
 +2005-01-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Move to format that cscvs can understand.  As an added
 +	perk, entries line up nicer.
 +
 +	* erc.el, erc-fill.el, erc-pcomplete.el, debian/copyright: Merge a
 +	few more copyright lines thanks to Alex Schroeder's BBDB file.
 +
 +	* Makefile: Change version to correspond with our new scheme.
 +
 +2005-01-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el (erc-chanlist-channel-line-regexp): Now matches
 +	private channels, the channels `#' and `&', and channels with
 +	names including non-ascii characters.
 +	(erc-chanlist-join-channel): Don't attempt to join private
 +	channels since the channel name is unknown.
 +
 +	* erc-goodies.el (erc-make-read-only): Add `rear-nonsticky'
 +	property to avoid `Text is read-only' errors during connection.
 +	`front-nonsticky' does not exist, changed to `front-sticky'.
 +	(erc-controls-interpret, erc-controls-strip): Just work on the
 +	string, don't open a temporary buffer.
 +	(erc-controls-propertize): Now accepts optional argument STR.
 +
 +2005-01-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile: Version is 5.01, but only in the Makefile.  It has not
 +	been released yet.
 +
 +	* erc-auto.in, erc-autojoin.el, erc-bbdb.el, erc-button.el,
 +	erc-chess.el, erc-complete.el, erc-dcc.el, erc-fill.el,
 +	erc-goodies.el, erc-ibuffer.el, erc-identd.el, erc-imenu.el,
 +	erc-list.el, erc-match.el, erc-menu.el, erc-nets.el,
 +	erc-netsplit.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el,
 +	erc-ring.el, erc-speak.el, erc-speedbar.el, erc-stamp.el,
 +	erc-track.el, erc-xdcc.el, erc.el, debian/copyright: Update
 +	copyright notices.  If anyone has signed papers for Emacs in
 +	general, merge them with the FSF's entry.
 +
 +2005-01-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc): `erc-set-active-buffer' was being called before
 +	`erc-process' was set, so that channels weren't being marked
 +	active correctly upon join; fixed.
 +
 +2005-01-15  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (def-edebug-spec): This macro caused problems (in
 +	XEmacs). Use its expansion directly.
 +
 +2005-01-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-button): Reverted previous change
 +	since `:suppress-face' doesn't seem to be checked for a certain
 +	face.
 +	(erc-button-add-face): FACE is now appended to the `old' face.
 +	This should fix the problem of faces being "covered" by
 +	`erc-button-face'.
 +
 +2005-01-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-OPS, erc-cmd-COUNTRY,
 +	erc-cmd-NICK, erc-process-ctcp-query, ERROR, PONG, 311, 312, 313,
 +	314, 317, 319, 320, 321, 322, 330, 352): Use catalog entries
 +	instead of hard-coded text messages.
 +	(english): Added new catalog entries `country', `country-unknown',
 +	`ctcp-empty', `ctcp-request-to', `ctcp-too-many', `nick-too-long',
 +	`ops', `ops-none', `ERROR', `PONG', `s311', `s312', `s313',
 +	`s314', `s317', `s317-on-since', `s319', `s320', `s321', `s322',
 +	`s330', and `s352'.
 +	(erc-send-current-line): Use `erc-set-active-buffer' (change was
 +	lost in previous bug fix).
 +
 +2005-01-14  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-button): Fixed a bug where the
 +	overlay created by widget-convert-button has a `face' property
 +	that hides the `face' property set on the underlying button text.
 +
 +	* erc-goodies.el: Docstring fix.
 +
 +	* erc-button.el: Improved docstring for variable erc-button-face.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el (erc-menu-definition): "Topic set by channel
 +	operator": Small word change.  "Identify to NickServ...": Check
 +	that we're connected to the server.  Added "Save buffer in log"
 +	and "Truncate buffer".
 +
 +2005-01-13  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el (erc-display-line-1): Widen before we try to insert
 +	anything, this makes sure input isn't broken when the buffer is
 +	narrowed by the user.
 +	(erc-beg-of-input-line): Simplify, just return the position of
 +	`erc-insert-marker' or error if does not exist.
 +	(erc-send-current-line): Widen before trying to send anything.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el, erc-list.el:
 +	(erc-update-mode-line-buffer): Strip controls characters from
 +	`channel-topic' since we add our own control character to it.
 +	(TOPIC, 332): Use \C-o instead of \C-c to force an end of IRC
 +	control characters as it also ends bold, underline, and inverse -
 +	\C-c only ends colors.
 +	(erc-chanlist-322): Strip control characters from channel and
 +	topic.  No need to interpret controls when we're applying overlays
 +	to the lines.
 +
 +	* erc.el, erc-backend.el, erc-button.el, erc-netsplit.el,
 +	erc-nicklist.el: Fixed so that each server has an active buffer.
 +	(erc-active-buffer): Now a buffer-local variable.
 +	(erc-active-buffer, erc-set-active-buffer): New functions.
 +	(erc-display-line, erc-echo-notice-in-active-non-server-buffer,
 +	erc-process-away, MODE): Call `erc-active-buffer' to get the
 +	active buffer for the current server.
 +	(erc, erc-process-sentinel-1, erc-grab-region, erc-input-action,
 +	erc-send-current-line, erc-invite-only-mode,
 +	erc-toggle-channel-mode, erc-channel-names, MODE, erc-nick-popup,
 +	erc-nicklist-call-erc-command): Use `erc-set-active-buffer' to set
 +	the active buffer for the current server.
 +	(erc-cmd-WHOLEFT): Use 'active as BUFFER in `erc-display-message'.
 +
 +	* erc-track.el (erc-track-modified-channels): Server buffers are
 +	now treated the same as channels and queries.  This means that
 +	`erc-track-priority-faces-only', `erc-track-exclude', and
 +	`erc-track-exclude-types' now work with server buffers.
 +
 +2005-01-12  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (475): Prompt for the channel's key if
 +	`erc-prompt-for-channel-key' is non-nil.  Send a new JOIN message
 +	with the key if a key is provided.
 +
 +	* erc.el (erc-command-indicator): Fixed customization choices so
 +	that there's no `mismatch' message when nil is the value.
 +
 +2005-01-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-bbdb.el (bbdb): Lowercase the name of the module.  This
 +	fixes a bug which caused an error to occur when trying to enable
 +	the module using the customization interface.
 +
 +2005-01-08  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-track.el: Support using faces to indicate channel activity
 +	in the modeline under XEmacs.
 +	(erc-modified-channels-object): New function.
 +	(erc-modified-channels-display): Use it.
 +	`erc-modified-channels-string' renamed to
 +	`erc-modified-channels-object' (because it's no longer a string on
 +	XEmacs). The new function `erc-modified-channels-object' is used
 +	to generate updated values for the same-named variable.
 +
 +2005-01-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* ChangeLog.2002: Changed instances of my sourceforge username and
 +	email address to real name and email.
 +
 +	* erc.el (erc-modules): Changed customization tag descriptions, so
 +	that they all start with a verb; added new modules to choices.
 +
 +2005-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/rules: Introduce new variable DOCDIR to simplify stuff a
 +	bit.
 +
 +2005-01-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS, ChangeLog.2004: Change bpalmer's email address as
 +	requested.
 +
 +	* CREDITS: Add everyone who is mentioned in the ChangeLogs.
 +
 +	* debian/copyright (Copyright): Add last few people.  This can now
 +	be considered a complete list, as far as CVS entries are
 +	concerned.  If people have assigned copyright to the FSF, merge
 +	them with the entry for the FSF.
 +
 +	* debian/README.Debian: Add entry for XEmacs-related change in
 +	`erc-track.el'.
 +
 +	* erc.el (erc-cmd-MODE): New command that changes or displays the
 +	mode for a channel or user.  The functionality was present before
 +	this change, but there was no documentation for it.
 +
 +	* erc-auto.in, erc-*.el: Fully investigate copyright headers and
 +	change them appropriately.  If a file has been pulled off of
 +	erc.el at one time, keep track of copyright from the time of
 +	separation, but not before.  If a file has been derived from a
 +	work outside of erc, keep copyright statements in place.
 +
 +	* Makefile (VERSION): Change to 5.0! :^) Congrats on all the great
 +	work.  I'll wait until hober commits his XEmacs compatibility
 +	patch to erc-track.el, and then release.
 +	(distclean): Alias for `realclean' target.
 +
 +2005-01-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Add Marcelo Toledo, who has CVS access to this project.
 +
 +	* ChangeLog.2004: Add my name to my one contribution to erc last
 +	year.
 +
 +	* CREDITS: Add people that were discovered while scouring
 +	ChangeLogs.
 +
 +	* debian/copyright: Add everyone from `AUTHORS' to Upstream
 +	Authors.  Anyone who has contributed 15 or more lines of
 +	code (according to ChangeLogs) is listed in Copyright section.
 +	Accurate years are included.
 +
 +	* debian/README.Debian: Paste content of NEWS and reformat
 +	slightly.
 +
 +	* debian/rules: Concatenate the ChangeLogs during the Debian
 +	install process and then gzip them.
 +
 +	* Makefile (MISC): Add ChangeLog.yyyy files to list.
 +	(ChangeLog): Remove rule since we do not dynamically generate the
 +	ChangeLog anymore.
 +
 +	* MkChangeLog: Removed since we do not use it to generate the
 +	ChangeLog anymore.  cvs2cl does a much better job anyway.
 +
 +	* NEWS: Use 3rd level heading instead of bullets for lists that
 +	contain descriptions.
 +
 +2005-01-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Require 'sort.
 +	(erc-chanlist): Disable undo in the channel list buffer.
 +
 +	* erc.el, erc-menu.el: The `IRC' menu is now automatically added
 +	to the menu-bar.  Add the call to `easy-menu-add' to
 +	`erc-mode-hook' when running in XEmacs (without this the menu
 +	doesn't appear).
 +
 +	* NEWS: Added the information from
 +	http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer
 +	changes which weren't yet documented on that page.
 +
 +2005-01-06  Hoan Ton-That  <hoan@ton-that.org>
 +
 +	* erc-log.el (erc-current-logfile): Only downcase the logfile
 +	name, not the whole filename.  Also expand relative to
 +	`erc-log-channels-directory'.
 +	(erc-generate-log-file-name-with-date)
 +	(erc-generate-log-file-name-short)
 +	(erc-generate-log-file-name-long): Don't expand filename, done in
 +	`erc-current-logfile'.
 +
 +2005-01-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* NEWS: New file, details user visible changes from version to
 +	version.
 +
 +	* HACKING (NEWS entries): Mention NEWS file, and what its purpose
 +	is.
 +
 +2005-01-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: New file containing the list of release-critical
 +	tasks.  Feel free to add to it.
 +
 +	* debian/rules (binary-erc): Add ChangeLog files.
 +
 +2005-01-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.2001, ChangeLog.2002, ChangeLog.2003, ChangeLog.2004:
 +	ChangeLog entries from previous years.
 +
 +	* ChangeLog: New file containing ChangeLog entries for the current
 +	year.  Please update this file manually whenever a change is
 +	committed.  This is a new policy.
 +
 +	* AUTHORS: Add myself to list.  Some entries were space-delimited
 +	instead of TAB-delimited, and since the latter seemed to be the
 +	default, make the other entries conform.
 +
 +	* HACKING (ChangeLog Entries): Update section to reflect new
 +	policy toward ChangeLog entries, which is that they should be
 +	manually updated whenever a change is committed.
 +
 +2005-01-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-connection-established, erc-login): Update the
 +	mode-line.
 +	(erc-update-mode-line-buffer): If `erc-current-nick' returns nil,
 +	use an empty string for ?n character in format spec.  Set
 +	`mode-line-process' to ":connecting" while the connection is being
 +	established.
 +
 +2005-01-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* AUTHORS: Update list of authors.
 +
 +2005-01-02  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-goodies.el (erc-control-characters): New customization
 +	group.
 +	(erc-interpret-controls-p): Small fix, addition to
 +	documentation. Updated customization to allow 'remove as a value.
 +	Use 'erc-control-characters as `:group'.
 +	(erc-interpret-mirc-color): Use 'erc-control-characters as
 +	`:group'.
 +	(erc-beep-p): Updated documentation.  Use 'erc-control-characters
 +	as `:group'.
 +	(define-erc-module irccontrols): Add `erc-controls-highlight' to
 +	`erc-insert-modify-hook' and `erc-send-modify-hook' since it
 +	changes the text's appearance.
 +	(erc-controls-remove-regexp, erc-controls-interpret-regexp): New
 +	variables.
 +	(erc-controls-highlight): Fixed so that highlighting works even if
 +	there is no following control character.  Fixed mirc color
 +	highlighting; now respecting `erc-interpret-mirc-color'.  Fixed a
 +	bug where emacs would get stuck in a loop when \C-g was in a
 +	message and `erc-beep-p' was set to nil (default setting).
 +
 +See ChangeLog.04 for earlier changes.
 +
-     Copyright (C) 2005, 2006 Free Software Foundation, Inc.
++    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
diff --cc erc-autoaway.el
index 3473cc3,810f0b6..22636a9
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-autoaway.el --- Provides autoaway for ERC
  
- ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Jorgen Schaefer <forcer@forcix.cx>
  ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
diff --cc erc-backend.el
index 8122c8a,8c4b915..8d33459
--- a/erc-backend.el
+++ b/erc-backend.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-backend.el --- Backend network communication for ERC
  
--;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Filename: erc-backend.el
  ;; Author: Lawrence Mitchell <wence@gmx.li>
diff --cc erc-bbdb.el
index 611b90b,b371121..dd8f8b5
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@@ -1,6 -1,6 +1,7 @@@
  ;;; erc-bbdb.el --- Integrating the BBDB into ERC
  
--;; Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2004, 2005, 2006,
++;;   2007 Free Software Foundation, Inc.
  
  ;; Author: Andreas Fuchs <asf@void.at>
  ;; Maintainer: Mario Lang <mlang@delysid.org>
diff --cc erc-button.el
index 13e2a38,6d2cd82..1fd224f
--- a/erc-button.el
+++ b/erc-button.el
@@@ -1,7 -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 Free Software Foundation, Inc.
++;;   2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: irc, button, url, regexp
diff --cc erc-capab.el
index eb90722,0000000..268c4bf
mode 100644,000000..100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@@ -1,202 -1,0 +1,202 @@@
 +;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB
 +
- ;; Copyright (C) 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2006, 2007 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
 +;; the Free Software Foundation; either version 2, 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.
 +
 +;;; Commentary:
 +
 +;; This file defines the ERC module `erc-capab-identify', which allows
 +;; flagging of unidentified users on servers running dancer-ircd or
 +;; hyperion.  freenode.net supports this capability, for example.
 +
 +;; With CAPAB IDENTIFY-MSG and IDENTIFY-CTCP enabled, messages from
 +;; users who have identified themselves to NickServ will have a plus
 +;; sign and messages from unidentified users will have a minus sign
 +;; added as a prefix.  Note that it is not necessary for your nickname
 +;; to be identified in order to receive these marked messages.
 +
 +;; The plus or minus sign is removed from the message, and a prefix,
 +;; `erc-capab-identify-prefix', is inserted in the front of the user's
 +;; nickname if the nickname is not identified.
 +
 +;; Please note that once this has been enabled on a server, there is no
 +;; way to tell the server to stop sending marked messages.  If you
 +;; disable this module, it will continue removing message flags, but the
 +;; unidentified nickname prefix will not be added to messages.
 +
 +;; Visit <http://freenode.net/faq.shtml#spoofing> and
 +;; <http://freenode.net/faq.shtml#registering> to find further
 +;; explanations of this capability.
 +
 +;; From freenode.net's web site (not there anymore) on how to mark
 +;; unidentified users:
 +;; "We recommend that you add an asterisk before the nick, and
 +;;  optionally either highlight or colourize the line in some
 +;;  appropriate fashion, if the user is not identified."
 +
 +;;; Usage:
 +
 +;; Put the following in your ~/.emacs file.
 +
 +;; (require 'erc-capab)
 +;; (erc-capab-identify-mode 1)
 +
 +;; `erc-capab-identify-prefix' will now be added to the beginning of
 +;; unidentified users' nicknames.  The default is an asterisk, "*".  If
 +;; the value of this variable is nil or you disable this module (see
 +;; `erc-capab-identify-disable'), no prefix will be inserted, but the
 +;; flag sent by the server will still be stripped.
 +
 +;;; Code:
 +
 +(require 'erc)
 +(eval-when-compile (require 'cl))
 +
 +;;; Customization:
 +
 +(defgroup erc-capab nil
 +  "Support for dancer-ircd's CAPAB settings."
 +  :group 'erc)
 +
 +(defcustom erc-capab-identify-prefix "*"
 +  "The prefix used for unidentified users."
 +  :group 'erc-capab
 +  :type '(choice string (const nil)))
 +
 +;;; Define module:
 +
 +(define-erc-response-handler (290)
 +  "Handle dancer-ircd CAPAB messages." nil nil)
 +
 +;;;###autoload (autoload 'erc-capab-identify-mode "erc-capab" nil t)
 +(define-erc-module capab-identify nil
 +  "Handle dancer-ircd's CAPAB IDENTIFY-MSG and IDENTIFY-CTCP."
 +  ;; append so that `erc-server-parameters' is already set by `erc-server-005'
 +  ((add-hook 'erc-server-005-functions 'erc-capab-identify-setup t)
 +   (add-hook 'erc-server-290-functions 'erc-capab-identify-activate)
 +   (add-hook 'erc-server-PRIVMSG-functions
 +             'erc-capab-identify-remove/set-identified-flag)
 +   (add-hook 'erc-server-NOTICE-functions
 +             'erc-capab-identify-remove/set-identified-flag)
 +   (add-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix t)
 +   (mapc (lambda (buffer)
 +           (when buffer
 +             (with-current-buffer buffer (erc-capab-identify-setup))))
 +         (erc-buffer-list 'erc-open-server-buffer-p)))
 +  ((remove-hook 'erc-server-005-functions 'erc-capab-identify-setup)
 +   (remove-hook 'erc-server-290-functions 'erc-capab-identify-activate)
 +   ;; we don't remove the `erc-capab-identify-remove/set-identified-flag' hooks
 +   ;; because there doesn't seem to be a way to tell the server to turn it off
 +   (remove-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix)))
 +
 +;;; Variables:
 +
 +(defvar erc-capab-identify-activated nil
 +  "CAPAB IDENTIFY-MSG has been activated.")
 +(make-variable-buffer-local 'erc-capab-identify-activated)
 +
 +(defvar erc-capab-identify-sent nil
 +  "CAPAB IDENTIFY-MSG and IDENTIFY-CTCP messages have been sent.")
 +(make-variable-buffer-local 'erc-capab-identify-sent)
 +
 +;;; Functions:
 +
 +(defun erc-capab-identify-setup (&optional proc parsed)
 +  "Set up CAPAB IDENTIFY on the current server.
 +
 +Optional argument PROC is the current server's process.
 +Optional argument PARSED is the current message, a response struct.
 +
 +These arguments are sent to this function when called as a hook in
 +`erc-server-005-functions'."
 +  (unless erc-capab-identify-sent
 +    (erc-capab-send-identify-messages)))
 +
 +(defun erc-capab-send-identify-messages ()
 +  "Send CAPAB IDENTIFY messages if the server supports it."
 +  (when (and (stringp erc-server-version)
 +             (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
 +             ;; could possibly check for '("IRCD" . "dancer") in
 +             ;; `erc-server-parameters' instead of looking for a specific name
 +             ;; in `erc-server-version'
 +             (assoc "CAPAB" erc-server-parameters))
 +    (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
 +    (erc-server-send "CAPAB IDENTIFY-MSG")
 +    (erc-server-send "CAPAB IDENTIFY-CTCP")
 +    (setq erc-capab-identify-sent t)))
 +
 +
 +(defun erc-capab-identify-activate (proc parsed)
 +  "Set `erc-capab-identify-activated' and display an activation message.
 +
 +PROC is the current server's process.
 +PARSED is an `erc-parsed' response struct."
 +  (when (or (string= "IDENTIFY-MSG" (erc-response.contents parsed))
 +            (string= "IDENTIFY-CTCP" (erc-response.contents parsed)))
 +    (setq erc-capab-identify-activated t)
 +    (erc-display-message
 +     parsed 'notice 'active (format "%s activated"
 +                                    (erc-response.contents parsed)))))
 +
 +(defun erc-capab-identify-remove/set-identified-flag (proc parsed)
 +  "Remove PARSED message's id flag and add the `erc-identified' text property.
 +
 +PROC is the current server's process.
 +PARSED is an `erc-parsed' response struct."
 +  (let ((msg (erc-response.contents parsed)))
 +    (when (and erc-capab-identify-activated
 +               (string-match "^\\([-\\+]\\)\\(.+\\)$" msg))
 +      (setf (erc-response.contents parsed)
 +            (if erc-capab-identify-mode
 +                (erc-propertize (match-string 2 msg)
 +                                'erc-identified
 +                                (if (string= (match-string 1 msg) "+")
 +                                    1
 +                                  0))
 +              (match-string 2 msg)))
 +      nil)))
 +
 +(defun erc-capab-identify-add-prefix ()
 +  "Add `erc-capab-identify-prefix' to nickname if user is unidentified."
 +  (when (and erc-capab-identify-prefix
 +             (erc-with-server-buffer erc-capab-identify-activated))
 +    (goto-char (or (erc-find-parsed-property) (point-min)))
 +    (let ((nickname (erc-capab-get-unidentified-nickname
 +                     (erc-get-parsed-vector (point)))))
 +      (when (and nickname
 +                 (goto-char (point-min))
 +                 ;; assuming the first use of `nickname' is the sender's nick
 +                 (re-search-forward (regexp-quote nickname) nil t))
 +        (goto-char (match-beginning 0))
 +        (insert (erc-propertize erc-capab-identify-prefix
 +                                'face (get-char-property (- (point) 1)
 +                                                         'face)))))))
 +
 +(defun erc-capab-get-unidentified-nickname (parsed)
 +  "Return the nickname of the user if unidentified.
 +PARSED is an `erc-parsed' response struct."
 +  (when (and (erc-response-p parsed)
 +             (equal 0 (get-text-property 0 'erc-identified
 +                                     (erc-response.contents parsed))))
 +    (let ((nickuserhost (erc-get-parsed-vector-nick parsed)))
 +      (when nickuserhost
 +       (nth 0 (erc-parse-user nickuserhost))))))
 +
 +(provide 'erc-capab)
 +
 +;; arch-tag: 27b6d668-7ee5-4e47-b9f0-27d7a4362062
 +;;; erc-capab.el ends here
diff --cc erc-compat.el
index 8250252,94ffbaa..bc4af3d
--- a/erc-compat.el
+++ b/erc-compat.el
@@@ -1,9 -1,9 +1,9 @@@
  ;;; erc-compat.el --- ERC compatibility code for XEmacs
  
--;; Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Alex Schroeder <alex@gnu.org>
 -;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
 +;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
  
  ;; This file is part of GNU Emacs.
  
diff --cc erc-dcc.el
index 9d5a8e9,ac8df65..2c906af
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-dcc.el --- CTCP DCC module for ERC
  
- ;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006
 -;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004
++;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
diff --cc erc-ezbounce.el
index ea5afca,e6f359b..f63682c
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-ezbounce.el ---  Handle EZBounce bouncer commands
  
- ;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Andreas Fuchs <asf@void.at>
  ;; Keywords: comm
diff --cc erc-fill.el
index 3305146,f01fb3b..fc1c71b
--- a/erc-fill.el
+++ b/erc-fill.el
@@@ -1,6 -1,6 +1,7 @@@
  ;;; erc-fill.el --- Filling IRC messages in various ways
  
- ;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
++;;   2007 Free Software Foundation, Inc.
  
  ;; Author: Andreas Fuchs <asf@void.at>
  ;;         Mario Lang <mlang@delysid.org>
diff --cc erc-goodies.el
index f6d32ee,dbbdaac..933e6b3
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@@ -1,7 -1,6 +1,7 @@@
  ;; erc-goodies.el --- Collection of ERC modules
  
- ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
 -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
++;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 +;;   Free Software Foundation, Inc.
  
  ;; Author: Jorgen Schaefer <forcer@forcix.cx>
  
diff --cc erc-hecomplete.el
index 85a8156,0000000..e6f91ce
mode 100644,000000..100644
--- a/erc-hecomplete.el
+++ b/erc-hecomplete.el
@@@ -1,225 -1,0 +1,225 @@@
 +;;; erc-hecomplete.el --- Provides Nick name completion for ERC
 +
- ;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 +
 +;; Author: Alex Schroeder <alex@gnu.org>
 +;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
 +
 +;; 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 2, 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.
 +
 +;;; Commentary:
 +
 +;; This file is considered obsolete.  It is recommended to use
 +;; completion from erc-pcomplete instead.
 +
 +;; This file is based on hippie-expand, while the new file is based on
 +;; pcomplete.
 +
 +;;; Code:
 +
 +(require 'erc)
 +(require 'erc-match); for erc-pals
 +(require 'hippie-exp); for the hippie expand stuff
 +
 +;;;###autoload (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t)
 +(define-erc-module hecomplete nil
 +  "Complete nick at point."
 +  ((add-hook 'erc-complete-functions 'erc-hecomplete))
 +  ((remove-hook 'erc-complete-functions 'erc-hecomplete)))
 +
 +(defun erc-hecomplete ()
 +  "Complete nick at point.
 +See `erc-try-complete-nick' for more technical info.
 +This function is obsolete, use `erc-pcomplete' instead."
 +  (interactive)
 +  (let ((hippie-expand-try-functions-list '(erc-try-complete-nick)))
 +    (hippie-expand nil)))
 +
 +(defgroup erc-hecomplete nil
 +  "Nick completion.  It is recommended to use erc-pcomplete instead."
 +  :group 'erc)
 +
 +(defcustom erc-nick-completion 'all
 +  "Determine how the list of nicks is determined during nick completion.
 +See `erc-complete-nick' for information on how to activate this.
 +
 +pals:   Use `erc-pals'.
 +all:    All channel members.
 +
 +You may also provide your own function that returns a list of completions.
 +One example is `erc-nick-completion-exclude-myself',
 +or you may use an arbitrary lisp expression."
 +  :type '(choice (const :tag "List of pals" pals)
 +		 (const :tag "All channel members" all)
 +		 (const :tag "All channel members except yourself"
 +			erc-nick-completion-exclude-myself)
 +		 (repeat :tag "List" (string :tag "Nick"))
 +		 function
 +		 sexp)
 +  :group 'erc-hecomplete)
 +
 +(defcustom erc-nick-completion-ignore-case t
 +  "*Non-nil means don't consider case significant in nick completion.
 +Case will be automatically corrected when non-nil.
 +For instance if you type \"dely TAB\" the word completes and changes to
 +\"delYsid\"."
 +  :group 'erc-hecomplete
 +  :type 'boolean)
 +
 +(defun erc-nick-completion-exclude-myself ()
 +  "Get a list of all the channel members except you.
 +
 +This function returns a list of all the members in the channel, except
 +your own nick.  This way if you're named foo and someone is called foobar,
 +typing \"f o TAB\" will directly give you foobar.  Use this with
 +`erc-nick-completion'."
 +  (remove
 +   (erc-current-nick)
 +   (erc-get-channel-nickname-list)))
 +
 +(defcustom erc-nick-completion-postfix ": "
 +  "*When `erc-complete' is used in the first word after the prompt,
 +add this string when a unique expansion was found."
 +  :group 'erc-hecomplete
 +  :type 'string)
 +
 +(defun erc-command-list ()
 +  "Returns a list of strings of the defined user commands."
 +  (let ((case-fold-search nil))
 +    (mapcar (lambda (x)
 +	      (concat "/" (downcase (substring (symbol-name x) 8))))
 +	    (apropos-internal "erc-cmd-[A-Z]+"))))
 +
 +(defun erc-try-complete-nick (old)
 +  "Complete nick at point.
 +This is a function to put on `hippie-expand-try-functions-list'.
 +Then use \\[hippie-expand] to expand nicks.
 +The type of completion depends on `erc-nick-completion'."
 +  (cond ((eq erc-nick-completion 'pals)
 +	 (try-complete-erc-nick old erc-pals))
 +	((eq erc-nick-completion 'all)
 +	 (try-complete-erc-nick old (append
 +				     (erc-get-channel-nickname-list)
 +				     (erc-command-list))))
 +	((functionp erc-nick-completion)
 +	 (try-complete-erc-nick old (funcall erc-nick-completion)))
 +	(t
 +	 (try-complete-erc-nick old erc-nick-completion))))
 +
 +(defvar try-complete-erc-nick-window-configuration nil
 +  "The window configuration for `try-complete-erc-nick'.
 +When called the first time, a window config is stored here,
 +and when completion is done, the window config is restored
 +from here.  See `try-complete-erc-nick-restore' and
 +`try-complete-erc-nick'.")
 +
 +(defun try-complete-erc-nick-restore ()
 +  "Restore window configuration."
 +  (if (not try-complete-erc-nick-window-configuration)
 +      (when (get-buffer "*Completions*")
 +	(delete-windows-on "*Completions*"))
 +    (set-window-configuration
 +     try-complete-erc-nick-window-configuration)
 +    (setq try-complete-erc-nick-window-configuration nil)))
 +
 +(defun try-complete-erc-nick (old completions)
 +  "Try to complete current word depending on `erc-try-complete-nick'.
 +The argument OLD has to be nil the first call of this function, and t
 +for subsequent calls (for further possible completions of the same
 +string).  It returns t if a new completion is found, nil otherwise.  The
 +second argument COMPLETIONS is a list of completions to use.  Actually,
 +it is only used when OLD is nil.  It will be copied to `he-expand-list'
 +on the first call.  After that, it is no longer used.
 +Window configurations are stored in
 +`try-complete-erc-nick-window-configuration'."
 +  (let (expansion
 +	final
 +	(alist (if (consp (car completions))
 +		   completions
 +		 (mapcar (lambda (s)
 +			   (if (and (erc-complete-at-prompt)
 +				    (and (not (= (length s) 0))
 +					 (not (eq (elt s 0) ?/))))
 +			       (list (concat s erc-nick-completion-postfix))
 +			     (list (concat s " "))))
 +			 completions))) ; make alist if required
 +	(completion-ignore-case erc-nick-completion-ignore-case))
 +    (he-init-string (he-dabbrev-beg) (point))
 +    ;; If there is a string to complete, complete it using alist.
 +    ;; expansion is the possible expansion, or t.  If expansion is t
 +    ;; or if expansion is the "real" thing, we are finished (final is
 +    ;; t).  Take care -- expansion can also be nil!
 +    (unless (string= he-search-string "")
 +      (setq expansion (try-completion he-search-string alist)
 +	    final (or (eq t expansion)
 +		      (and expansion
 +			   (eq t (try-completion expansion alist))))))
 +    (cond ((not expansion)
 +	   ;; There is no expansion at all.
 +	   (try-complete-erc-nick-restore)
 +	   (he-reset-string)
 +	   nil)
 +	  ((eq t expansion)
 +	   ;; The user already has the correct expansion.
 +	   (try-complete-erc-nick-restore)
 +	   (he-reset-string)
 +	   t)
 +	  ((and old (string= expansion he-search-string))
 +	   ;; This is the second time around and nothing changed,
 +	   ;; ie. the user tried to expand something incomplete
 +	   ;; without making a choice -- hitting TAB twice, for
 +	   ;; example.
 +	   (try-complete-erc-nick-restore)
 +	   (he-reset-string)
 +	   nil)
 +	  (final
 +	   ;; The user has found the correct expansion.
 +	   (try-complete-erc-nick-restore)
 +	   (he-substitute-string expansion)
 +	   t)
 +	  (t
 +	   ;; We found something but we are not finished.  Show a
 +	   ;; completions buffer.  Substitute what we found and return
 +	   ;; t.
 +	   (setq try-complete-erc-nick-window-configuration
 +		 (current-window-configuration))
 +	   (with-output-to-temp-buffer "*Completions*"
 +	     (display-completion-list (all-completions he-search-string alist)))
 +	   (he-substitute-string expansion)
 +	   t))))
 +
 +(defun erc-at-beginning-of-line-p (point &optional bol-func)
 +  (save-excursion
 +    (funcall (or bol-func
 +		 'erc-bol))
 +    (equal point (point))))
 +
 +(defun erc-complete-at-prompt ()
 +  "Returns t if point is directly after `erc-prompt' when doing completion."
 +  (erc-at-beginning-of-line-p (he-dabbrev-beg)))
 +
 +(provide 'erc-hecomplete)
 +
 +;;; erc-hecomplete.el ends here
 +;;
 +;; Local Variables:
 +;; indent-tabs-mode: t
 +;; tab-width: 8
 +;; End:
 +
 +;; arch-tag: 3be13ee8-8fdb-41ab-83c2-6582c757b91e
diff --cc erc-ibuffer.el
index 108ed71,f1a1f83..25ad131
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-ibuffer.el --- ibuffer integration with ERC
  
- ;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: comm
diff --cc erc-identd.el
index 3bac6fa,5cb179c..1eef505
--- a/erc-identd.el
+++ b/erc-identd.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-identd.el --- RFC1413 (identd authentication protocol) server
  
- ;; Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2003 Free Software Foundation, Inc.
++;; Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: John Wiegley <johnw@gnu.org>
  ;; Keywords: comm, processes
diff --cc erc-imenu.el
index e897a9d,cdb1745..5e00518
--- a/erc-imenu.el
+++ b/erc-imenu.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-imenu.el -- Imenu support for ERC
  
- ;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: comm
diff --cc erc-join.el
index 86b79c5,0000000..fb59cd9
mode 100644,000000..100644
--- a/erc-join.el
+++ b/erc-join.el
@@@ -1,139 -1,0 +1,139 @@@
 +;;; erc-join.el --- autojoin channels on connect and reconnects
 +
- ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 +
 +;; Author: Alex Schroeder <alex@gnu.org>
 +;; Keywords: irc
 +;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin
 +
 +;; 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 2, 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.
 +
 +;;; Commentary:
 +
 +;; This allows us to customize an `erc-autojoin-channels-alist'.  As
 +;; we /JOIN and /PART channels, this alist is updated to reflect our
 +;; current setup, so that when we reconnect, we rejoin the same
 +;; channels.  The alist can be customized, so that the customized
 +;; value will be used when we reconnect in our next Emacs session.
 +
 +;;; Code:
 +
 +(require 'erc)
 +(eval-when-compile (require 'cl))
 +
 +(defgroup erc-autojoin nil
 +  "Enable autojoining."
 +  :group 'erc)
 +
 +;;;###autoload (autoload 'erc-autojoin-mode "erc-join" nil t)
 +(define-erc-module autojoin nil
 +  "Makes ERC autojoin on connects and reconnects."
 +  ((add-hook 'erc-after-connect 'erc-autojoin-channels)
 +   (add-hook 'erc-server-JOIN-functions 'erc-autojoin-add)
 +   (add-hook 'erc-server-PART-functions 'erc-autojoin-remove))
 +  ((remove-hook 'erc-after-connect 'erc-autojoin-channels)
 +   (remove-hook 'erc-server-JOIN-functions 'erc-autojoin-add)
 +   (remove-hook 'erc-server-PART-functions 'erc-autojoin-remove)))
 +
 +(defcustom erc-autojoin-channels-alist nil
 +  "Alist of channels to autojoin on IRC networks.
 +Every element in the alist has the form (SERVER . CHANNELS).
 +SERVER is a regexp matching the server, and channels is the
 +list of channels to join.
 +
 +Customize this variable to set the value for your first connect.
 +Once you are connected and join and part channels, this alist
 +keeps track of what channels you are on, and will join them
 +again when you get disconnected.  When you restart Emacs, however,
 +those changes are lost, and the customization you saved the last
 +time is used again."
 +  :group 'erc-autojoin
 +  :type '(repeat (cons :tag "Server"
 +		       (regexp :tag "Name")
 +		       (repeat :tag "Channels"
 +			       (string :tag "Name")))))
 +
 +(defcustom erc-autojoin-domain-only t
 +  "Truncate host name to the domain name when joining a server.
 +If non-nil, and a channel on the server a.b.c is joined, then
 +only b.c is used as the server for `erc-autojoin-channels-alist'.
 +This is important for networks that redirect you to other
 +servers, presumably in the same domain."
 +  :group 'erc-autojoin
 +  :type 'boolean)
 +
 +(defun erc-autojoin-channels (server nick)
 +  "Autojoin channels in `erc-autojoin-channels-alist'."
 +  (dolist (l erc-autojoin-channels-alist)
 +    (when (string-match (car l) server)
 +      (dolist (chan (cdr l))
 +	(erc-server-send (concat "join " chan))))))
 +
 +(defun erc-autojoin-add (proc parsed)
 +  "Add the channel being joined to `erc-autojoin-channels-alist'."
 +  (let* ((chnl (erc-response.contents parsed))
 +	 (nick (car (erc-parse-user (erc-response.sender parsed))))
 +	 (server (with-current-buffer (process-buffer proc)
 +		   (or erc-server-announced-name erc-session-server))))
 +    (when (erc-current-nick-p nick)
 +      (when (and erc-autojoin-domain-only
 +		 (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server))
 +	(setq server (match-string 1 server)))
 +      (let ((elem (assoc server erc-autojoin-channels-alist)))
 +	(if elem
 +	    (unless (member chnl (cdr elem))
 +	      (setcdr elem (cons chnl (cdr elem))))
 +	  (setq erc-autojoin-channels-alist
 +		(cons (list server chnl)
 +		      erc-autojoin-channels-alist))))))
 +  ;; We must return nil to tell ERC to continue running the other
 +  ;; functions.
 +  nil)
 +
 +;; (erc-parse-user "kensanata!~user@dclient217-162-233-228.hispeed.ch")
 +
 +(defun erc-autojoin-remove (proc parsed)
 +  "Remove the channel being left from `erc-autojoin-channels-alist'."
 +  (let* ((chnl (car (erc-response.command-args parsed)))
 +	 (nick (car (erc-parse-user (erc-response.sender parsed))))
 +	 (server (with-current-buffer (process-buffer proc)
 +		   (or erc-server-announced-name erc-session-server))))
 +    (when (erc-current-nick-p nick)
 +      (when (and erc-autojoin-domain-only
 +		 (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server))
 +	(setq server (match-string 1 server)))
 +      (let ((elem (assoc server erc-autojoin-channels-alist)))
 +	(when elem
 +	  (setcdr elem (delete chnl (cdr elem)))
 +	  (unless (cdr elem)
 +	    (setq erc-autojoin-channels-alist
 +		  (delete elem erc-autojoin-channels-alist)))))))
 +  ;; We must return nil to tell ERC to continue running the other
 +  ;; functions.
 +  nil)
 +
 +(provide 'erc-join)
 +
 +;;; erc-join.el ends here
 +;;
 +;; Local Variables:
 +;; indent-tabs-mode: t
 +;; tab-width: 8
 +;; End:
 +
 +;; arch-tag: d62d8b15-8e31-49d6-8a73-12f11e717414
diff --cc erc-lang.el
index 04cfbe9,20c89a8..c4d103a
--- a/erc-lang.el
+++ b/erc-lang.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-lang.el --- provide the LANG command to ERC
  
- ;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Alex Schroeder <alex@gnu.org>
  ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --cc erc-log.el
index d3da45f,0f1c0a4..053bb37
--- a/erc-log.el
+++ b/erc-log.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-log.el --- Logging facilities for ERC.
  
- ;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
++;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Lawrence Mitchell <wence@gmx.li>
  ;; Keywords: IRC, chat, client, Internet, logging
diff --cc erc-match.el
index 524474e,a1d1c5a..35ba1b1
--- a/erc-match.el
+++ b/erc-match.el
@@@ -1,6 -1,6 +1,7 @@@
  ;;; erc-match.el --- Highlight messages matching certain regexps
  
- ;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
++;;   2007 Free Software Foundation, Inc.
  
  ;; Author: Andreas Fuchs <asf@void.at>
  ;; Keywords: comm, faces
diff --cc erc-menu.el
index bc6afc9,07e1e10..64cf36c
--- a/erc-menu.el
+++ b/erc-menu.el
@@@ -1,6 -1,6 +1,7 @@@
  ;; erc-menu.el -- Menu-bar definitions for ERC
  
- ;; Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2004, 2005, 2006,
++;;   2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: comm, processes, menu
diff --cc erc-netsplit.el
index 59dd489,c372d61..b4c26b1
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits
  
- ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: comm
diff --cc erc-networks.el
index 267e40c,0000000..4631cea
mode 100644,000000..100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@@ -1,866 -1,0 +1,866 @@@
 +;;; erc-networks.el --- IRC networks
 +
- ;; Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 +
 +;; Author: Mario Lang <mlang@lexx.delysid.org>
 +;; Keywords: comm
 +
 +;; 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 2, 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.
 +
 +;;; Commentary:
 +
 +;; This file deals with IRC networks.
 +;;
 +;; Usage:
 +;;
 +;; Put into your .emacs:
 +;;
 +;; (require 'erc-networks)
 +;;
 +;; M-x erc-server-select provides an alternative way to connect to servers by
 +;; choosing networks.
 +;; You can use (eq (erc-network) 'Network) if you'd like to set variables or do
 +;; certain actions according to which network you're connected to.
 +;; If a network you use is not listed in `erc-networks-alist', you can put
 +;; (add-to-list 'erc-networks-alist '(Network "irc.server-name.net")) in your
 +;; config file.
 +
 +;;; Code:
 +
 +(require 'erc)
 +(eval-when-compile (require 'cl))
 +
 +;; Variables
 +
 +(defgroup erc-networks nil
 +  "IRC Networks"
 +  :group 'erc)
 +
 +(defcustom erc-server-alist
 +'(("4-irc: Random server" 4-irc "4-irc.com" 6667)
 +  ("A5KNet: Random server" A5KNet "irc.a5knet.com" ((6660 6669)))
 +  ("AbleNet: Random server" AbleNet "irc.ablenet.org" 6667)
 +  ("Accessirc: Random server" Accessirc "irc.accessirc.net" 6667)
 +  ("Acestar: Random server" Acestar "irc.acestar.org" 6667)
 +  ("Action-IRC: Random server" Action-IRC "irc.action-irc.net" ((6660 6669)))
 +  ("AfterNET: Random server" AfterNET "irc.afternet.org" 6667)
 +  ("Alternativenet: Random server" Alternativenet "irc.altnet.org" 6667)
 +  ("AmigaNet: Random server" AmigaNet "irc.amiganet.org" 6667)
 +  ("AngelEyez: Random server" AngelEyez "irc.angeleyez.net" ((6666 7000)))
 +  ("AnotherNet: Random server" Anothernet "irc.another.net" (6667 7000 ))
 +  ("ArabChat: Random server" ArabChat "irc.arabchat.org" ((6660 6667)))
 +  ("Ars-OpenIRC: Random server" Ars "irc.arstechnica.com" 6667)
 +  ("AsiaTalk: Random server" AsiaTalk "irc.asiatalk.org" ((6667 6669) 7000 ))
 +  ("AstroLink: Random server" AstroLink "irc.astrolink.org" ((6660 6667)))
 +  ("Asylumnet: Random server" Asylumnet "irc.asylum-net.org" ((6661 6669) 7000 7777 ))
 +  ("Austnet: Random AU server" Austnet "au.austnet.org" 6667)
 +  ("Austnet: Random NZ server" Austnet "nz.austnet.org" 6667)
 +  ("Austnet: Random SG server" Austnet "sg.austnet.org" 6667)
 +  ("Austnet: Random US server" Austnet "us.austnet.org" 6667)
 +  ("AwesomeChat: Random server" AwesomeChat "irc.awesomechat.net" ((6661 6669)))
 +  ("Awesomechristians: Random server" Awesomechristians "irc.awesomechristians.com" 7000)
 +  ("Axenet: Random server" Axenet "irc.axenet.org" ((6660 6667)))
 +  ("BeyondIRC: Random server" Beyondirc "irc.beyondirc.net" ((6660 6669)))
 +  ("BGIRC: Random server" BGIRC "irc.bulgaria.org" ((6666 6669) 7000 ))
 +  ("Blabbernet: Random server" Blabbernet "irc.blabber.net" (6667 7000 ))
 +  ("Blitzed: Random server" Blitzed "irc.blitzed.org" (6667 7000 ))
 +  ("Brasirc: Random server" Brasirc "irc.brasirc.net" ((6666 6667)))
 +  ("Brasirc: BR, PA, Belem" Brasirc "irc.libnet.com.br" ((6666 6668) 7777 8002 ))
 +  ("BRASnet: Random European server" BRASnet "eu.brasnet.org" ((6665 6669)))
 +  ("BRASnet: Random US server" BRASnet "us.brasnet.org" ((6665 6669)))
 +  ("BubbleNet: Random server" BubbleNet "irc.bubblenet.org" ((6667 6669)))
 +  ("CCnet: Random server" CCnet "irc.cchat.net" (6667 7000 ))
 +  ("CCnet: US, TX, Dallas" CCnet "irc2.cchat.net" (6667 7000 ))
 +  ("Chat-Net: Random server" Chat-Net "irc.chat-net.org" 6667)
 +  ("Chat-Solutions: Random server" Chat-Solutions "irc.chat-solutions.org" 6667)
 +  ("Chatcafe: Random server" Chatcafe "irc.chatcafe.net" 6667)
 +  ("Chatchannel: Random server" Chatchannel "irc.chatchannel.org" ((6666 6669) 7000 ))
 +  ("ChatCircuit: Random server" ChatCircuit "irc.chatcircuit.com" 6668)
 +  ("Chatlink: Random server" Chatlink "irc.chatlink.org" 6667)
 +  ("Chatnet: Random AU server" Chatnet "au.chatnet.org" 6667)
 +  ("Chatnet: Random EU server" Chatnet "eu.chatnet.org" 6667)
 +  ("Chatnet: Random US server" Chatnet "us.chatnet.org" 6667)
 +  ("ChatNut: Random server" ChatNut "irc.chatnut.net" (6667 7000 ))
 +  ("Chatpinoy: Random server" Chatpinoy "irc.chatpinoy.com" 6667)
 +  ("ChatPR: Random server" ChatPR "irc.chatpr.org" 6667)
 +  ("Chatroom: Random server" Chatroom "irc.chatroom.org" 6667)
 +  ("Chatster: Random server" Chatster "irc.chatster.org" 6667)
 +  ("ChatX: Random server" ChatX "irc.chatx.net" 6667)
 +  ("China263: Random server" China263 "irc.263.net" 6667)
 +  ("Cineplex1: Random server" Cineplex1 "irc.cineplex1.com" ((6666 6668)))
 +  ("CNN: CNN News discussions" CNN "chat.cnn.com" ((6667 6669) 7000 ))
 +  ("CobraNet: Random server" CobraNet "irc.cobra.net" 6667)
 +  ("Coolchat: Random server" Coolchat "irc.coolchat.net" 6667)
 +  ("Criten: Random server" Criten "irc.criten.net" 6667)
 +  ("Cyberchat: Random server" Cyberchat "irc.cyberchat.org" (6667 6668 ))
 +  ("CyGanet: Random server" CyGanet "irc.cyga.net" 6667)
 +  ("DALnet: AS, MY, Coins" DALnet "coins.dal.net" ((6663 6668) 7000 ))
 +  ("DALnet: CA, ON, Sodre" DALnet "sodre.on.ca.dal.net" ((6661 6669) 7000 ))
 +  ("DALnet: EU, DE, Nexgo" DALnet "nexgo.de.eu.dal.net" ((6664 6669) 7000 ))
 +  ("DALnet: EU, NO, Powertech" DALnet "powertech.no.eu.dal.net" ((6666 6667) 7000 ))
 +  ("DALnet: EU, SE, Borg" DALnet "borg.se.eu.dal.net" (6667 7000 ))
 +  ("DALnet: EU, SE, Ced" DALnet "ced.se.eu.dal.net" (6667 7000 ))
 +  ("DALnet: US, GA, Astro" DALnet "astro.ga.us.dal.net" ((6661 6669) 7000 ))
 +  ("DALnet: US, GA, Dragons" DALnet "dragons.ga.us.dal.net" ((6661 6669) 7000 ))
 +  ("DALnet: US, GA, Elysium" DALnet "elysium.ga.us.dal.net" ((6661 6669) 7000 ))
 +  ("DALnet: US, MA, Twisted" DALnet "twisted.ma.us.dal.net" ((6660 6669) 7001 7002 ))
 +  ("DALnet: US, MO, Global" DALnet "global.mo.us.dal.net" ((6661 6669) 7000 ))
 +  ("DALnet: US, NJ, Liberty" DALnet "liberty.nj.us.dal.net" ((6662 6669) 7000 ))
 +  ("DALnet: US, VA, Wombat" DALnet "wombat.va.us.dal.net" ((6661 6669) 7000 ))
 +  ("DALnet: Random EU server" DALnet "irc.eu.dal.net" 6667)
 +  ("DALnet: Random US server" DALnet "irc.dal.net" ((6660 6667)))
 +  ("Dark-Tou-Net: Random server" Dark-Tou-Net "irc.d-t-net.de" 6667)
 +  ("Darkfire: Random server" Darkfire "irc.darkfire.net" (6667 7000 8000 ))
 +  ("DarkMyst: Random server" DarkMyst "irc.darkmyst.org" 6667)
 +  ("Darkserv: Random server" Darkserv "irc.darkserv.net" 6667)
 +  ("Darksystem: Random server" Darksystem "irc.darksystem.com" 6667)
 +  ("Darktree: Random server" Darktree "irc.darktree.net" 6667)
 +  ("DayNet: Random server" DayNet "irc.daynet.org" 6667)
 +  ("Deepspace: Disability network" Deepspace "irc.deepspace.org" 6667)
 +  ("Different: Random server" Different "irc.different.net" 6667)
 +  ("Digarix: Random server" Digarix "irc.digarix.net" 6667)
 +  ("Digatech: Random server" Digatech "irc.digatech.net" 6667)
 +  ("Digital-Base: Random server" Digital-Base "irc.digital-base.net" ((6660 7000)))
 +  ("Digitalirc: Random server" Digitalirc "irc.digitalirc.net" 6667)
 +  ("Discussioni: Random server" Discussioni "irc.discussioni.org" ((6666 6669)))
 +  ("DorukNet: TR, Istanbul" DorukNet "irc.doruk.net.tr" ((6660 6669) 7000 8888 ))
 +  ("Dreamcast: Random server" Dreamcast "irc0.dreamcast.com" 6667)
 +  ("DWChat: Random server" DWChat "irc.dwchat.net" 6667)
 +  ("Dynastynet: Random server" Dynastynet "irc.dynastynet.net" 6667)
 +  ("EFnet: CA, AB, Edmonton (arcti)" EFnet "irc.arcti.ca" 6667)
 +  ("EFnet: CA, AB, Edmonton (mpls)" EFnet "irc.mpls.ca" ((6660 6669)))
 +  ("EFnet: CA, ON, Toronto" EFnet "irc2.magic.ca" 6667)
 +  ("EFnet: CA, QB, Montreal" EFnet "irc.qeast.net" 6667)
 +  ("EFnet: EU, DK, Aarhus" EFnet "irc.inet.tele.dk" 6667)
 +  ("EFnet: EU, FI, Helsinki" EFnet "efnet.cs.hut.fi" 6667)
 +  ("EFnet: EU, FR, Paris" EFnet "irc.isdnet.fr" ((6667 6669)))
 +  ("EFnet: EU, NL, Amsterdam" EFnet "efnet.vuurwerk.nl" 6667)
 +  ("EFnet: EU, NO, Homelien" EFnet "irc.homelien.no" (5190 (6666 6667) (7000 7001) ))
 +  ("EFnet: EU, NO, Oslo" EFnet "irc.daxnet.no" ((6666 7000)))
 +  ("EFnet: EU, PL, Warszawa" EFnet "irc.efnet.pl" 6667)
 +  ("EFnet: EU, RU, Moscow" EFnet "irc.rt.ru" ((6661 6669)))
 +  ("EFnet: EU, SE, Dalarna" EFnet "irc.du.se" ((6666 6669)))
 +  ("EFnet: EU, SE, Gothenberg" EFnet "irc.hemmet.chalmers.se" ((6666 7000)))
 +  ("EFnet: EU, SE, Sweden" EFnet "irc.light.se" 6667)
 +  ("EFnet: EU, UK, London (carrier)" EFnet "irc.carrier1.net.uk" ((6666 6669)))
 +  ("EFnet: EU, UK, London (demon)" EFnet "efnet.demon.co.uk" ((6665 6669)))
 +  ("EFnet: ME, IL, Inter" EFnet "irc.inter.net.il" ((6665 6669)))
 +  ("EFnet: US, AZ, Phoenix" EFnet "irc.easynews.com" (6660 (6665 6667) 7000 ))
 +  ("EFnet: US, CA, San Jose" EFnet "irc.concentric.net" ((6665 6668)))
 +  ("EFnet: US, CA, San Luis Obispo" EFnet "irc.prison.net" ((6666 6667)))
 +  ("EFnet: US, GA, Atlanta" EFnet "irc.mindspring.com" ((6660 6669)))
 +  ("EFnet: US, MI, Ann Arbor" EFnet "irc.umich.edu" 6667)
 +  ("EFnet: US, MN, Twin Cities" EFnet "irc.umn.edu" ((6665 6669)))
 +  ("EFnet: US, NY, Mineola" EFnet "irc.lightning.net" ((6665 7000)))
 +  ("EFnet: US, NY, New York (east)" EFnet "irc.east.gblx.net" 6667)
 +  ("EFnet: US, NY, New York (flamed)" EFnet "irc.flamed.net" ((6665 6669)))
 +  ("EFnet: US, TX, Houston" EFnet "ircd.lagged.org" ((6660 6669)))
 +  ("EFnet: US, VA, Ashburn" EFnet "irc.secsup.uu.net" ((6665 6669) 8080 ))
 +  ("EFnet: Random AU server" EFnet "au.rr.efnet.net" 6667)
 +  ("EFnet: Random CA server" EFnet "ca.rr.efnet.net" 6667)
 +  ("EFnet: Random EU server" EFnet "eu.rr.efnet.net" 6667)
 +  ("EFnet: Random US server" EFnet "us.rr.efnet.net" 6667)
 +  ("EgyptianIRC: Random server" EgyptianIRC "irc.egyptianirc.net" ((6667 6669)))
 +  ("Eircnet: Random server" Eircnet "irc.eircnet.org" ((6660 6669) 7000 ))
 +  ("Eleethal: Random server" Eleethal "irc.eleethal.com" ((6660 6669) 7000 ))
 +  ("EntertheGame: Random server" EntertheGame "irc.enterthegame.com" ((6667 6669)))
 +  ("EpiKnet: Random server" EpiKnet "irc.epiknet.org" ((6660 6669) 7000 7001 ))
 +  ("EsperNet: Random server" EsperNet "irc.esper.net" (5555 (6667 6669) ))
 +  ("Esprit: Random server" Esprit "irc.esprit.net" 6667)
 +  ("euIRC: Random server" euIRC "irc.euirc.net" ((6665 6669)))
 +  ("Evilzinc: Random server" Evilzinc "irc.evilzinc.net" ((6660 6669) 7000 8000 ))
 +  ("ExodusIRC: Random server" ExodusIRC "irc.exodusirc.net" ((6660 6669)))
 +  ("FDFnet: Random server" FDFnet "irc.fdfnet.net" ((6666 6668) 9999 ))
 +  ("FEFnet: Random server" FEFnet "irc.fef.net" 6667)
 +  ("Financialchat: Random server" Financialchat "irc.financialchat.com" ((6667 6669) 7000 ))
 +  ("Forestnet: Random server" Forestnet "irc.forestnet.org" (6667 7000 ))
 +  ("ForeverChat: Random server" ForeverChat "irc.foreverchat.net" ((6660 6669) 7000 ))
 +  ("Fraggers: Random server" Fraggers "irc.fraggers.co.uk" ((6661 6669) (7000 7001) ))
 +  ("FreedomChat: Random server" FreedomChat "chat.freedomchat.net" 6667)
 +  ("FreedomIRC: Random server" FreedomIRC "irc.freedomirc.net" 6667)
 +  ("Freenode: Random server" freenode "irc.freenode.net" 6667)
 +  ("Freenode: Random EU server" freenode "irc.eu.freenode.net" 6667)
 +  ("Freenode: Random US server" freenode "irc.us.freenode.net" 6667)
 +  ("FunNet: Random server" FunNet "irc.funnet.org" 6667)
 +  ("Galaxynet: Random server" GalaxyNet "irc.galaxynet.org" ((6662 6668) 7000 ))
 +  ("Galaxynet: AU, NZ, Auckland" GalaxyNet "auckland.nz.galaxynet.org" ((6661 6669)))
 +  ("Galaxynet: EU, BE, Online" GalaxyNet "online.be.galaxynet.org" ((6661 6669)))
 +  ("Galaxynet: US, FL, Florida" GalaxyNet "gymnet.us.galaxynet.org" ((6661 6669)))
 +  ("Gamesnet: Random east US server" Gamesnet "east.gamesnet.net" 6667)
 +  ("Gamesnet: Random west US server" Gamesnet "west.gamesnet.net" 6667)
 +  ("GammaForce: Random server" GammaForce "irc.gammaforce.org" ((6660 6669) 7000 ))
 +  ("GIKInet: Random server" GIKInet "irc.giki.edu.pk" 6667)
 +  ("GizNet: Random server" GizNet "irc.giznet.org" ((6666 6669) 7000 ))
 +  ("Globalchat: Random server" Globalchat "irc.globalchat.org" 6667)
 +  ("GlobIRC: Random server" GlobIRC "irc.globirc.net" ((6666 6668) 9999 ))
 +  ("Goldchat: Random server" Goldchat "irc.goldchat.nl" ((6660 6669) 7000 ))
 +  ("Goodchatting: Random server" Goodchatting "irc.goodchatting.com" ((6661 6669) 7000 ))
 +  ("GravityLords: Random server" GravityLords "irc.gravitylords.net" 6667)
 +  ("Grnet: Random EU server" GRnet "gr.irc.gr" (6667 7000 ))
 +  ("Grnet: Random server" GRnet "srv.irc.gr" (6667 7000 ))
 +  ("Grnet: Random US server" GRnet "us.irc.gr" (6667 7000 ))
 +  ("GulfChat: Random server" GulfChat "irc.gulfchat.net" ((6660 6669)))
 +  ("HabberNet: Random server" HabberNet "irc.habber.net" 6667)
 +  ("HanIRC: Random server" HanIRC "irc.hanirc.org" 6667)
 +  ("Hellenicnet: Random server" Hellenicnet "irc.mirc.gr" (6667 7000 ))
 +  ("IceNet: Random server" IceNet "irc.icenet.org.za" 6667)
 +  ("ICQnet: Random server" ICQnet "irc.icq.com" 6667)
 +  ("Infatech: Random server" Infatech "irc.infatech.net" ((6660 6669)))
 +  ("Infinity: Random server" Infinity "irc.infinity-irc.org" 6667)
 +  ("Infomatrix: Random server" Infomatrix "irc.infomatrix.net" 6667)
 +  ("Inside3D: Random server" Inside3D "irc.inside3d.net" ((6661 6669)))
 +  ("InterlinkChat: Random server" InterlinkChat "irc.interlinkchat.net" ((6660 6669) 7000 ))
 +  ("IRC-Chile: Random server" IRC-Chile "irc.cl" 6667)
 +  ("IRC-Hispano: Random server" IRC-Hispano "irc.irc-hispano.org" 6667)
 +  ("IRCchat: Random server" IRCchat "irc.ircchat.tk" 6667)
 +  ("IRCGate: Random server" IRCGate "irc.ircgate.net" ((6667 6669)))
 +  ("IRCGeeks: Random server" IRCGeeks "irc.ircgeeks.org" ((6660 6669)))
 +  ("IRChat: Random server" IRChat "irc.irchat.net" ((6660 6669)))
 +  ("IrcLordz: Random server" IrcLordz "irc.irclordz.com" 6667)
 +  ("IrcMalta: Random server" IrcMalta "irc.ircmalta.org" ((6660 6667)))
 +  ("IRCnet: EU, FR, Random" IRCnet "irc.fr.ircnet.net" 6667)
 +  ("IRCnet: EU, IT, Random" IRCnet "irc.ircd.it" ((6665 6669)))
 +  ("IRCnet: AS, IL, Haifa" IRCnet "ircnet.netvision.net.il" ((6661 6668)))
 +  ("IRCnet: AS, JP, Tokyo" IRCnet "irc.tokyo.wide.ad.jp" 6667)
 +  ("IRCnet: AS, TW, Seed" IRCnet "irc.seed.net.tw" 6667)
 +  ("IRCnet: EU, AT, Linz" IRCnet "linz.irc.at" ((6666 6668)))
 +  ("IRCnet: EU, AT, Wien" IRCnet "vienna.irc.at" ((6666 6669)))
 +  ("IRCnet: EU, BE, Brussels" IRCnet "irc.belnet.be" 6667)
 +  ("IRCnet: EU, BE, Zaventem" IRCnet "ircnet.wanadoo.be" ((6661 6669)))
 +  ("IRCnet: EU, CZ, Prague" IRCnet "irc.felk.cvut.cz" 6667)
 +  ("IRCnet: EU, DE, Berlin" IRCnet "irc.fu-berlin.de" ((6665 6669)))
 +  ("IRCnet: EU, DE, Dusseldorf" IRCnet "irc.freenet.de" ((6665 6669)))
 +  ("IRCnet: EU, DE, Stuttgart" IRCnet "irc.belwue.de" ((6665 6669)))
 +  ("IRCnet: EU, DK, Copenhagen" IRCnet "irc.ircnet.dk" 6667)
 +  ("IRCnet: EU, EE, Tallinn" IRCnet "irc.estpak.ee" ((6666 6668)))
 +  ("IRCnet: EU, FI, Helsinki" IRCnet "irc.cs.hut.fi" 6667)
 +  ("IRCnet: EU, GR, Thessaloniki" IRCnet "irc.ee.auth.gr" ((6666 6669)))
 +  ("IRCnet: EU, HU, Budapest" IRCnet "irc.elte.hu" 6667)
 +  ("IRCnet: EU, IS, Reykjavik (ircnet)" IRCnet "irc.ircnet.is" ((6661 6669)))
 +  ("IRCnet: EU, IS, Reykjavik (simnet)" IRCnet "irc.simnet.is" ((6661 6669)))
 +  ("IRCnet: EU, IT, Rome" IRCnet "irc.tin.it" ((6665 6669)))
 +  ("IRCnet: EU, NL, Amsterdam (nlnet)" IRCnet "irc.nl.uu.net" ((6660 6669)))
 +  ("IRCnet: EU, NL, Amsterdam (xs4all)" IRCnet "irc.xs4all.nl" ((6660 6669)))
 +  ("IRCnet: EU, NL, Enschede" IRCnet "irc.snt.utwente.nl" ((6660 6669)))
 +  ("IRCnet: EU, NL, Nijmegen" IRCnet "irc.sci.kun.nl" ((6660 6669)))
 +  ("IRCnet: EU, NO, Oslo" IRCnet "irc.ifi.uio.no" 6667)
 +  ("IRCnet: EU, NO, Trondheim" IRCnet "irc.pvv.ntnu.no" 6667)
 +  ("IRCnet: EU, PL, Lublin" IRCnet "lublin.irc.pl" ((6666 6668)))
 +  ("IRCnet: EU, PL, Warsaw" IRCnet "warszawa.irc.pl" ((6666 6668)))
 +  ("IRCnet: EU, RU, Moscow" IRCnet "irc.msu.ru" 6667)
 +  ("IRCnet: EU, SE, Lulea" IRCnet "irc.ludd.luth.se" ((6661 6669)))
 +  ("IRCnet: EU, UK, London (Demon)" IRCnet "ircnet.demon.co.uk" ((6665 6669)))
 +  ("IRCnet: EU, UK, London (Easynet)" IRCnet "ircnet.easynet.co.uk" ((6666 6669)))
 +  ("IRCnet: US, NY, New York" IRCnet "irc.stealth.net" ((6660 6669)))
 +  ("IRCnet: Random AU server" IRCnet "au.ircnet.org" 6667)
 +  ("IRCnet: Random EU server" IRCnet "eu.ircnet.org" ((6665 6668)))
 +  ("IRCnet: Random US server" IRCnet "us.ircnet.org" ((6665 6668)))
 +  ("IRCSoulZ: Random server" IRCSoulZ "irc.ircsoulz.net" 6667)
 +  ("IRCSul: BR, PR, Maringa" IRCSul "irc.wnet.com.br" 6667)
 +  ("IrcTalk: Random server" IrcTalk "irc.irctalk.net" ((6660 6669)))
 +  ("Irctoo: Random server" Irctoo "irc.irctoo.net" 6667)
 +  ("IRCtown: Random server" IRCtown "irc.irctown.net" ((6666 6669) 7000 ))
 +  ("IRCworld: Random server" IRCworld "irc.ircworld.org" 6667)
 +  ("ircXtreme: Random server" ircXtreme "irc.ircXtreme.net" ((6660 6669)))
 +  ("Israelnet: Random server" Israelnet "irc.israel.net" 6667)
 +  ("K0wNet: Random server" K0wNet "irc.k0w.net" ((6660 6669)))
 +  ("KDFSnet: Random server" KDFSnet "irc.kdfs.net" ((6667 6669)))
 +  ("Kemik: Random server" Kemik "irc.kemik.net" 6667)
 +  ("Kewl.Org: Random server" Kewl\.Org "irc.kewl.org" (6667 7000 ))
 +  ("Kickchat: Random server" Kickchat "irc.kickchat.com" ((6660 6669) 7000 ))
 +  ("Kidsworld: Random server" KidsWorld "irc.kidsworld.org" ((6666 6669)))
 +  ("Knightnet: AF, ZA, Durban" Knightnet "orc.dbn.za.knightnet.net" (6667 5555 ))
 +  ("Knightnet: US, CA, Goldengate" Knightnet "goldengate.ca.us.knightnet.net" (6667 5555 ))
 +  ("Konfido.Net: Random server" Konfido\.Net "irc.konfido.net" 6667)
 +  ("KreyNet: Random server" Kreynet "irc.krey.net" 6667)
 +  ("Krono: Random server" Krono "irc.krono.net" ((6660 6669) 7000 ))
 +  ("Krushnet: Random server" Krushnet "irc.krushnet.org" 6667)
 +  ("LagNet: Random server" LagNet "irc.lagnet.org.za" 6667)
 +  ("LagNet: AF, ZA, Cape Town" LagNet "reaper.lagnet.org.za" 6667)
 +  ("LagNet: AF, ZA, Johannesburg" LagNet "mystery.lagnet.org.za" 6667)
 +  ("Librenet: Random server" Librenet "irc.librenet.net" 6667)
 +  ("LinkNet: Random server" LinkNet "irc.link-net.org" ((6667 6669)))
 +  ("LinuxChix: Random server" LinuxChix "irc.linuxchix.org" 6667)
 +  ("Liquidized: Random server" Liquidized "irc.liquidized.net" (6667 7000 ))
 +  ("M-IRC: Random server" M-IRC "irc.m-sys.org" ((6667 6669)))
 +  ("MagicStar: Random server" MagicStar "irc.magicstar.net" 6667)
 +  ("Mavra: Random server" Mavra "irc.mavra.net" 6667)
 +  ("MediaDriven: Random server" MediaDriven "irc.mediadriven.com" ((6667 6669)))
 +  ("mIRC-X: Random server" mIRC-X "irc.mircx.com" (6667 7000 ))
 +  ("Morat: Random server" Morat "irc.morat.net" 6667)
 +  ("MusicCity: Random server" MusicCity "chat.musiccity.com" 6667)
 +  ("Mysteria: Random server" Mysteria "irc.mysteria.net" (6667 7000 ))
 +  ("Mysterychat: Random server" Mysterychat "irc.mysterychat.net" ((6667 6669)))
 +  ("Mystical: Random server" Mystical "irc.mystical.net" (6667 7000 ))
 +  ("Narancs: Random server" Narancs "irc.narancs.com" ((6667 6669) 7000 ))
 +  ("Net-France: Random server" Net-France "irc.net-france.com" 6667)
 +  ("Nevernet: Random server" Nevernet "irc.nevernet.net" 6667)
 +  ("Newnet: Random server" Newnet "irc.newnet.net" ((6665 6667)))
 +  ("Nexusirc: Random server" Nexusirc "irc.nexusirc.org" 6667)
 +  ("Nightstar: Random server" NightStar "irc.nightstar.net" ((6665 6669)))
 +  ("NitrousNet: Random server" NitrousNet "irc.nitrousnet.net" 6667)
 +  ("Novernet: Random server" Novernet "irc.novernet.com" ((6665 6669) 7000 ))
 +  ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 ))
 +  ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667)
 +  ("OFTC: Random server" OFTC "irc.oftc.net" ((6667 6670) 7000))
 +  ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669)))
 +  ("Othernet: Random server" Othernet "irc.othernet.org" 6667)
 +  ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667)
 +  ("Othernet: US, MO, StLouis" Othernet "stlouis.mo.us.othernet.org" 6667)
 +  ("Otherside: Random server" OtherSide "irc.othersideirc.net" 6667)
 +  ("Outsiderz: Random server" Outsiderz "irc.outsiderz.com" 6667)
 +  ("OzOrg: AU, Perth" OzOrg "iinet.perth.oz.org" 6667)
 +  ("Peacefulhaven: Random server" Peacefulhaven "irc.peacefulhaven.net" ((6660 6669) 7000 ))
 +  ("PhazedIRC: Random server" PhazedIRC "irc.phazedirc.net" 6667)
 +  ("Philchat: Random server" Philchat "irc.philchat.net" 6667)
 +  ("phrozN: Random server" phrozN "irc.phrozn.net" 6667)
 +  ("PiNet: Random server" PiNet "irc.praetorians.org" ((6665 6669)))
 +  ("Pinoycentral: Random server" Pinoycentral "chat.abs-cbn.com" 6667)
 +  ("Planetarion: Random server" Planetarion "irc.planetarion.com" 6667)
 +  ("POLNet: Random server" POLNet "irc.ircnet.pl" 6667)
 +  ("Psionics: CA, PQ, Montreal" Psionics "chat.psionics.net" ((6660 6669)))
 +  ("PTirc: Random server" PTirc "irc.ptirc.com.pt" 6667)
 +  ("PTlink: Random server" PTlink "irc.ptlink.net" 6667)
 +  ("PTnet: Random server" PTnet "irc.ptnet.org" 6667)
 +  ("QChat: Random server" QChat "irc.qchat.net" 6667)
 +  ("QuakeNet: Random German server" QuakeNet "de.quakenet.org" ((6667 6669)))
 +  ("QuakeNet: Random server" QuakeNet "irc.quakenet.eu.org" ((6667 6669)))
 +  ("QuakeNet: Random Swedish server" QuakeNet "se.quakenet.org" ((6667 6669)))
 +  ("QuakeNet: Random UK server" QuakeNet "uk.quakenet.org" ((6667 6669)))
 +  ("QuakeNet: Random US server" QuakeNet "us.quakenet.org" ((6667 6669)))
 +  ("Realirc: Random server" Realirc "irc.realirc.org" 6667)
 +  ("RealmNET: Random server" RealmNET "irc.realmnet.com" 6667)
 +  ("Rebelchat: Random server" Rebelchat "irc.rebelchat.org" 6667)
 +  ("Red-Latina: Random server" Red-Latina "irc.red-latina.org" 6667)
 +  ("RedLatona: Random server" RedLatona "irc.redlatona.net" (6667 6668 ))
 +  ("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)))
 +  ("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) ))
 +  ("Rusnet: EU, UA, Kiev" Rusnet "irc.kar.net" ((6667 6669) (7770 7775) ))
 +  ("Sandnet: Random server" Sandnet "irc.sandnet.net" ((6660 6669) 7000 ))
 +  ("Scunc: Random server" Scunc "irc.scunc.net" 6667)
 +  ("SerbianCafe: Random server" SerbianCafe "irc.serbiancafe.ws" ((6665 6669)))
 +  ("SexNet: Random server" SexNet "irc.sexnet.org" 6667)
 +  ("ShadowFire: Random server" ShadowFire "irc.shadowfire.org" 6667)
 +  ("ShadowWorld: Random server" ShadowWorld "irc.shadowworld.net" 6667)
 +  ("SkyNet: Random server" SkyNet "irc.bronowski.pl" ((6666 6668)))
 +  ("Slashnet: Random server" Slashnet "irc.slashnet.org" 6667)
 +  ("SolarStone: Random server" SolarStone "irc.solarstone.net" ((6660 6669)))
 +  ("Sorcerynet: Random server" Sorcery "irc.sorcery.net" (6667 7000 9000 ))
 +  ("Sorcerynet: EU, SE, Karlskrona" Sorcery "nexus.sorcery.net" (6667 7000 9000 ))
 +  ("Sorcerynet: US, CA, Palo Alto" Sorcery "kechara.sorcery.net" (6667 7000 9000 ))
 +  ("SourceIRC: Random server" SourceIRC "irc.sourceirc.net" ((6667 6669) 7000 ))
 +  ("SpaceTronix: Random server" SpaceTronix "irc.spacetronix.net" ((6660 6669) 7000 ))
 +  ("Spirit-Harmony: Random server" Spirit-Harmony "irc.spirit-harmony.com" ((6661 6669)))
 +  ("StarChat: Random server" StarChat "irc.starchat.net" ((6667 6669) 7000 ))
 +  ("StarEquinox: Random server" StarEquinox "irc.starequinox.net" ((6660 6669)))
 +  ("StarLink: Random server" Starlink "irc.starlink.net" ((6660 6669)))
 +  ("StarLink-irc: Random server" starlink-irc "irc.starlink-irc.org" 6667)
 +  ("StarWars-IRC: Random server" StarWars-IRC "irc.starwars-irc.net" ((6663 6667)))
 +  ("Stormdancing: Random server" Stormdancing "irc.stormdancing.net" ((6664 6669) 7000 9000 ))
 +  ("Superchat: Random server" Superchat "irc.superchat.org" ((6660 6668)))
 +  ("Sysopnet: Random server" Sysopnet "irc.sysopnet.org" ((6666 6668)))
 +  ("Telstra: Random server" Telstra "irc.telstra.com" ((6667 6669)))
 +  ("TR-net: EU, TR, Ankara" TR-net "irc.dominet.com.tr" 6667)
 +  ("TR-net: EU, Tr, Istanbul" TR-net "irc.teklan.com.tr" 6667)
 +  ("Tri-net: Random server" Tri-net "irc.tri-net.org" 6667)
 +  ("TriLink: Random server" TriLink "irc.ft4u.net" 6667)
 +  ("TurkishChat: Random server" TurkishChat "irc.turkishchat.org" ((6660 6669) 7000 ))
 +  ("UberNinja: Random server" UberNinja "irc.uberninja.net" ((6667 6669)))
 +  ("UICN: Random server" UICN "irc.uicn.net" 6667)
 +  ("UltraIRC: Random server" UltraIRC "irc.ultrairc.net" 6667)
 +  ("UnderChat: Random server" UnderChat "irc.underchat.it" ((6660 6669) 7000 ))
 +  ("Undernet: CA, ON, Toronto" Undernet "toronto.on.ca.undernet.org" ((6661 6669)))
 +  ("Undernet: CA, QC, Montreal" Undernet "montreal.qu.ca.undernet.org" ((6660 6669)))
 +  ("Undernet: EU, AT, Graz" Undernet "graz.at.eu.undernet.org" ((6661 6669)))
 +  ("Undernet: EU, BE, Antwerp" Undernet "flanders.be.eu.undernet.org" ((6660 6669)))
 +  ("Undernet: EU, BE, Brussels" Undernet "brussels.be.eu.undernet.org" 6667)
 +  ("Undernet: EU, CH, Geneva" Undernet "geneva.ch.eu.undernet.org" ((6660 6669) 7777 8000 ))
 +  ("Undernet: EU, FR, Caen" Undernet "caen.fr.eu.undernet.org" ((6666 6669)))
 +  ("Undernet: EU, NL, Diemen" Undernet "diemen.nl.eu.undernet.org" ((6660 6669)))
 +  ("Undernet: EU, NL, Haarlem" Undernet "haarlem.nl.eu.undernet.org" ((6660 6669)))
 +  ("Undernet: EU, NO, Oslo" Undernet "oslo.no.eu.undernet.org" ((6660 6669)))
 +  ("Undernet: EU, SE, Stockholm" Undernet "stockholm.se.eu.undernet.org" ((6666 6669)))
 +  ("Undernet: EU, UK, Surrey" Undernet "surrey.uk.eu.undernet.org" ((6660 6669)))
 +  ("Undernet: US, AZ, Mesa" Undernet "mesa.az.us.undernet.org" ((6665 6667)))
 +  ("Undernet: US, CA, San Diego" Undernet "sandiego.ca.us.undernet.org" ((6660 6670)))
 +  ("Undernet: US, DC, Washington" Undernet "washington.dc.us.undernet.org" ((6660 6669)))
 +  ("Undernet: US, KS, Manhattan" Undernet "manhattan.ks.us.undernet.org" ((6660 6669)))
 +  ("Undernet: US, NV, Las Vegas" Undernet "lasvegas.nv.us.undernet.org" ((6660 6669)))
 +  ("Undernet: US, TX, Austin" Undernet "austin.tx.us.undernet.org" ((6660 6669)))
 +  ("Undernet: US, UT, Saltlake" Undernet "saltlake.ut.us.undernet.org" ((6660 6669)))
 +  ("Undernet: US, VA, Arlington" Undernet "arlington.va.us.undernet.org" ((6660 6669)))
 +  ("Undernet: US, VA, McLean" Undernet "mclean.va.us.undernet.org" ((6666 6669)))
 +  ("Undernet: Random EU server" Undernet "eu.undernet.org" 6667)
 +  ("Undernet: Random US server" Undernet "us.undernet.org" 6667)
 +  ("UnderZ: Random server" UnderZ "irc.underz.org" ((6667 6668)))
 +  ("UniChat: Random server" UniChat "irc.uni-chat.net" 6667)
 +  ("UnionLatina: Random server" UnionLatina "irc.unionlatina.org" 6667)
 +  ("Univers: Random server" Univers "irc.univers.org" ((6665 6669)))
 +  ("UnixR: Random server" UnixR "irc.unixr.net" ((6667 6669)))
 +  ("Vidgamechat: Random server" Vidgamechat "irc.vidgamechat.com" 6667)
 +  ("VirtuaNet: Random server" VirtuaNet "irc.virtuanet.org" ((6660 6669) 7000 ))
 +  ("Vitamina: Random server" Vitamina "irc.vitamina.ca" 6667)
 +  ("Voila: Random server" Voila "irc.voila.fr" 6667)
 +  ("Wahou: Random server" Wahou "irc.wahou.org" ((6665 6669)))
 +  ("Warpednet: Random server" Warpednet "irc.warped.net" 6667)
 +  ("Weaklinks: Random server" Weaklinks "irc.weaklinks.net" ((6667 6669)))
 +  ("Webnet: Random server" Webnet "irc.webchat.org" ((6667 6669) 7000 ))
 +  ("Webnet: US, CA, Santa Clara" Webnet "webmaster.ca.us.webchat.org" ((6661 6669)))
 +  ("WinChat: Random server" WinChat "irc.winchat.net" ((6661 6669)))
 +  ("WinIRC: Random server" WinIRC "irc.winirc.org" ((6667 6669) 4400 ))
 +  ("WorldIRC: Random server" WorldIRC "irc.worldirc.org" ((6660 6667)))
 +  ("WyldRyde: Random server" WyldRyde "irc.wyldryde.net" ((6666 6669)))
 +  ("XentoniX: Random server" XentoniX "irc.xentonix.net" ((6661 6669)))
 +  ("Xevion: Random server" Xevion "irc.xevion.net" (6667 7000 ))
 +  ("XNet: Random server" XNet "irc.xnet.org" 6667)
 +  ("XWorld: Random server" XWorld "irc.xworld.org" 6667)
 +  ("ZAnet Net: Random server" ZAnetNet "irc.zanet.net" 6667)
 +  ("ZAnet Org: UK, London" ZAnetOrg "mystic.zanet.org.za" 6667)
 +  ("ZiRC: Random server" ZiRC "irc.zirc.org" ((6660 6669)))
 +  ("ZUHnet: Random server" ZUHnet "irc.zuh.net" 6667)
 +  ("Zurna: Random server" Zurna "irc.zurna.net" 6667))
 +  "Alist of irc servers. (NAME NET HOST PORTS) where
 +NAME is a name for that server,
 +NET is a symbol indicating to which network from `erc-networks-alist' this
 +  server corresponds,
 +HOST is the servers hostname and
 +PORTS is either a number, a list of numbers, or a list of port ranges."
 +  :group 'erc-networks
 +  :type 'sexp)
 +
 +(defcustom erc-networks-alist
 +  '((4-irc "4-irc.com")
 +    (A5KNet "a5knet.com")
 +    (AbleNet "ablenet.org")
 +    (Accessirc "accessirc.net")
 +    (Acestar "acestar.org")
 +    (Action-IRC "action-irc.net")
 +    (AfterNET "afternet.org")
 +    (Alternativenet "altnet.org")
 +    (AmigaNet "amiganet.org")
 +    (AngelEyez "angeleyez.net")
 +    (Anothernet "another.net")
 +    (ArabChat "arabchat.org")
 +    (Ars "arstechnica.com")
 +    (AsiaTalk "asiatalk.org")
 +    (AstroLink "astrolink.org")
 +    (Asylumnet "asylumnet.org")
 +    (Austnet "austnet.org")
 +    (AwesomeChat "awesomechat.net")
 +    (Awesomechristians "awesomechristians.com")
 +    (Axenet "axenet.org")
 +    (Beyondirc "beyondirc.net")
 +    (BGIRC "bulgaria.org")
 +    (Blabbernet "blabber.net")
 +    (Blitzed "blitzed.org")
 +    (BrasIRC "brasirc.net")
 +    (BRASnet "brasnet.org")
 +    (BubbleNet "bubblenet.org")
 +    (CCnet "christian-chat.net")
 +    (Chat-Net "chat-net.org")
 +    (Chat-Solutions "chat-solutions.org")
 +    (Chatcafe "chatcafe.net")
 +    (Chatchannel "chatchannel.org")
 +    (ChatCircuit "chatcircuit.com")
 +    (Chatlink "chatlink.org")
 +    (Chatnet "chatnet.org")
 +    (ChatNut "chatnut.net")
 +    (Chatpinoy "chatpinoy.com")
 +    (ChatPR "chatpr.org")
 +    (Chatroom "chatroom.org")
 +    (Chatster "chatster.org")
 +    (ChatX "chatx.net")
 +    (China263 "263.net")
 +    (Cineplex1 "cineplex1.com")
 +    (CNN "cnn.com")
 +    (CobraNet "cobra.net")
 +    (Coolchat "coolchat.net")
 +    (Criten "criten.net")
 +    (Cyberchat "cyberchat.org")
 +    (CyGanet "cyga.net")
 +    (DALnet "dal.net")
 +    (Dark-Tou-Net "d-t-net.de")
 +    (Darkfire "darkfire.net")
 +    (DarkMyst "darkmyst.org")
 +    (Darkserv "darkserv.net")
 +    (Darksystem "darksystem.com")
 +    (Darktree "darktree.net")
 +    (DayNet "daynet.org")
 +    (Deepspace "deepspace.org")
 +    (Different "different.net")
 +    (Digarix "digarix.net")
 +    (Digatech "digatech.net")
 +    (Digital-Base "digital-base.net")
 +    (Digitalirc "digitalirc.net")
 +    (Discussioni "discussioni.org")
 +    (DorukNet "doruk.net.tr")
 +    (DWChat "dwchat.net")
 +    (Dynastynet "dynastynet.net")
 +    (EFnet nil)
 +    (EgyptianIRC "egyptianirc.net")
 +    (Eircnet "eircnet.org")
 +    (Eleethal "eleethal.com")
 +    (EntertheGame "enterthegame.com")
 +    (EpiKnet "epiknet.org")
 +    (EsperNet "esper.net")
 +    (Esprit "esprit.net")
 +    (euIRC "euirc.net")
 +    (Evilzinc "evilzinc.net")
 +    (ExodusIRC "exodusirc.net")
 +    (FDFnet "fdfnet.net")
 +    (FEFnet "fef.net")
 +    (Financialchat "financialchat.com")
 +    (Forestnet "forestnet.org")
 +    (ForeverChat "foreverchat.net")
 +    (Fraggers "fraggers.co.uk")
 +    (FreedomChat "freedomchat.net")
 +    (FreedomIRC "freedomirc.net")
 +    (freenode "freenode.net")
 +    (FunNet "funnet.org")
 +    (GalaxyNet "galaxynet.org")
 +    (Gamesnet "gamesnet.net")
 +    (GammaForce "gammaforce.org")
 +    (GIKInet "giki.edu.pk")
 +    (GizNet "giznet.org")
 +    (Globalchat "globalchat.org")
 +    (GlobIRC "globirc.net")
 +    (Goldchat "goldchat.nl")
 +    (Goodchatting "goodchatting.com")
 +    (GravityLords "gravitylords.net")
 +    (GRnet "irc.gr")
 +    (GulfChat "gulfchat.net")
 +    (HabberNet "habber.net")
 +    (HanIRC "hanirc.org")
 +    (Hellenicnet "mirc.gr")
 +    (IceNet "icenet.org.za")
 +    (ICQnet "icq.com")
 +    (iip "anon.iip")
 +    (Infatech "infatech.net")
 +    (Infinity "infinity-irc.org")
 +    (Infomatrix "infomatrix.net")
 +    (Inside3D "inside3d.net")
 +    (InterlinkChat "interlinkchat.net")
 +    (IRC-Chile "irc.cl")
 +    (IRC-Hispano "irc-hispano.org")
 +    (IRCchat "ircchat.tk")
 +    (IRCGate "ircgate.net")
 +    (IRCGeeks "ircgeeks.org")
 +    (IRChat "irchat.net")
 +    (IrcLordz "irclordz.com")
 +    (IrcMalta "ircmalta.org")
 +    (IRCnet nil)
 +    (IRCSoulZ "ircsoulz.net")
 +    (IRCSul "wnet.com.br")
 +    (IrcTalk "irctalk.net")
 +    (Irctoo "irctoo.net")
 +    (IRCtown "irc.irctown.net")
 +    (IRCworld "ircworld.org")
 +    (ircXtreme "ircXtreme.net")
 +    (Israelnet "israel.net")
 +    (K0wNet "k0w.net")
 +    (KDFSnet "kdfs.net")
 +    (Kemik "kemik.net")
 +    (Kewl\.Org "kewl.org")
 +    (Kickchat "kickchat.com")
 +    (KidsWorld "kidsworld.org")
 +    (Knightnet "knightnet.net")
 +    (Konfido\.Net "konfido.net")
 +    (Kreynet "krey.net")
 +    (Krono "krono.net")
 +    (Krushnet "krushnet.org")
 +    (LagNet "lagnet.org.za")
 +    (Librenet "librenet.net")
 +    (LinkNet "link-net.org")
 +    (LinuxChix "cats\.meow\.at\\|linuxchix\.org")
 +    (Liquidized "liquidized.net")
 +    (M-IRC "m-sys.org")
 +    (MagicStar "magicstar.net")
 +    (Mavra "mavra.net")
 +    (MediaDriven "mediadriven.com")
 +    (mIRC-X "mircx.com")
 +    (Morat "morat.net")
 +    (MusicCity "musiccity.com")
 +    (Mysteria "mysteria.net")
 +    (Mysterychat "mysterychat.net")
 +    (Mystical "mystical.net")
 +    (Narancs "narancs.com")
 +    (Net-France "net-france.com")
 +    (Nevernet "nevernet.net")
 +    (Newnet "newnet.net")
 +    (Nexusirc "nexusirc.org")
 +    (NightStar "nightstar.net")
 +    (NitrousNet "nitrousnet.net")
 +    (Novernet "novernet.com")
 +    (Nullrouted "nullrouted.org")
 +    (NullusNet "nullus.net")
 +    (OFTC "oftc.net")
 +    (OpChat "opchat.org")
 +    (Openprojects "openprojects.net")
 +    (Othernet "othernet.org")
 +    (OtherSide "othersideirc.net")
 +    (Outsiderz "outsiderz.com")
 +    (OzOrg "oz.org")
 +    (Peacefulhaven "peacefulhaven.net")
 +    (PhazedIRC "phazedirc.net")
 +    (Philchat "philchat.net")
 +    (phrozN "phrozn.net")
 +    (PiNet "praetorians.org")
 +    (Pinoycentral "abs-cbn.com")
 +    (Planetarion "planetarion.com")
 +    (POLNet "ircnet.pl")
 +    (Psionics "psionics.net")
 +    (PTirc "ptirc.com.pt")
 +    (PTlink "ptlink.net")
 +    (PTnet "ptnet.org")
 +    (QChat "qchat.net")
 +    (QuakeNet "quakenet.org")
 +    (Realirc "realirc.org")
 +    (RealmNET "realmnet.com")
 +    (Rebelchat "rebelchat.org")
 +    (Red-Latina "red-latina.org")
 +    (RedLatona "redlatona.net")
 +    (Relicnet "relic.net")
 +    (Rezosup "rezosup.org")
 +    (Risanet "risanet.com")
 +    (Rubiks "rubiks.net")
 +    (Rusnet "nil")
 +    (Sandnet "sandnet.net")
 +    (Scunc "scunc.net")
 +    (SerbianCafe "serbiancafe.ws")
 +    (SexNet "sexnet.org")
 +    (ShadowFire "shadowfire.org")
 +    (ShadowWorld "shadowworld.net")
 +    (SkyNet "bronowski.pl")
 +    (SlashNET "slashnet.org")
 +    (SolarStone "solarstone.net")
 +    (Sorcery "sorcery.net")
 +    (SourceIRC "sourceirc.net")
 +    (SpaceTronix "spacetronix.net")
 +    (Spirit-Harmony "spirit-harmony.com")
 +    (StarChat "starchat.net")
 +    (StarEquinox "starequinox.net")
 +    (Starlink "starlink.net")
 +    (starlink-irc "starlink-irc.org")
 +    (StarWars-IRC "starwars-irc.net")
 +    (Stormdancing "stormdancing.net")
 +    (Superchat "superchat.org")
 +    (Sysopnet "sysopnet.org")
 +    (Telstra "telstra.com")
 +    (TR-net "dominet.com.tr")
 +    (Tri-net "tri-net.org")
 +    (TriLink "ft4u.net")
 +    (TurkishChat "turkishchat.org")
 +    (UberNinja "uberninja.net")
 +    (UICN "uicn.net")
 +    (UltraIRC "ultrairc.net")
 +    (UnderChat "underchat.it")
 +    (Undernet "undernet.org")
 +    (UnderZ "underz.org")
 +    (UniChat "irc.uni-chat.net")
 +    (UnionLatina "unionlatina.org")
 +    (Univers "univers.org")
 +    (UnixR "unixr.net")
 +    (Vidgamechat "vidgamechat.com")
 +    (VirtuaNet "virtuanet.org")
 +    (Vitamina "vitamina.ca")
 +    (Voila "voila.fr")
 +    (Wahou "wf-net.org")
 +    (Warpednet "warped.net")
 +    (Weaklinks "weaklinks.net")
 +    (Webnet "webchat.org")
 +    (WinChat "winchat.net")
 +    (WinIRC "winirc.org")
 +    (WorldIRC "worldirc.org")
 +    (WyldRyde "wyldryde.net")
 +    (XentoniX "xentonix.net")
 +    (Xevion "xevion.net")
 +    (XNet "xnet.org")
 +    (XWorld "xworld.org")
 +    (ZAnetNet "zanet.net")
 +    (ZAnetOrg "zanet.org.za")
 +    (ZiRC "zirc.org")
 +    (ZUHnet "zuh.net")
 +    (Zurna "zurna.net"))
 +  "Alist of IRC networks. (NET MATCHER) where
 +NET is a symbol naming that IRC network and
 +MATCHER is used to find a corresponding network to a server while connected to
 +  it. If it is regexp, it's used to match against `erc-server-announced-name'.
 +  It can also be a function (predicate). Then it is executed with the
 +  server buffer as current-buffer."
 +  :group 'erc-networks
 +  :type '(repeat
 +	  (list :tag "Network"
 +		(symbol :tag "Network name")
 +		(choice :tag "Network's common server ending"
 +		 (regexp)
 +		 (const :tag "Network has no common server ending" nil)))))
 +
 +(defvar erc-network nil
 +  "The name of the network you are connected to (a symbol).")
 +(make-variable-buffer-local 'erc-network)
 +
 +;; Functions:
 +
 +;;;###autoload
 +(defun erc-determine-network ()
 +  "Return the name of the network or \"Unknown\" as a symbol.  Use the
 +server parameter NETWORK if provided, otherwise parse the server name and
 +search for a match in `erc-networks-alist'."
 +  ;; The server made it easy for us and told us the name of the NETWORK
 +  (if (assoc "NETWORK" erc-server-parameters)
 +      (intern (cdr (assoc "NETWORK" erc-server-parameters)))
 +    (or
 +     ;; Loop through `erc-networks-alist' looking for a match.
 +     (let ((server (or erc-server-announced-name erc-session-server)))
 +       (loop for (name matcher) in erc-networks-alist
 +	     when (and matcher
 +		       (string-match (concat matcher "\\'") server))
 +	     do (return name)))
 +     'Unknown)))
 +
 +(defun erc-network ()
 +  "Return the value of `erc-network' for the current server."
 +  (erc-with-server-buffer erc-network))
 +
 +(defun erc-current-network ()
 +  "Deprecated.  Use `erc-network' instead.  Return the name of this server's
 +network as a symbol."
 +  (erc-with-server-buffer
 +    (intern (downcase (symbol-name erc-network)))))
 +
 +(erc-make-obsolete 'erc-current-network 'erc-network
 +		   "Obsolete since erc-networks 1.5")
 +
 +(defun erc-network-name ()
 +  "Returns the name of the current network as a string."
 +  (erc-with-server-buffer (symbol-name erc-network)))
 +
 +(defun erc-set-network-name (proc parsed)
 +  "Set `erc-network' to the value returned by `erc-determine-network'."
 +  (unless erc-server-connected
 +    (setq erc-network (erc-determine-network)))
 +  nil)
 +
 +(defun erc-unset-network-name (nick ip reason)
 +  "Set `erc-network' to nil."
 +  (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)
 +
 +(defun erc-ports-list (ports)
 +  "Return a list of PORTS.
 +
 +PORTS should be a list of either:
 +  A number, in which case it is returned a list.
 +  Or a pair of the form (LOW HIGH), in which case, a list of all the
 +  numbers between LOW and HIGH (inclusive) is returned.
 +
 +As an example:
 +  (erc-ports-list '(1)) => (1)
 +  (erc-ports-list '((1 5))) => (1 2 3 4 5)
 +  (erc-ports-list '(1 (3 5))) => (1 3 4 5)"
 +  (let (result)
 +    (dolist (p ports)
 +      (cond ((numberp p)
 +	     (push p result))
 +	    ((listp p)
 +	     (setq result (nconc (loop for i from (cadr p) downto (car p)
 +				       collect i)
 +				 result)))))
 +    (nreverse result)))
 +
 +;;;###autoload
 +(defun erc-server-select ()
 +  "Interactively select a server to connect to using `erc-server-alist'."
 +  (interactive)
 +  (let* ((completion-ignore-case t)
 +	 (net (intern
 +	       (completing-read "Network: "
 +				(erc-delete-dups
 +				 (mapcar (lambda (x)
 +					   (list (symbol-name (nth 1 x))))
 +					 erc-server-alist)))))
 +	 (srv (assoc
 +	       (completing-read "Server: "
 +				(delq nil
 +				      (mapcar (lambda (x)
 +						(when (equal (nth 1 x) net)
 +						  x))
 +					      erc-server-alist)))
 +	       erc-server-alist))
 +	 (host (nth 2 srv))
 +	 (ports (if (listp (nth 3 srv))
 +		    (erc-ports-list (nth 3 srv))
 +		  (list (nth 3 srv))))
 +	 (port (nth (random (length ports)) ports)))
 +    (erc :server host :port port)))
 +
 +;;; The following experimental
 +;; It does not work yet, help me with it if you
 +;; think it is worth the effort.
 +
 +(defvar erc-settings
 +  '((pals freenode ("kensanata" "shapr" "anti\\(fuchs\\|gone\\)"))
 +    (format-nick-function (freenode "#emacs") erc-format-@nick))
 +  "Experimental: Alist of configuration options.
 +The format is (VARNAME SCOPE VALUE) where
 +VARNAME is a symbol identifying the configuration option,
 +SCOPE is either a symbol which identifies an entry from
 +  `erc-networks-alist' or a list (NET TARGET) where NET is a network symbol and
 +  TARGET is a string identifying the channel/query target.
 +VALUE is the options value.")
 +
 +(defun erc-get (var &optional net target)
 +  (let ((items erc-settings)
 +	elt val)
 +    (while items
 +      (setq elt (car items)
 +	    items (cdr items))
 +      (when (eq (car elt) var)
 +	(cond ((and net target (listp (nth 1 elt))
 +		    (eq net (car (nth 1 elt)))
 +		    (string-equal target (nth 1 (nth 1 elt))))
 +	       (setq val (nth 2 elt)
 +		     items nil))
 +	      ((and net (eq net (nth 1 elt)))
 +	       (setq val (nth 2 elt)
 +		     items nil))
 +	      ((and (not net) (not target) (not (nth 1 elt)))
 +	       (setq val (nth 2 elt)
 +		     items nil)))))
 +    val))
 +
 +(erc-get 'pals 'freenode)
 +
 +(provide 'erc-networks)
 +
 +;;; erc-networks.el ends here
 +;;
 +;; Local Variables:
 +;; indent-tabs-mode: t
 +;; tab-width: 8
 +;; End:
 +
 +;; arch-tag: 68cccabd-f66b-456c-9abe-5f993a2dc91c
diff --cc erc-nicklist.el
index 7a94d2b,49af2e5..f37b8ea
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-nicklist.el --- Display channel nicknames in a side buffer.
  
--;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Filename: erc-nicklist.el
  ;; Author: Lawrence Mitchell <wence@gmx.li>
diff --cc erc-notify.el
index f21090d,9fc7f57..d34e38a
--- a/erc-notify.el
+++ b/erc-notify.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-notify.el --- Online status change notification
  
- ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@lexx.delysid.org>
  ;; Keywords: comm
diff --cc erc-page.el
index 4c6b86b,d8e6770..de13c60
--- a/erc-page.el
+++ b/erc-page.el
@@@ -1,6 -1,6 +1,6 @@@
  ;; erc-page.el - CTCP PAGE support for ERC
  
- ;; Copyright (C) 2002, 2004, 2006 Free Software Foundation
 -;; Copyright (C) 2002, 2004 Free Software Foundation
++;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation
  
  ;; This file is part of GNU Emacs.
  
diff --cc erc-pcomplete.el
index 49b929d,5dc7256..f207bcc
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-pcomplete.el --- Provides programmable completion for ERC
  
- ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Sacha Chua <sacha@free.net.ph>
  ;; Keywords: comm, convenience
diff --cc erc-replace.el
index 7a22954,76e55ce..5e63f8d
--- a/erc-replace.el
+++ b/erc-replace.el
@@@ -1,6 -1,6 +1,6 @@@
  ;; erc-replace.el -- wash and massage messages inserted into the buffer
  
- ;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Andreas Fuchs <asf@void.at>
  ;; Maintainer: Mario Lang (mlang@delysid.org)
diff --cc erc-ring.el
index 87707e6,08344dc..95c313a
--- a/erc-ring.el
+++ b/erc-ring.el
@@@ -1,6 -1,6 +1,7 @@@
  ;; erc-ring.el -- Command history handling for erc using ring.el
  
- ;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
++;;   2007 Free Software Foundation, Inc.
  
  ;; Author: Alex Schroeder <alex@gnu.org>
  ;; Keywords: comm
diff --cc erc-services.el
index 74cfeb4,0000000..a2cc1b1
mode 100644,000000..100644
--- a/erc-services.el
+++ b/erc-services.el
@@@ -1,384 -1,0 +1,384 @@@
 +;;; erc-services.el --- Identify to NickServ
 +
- ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2006, 2007 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 2, 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.
 +
 +;;; Commentary:
 +
 +;; There are two ways to go about identifying yourself automatically to
 +;; NickServ with this module.  The more secure way is to listen for identify
 +;; requests from the user NickServ.  Another way is to identify yourself to
 +;; NickServ directly after a successful connection and every time you change
 +;; your nickname.  This method is rather insecure, though, because no checks
 +;; are made to test if NickServ is the real NickServ for a given network or
 +;; server.
 +
 +;; As a default, ERC has the data for the official nickname services on the
 +;; networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, and Slashnet.
 +;; You can add more by using M-x customize-variable RET erc-nickserv-alist.
 +
 +;; Usage:
 +;;
 +;; Put into your .emacs:
 +;;
 +;; (require 'erc-services)
 +;; (erc-services-mode 1)
 +;;
 +;; Add your nickname and NickServ password to `erc-nickserv-passwords'.
 +;; Using the freenode network as an example:
 +;;
 +;; (setq erc-nickserv-passwords '((freenode (("nickname" "password")))))
 +;;
 +;; The default automatic identification mode is autodetection of NickServ
 +;; identify requests.  Set the variable `erc-nickserv-identify-mode' if
 +;; you'd like to change this behavior.  You can also change the way
 +;; automatic identification is handled by using:
 +;;
 +;; M-x erc-nickserv-identify-mode
 +;;
 +;; If you'd rather not identify yourself automatically but would like access
 +;; to the functions contained in this file, just load this file without
 +;; enabling `erc-services-mode'.
 +;;
 +
 +;;; Code:
 +
 +(require 'erc)
 +(require 'erc-networks)
 +(eval-when-compile (require 'cl))
 +
 +;; Customization:
 +
 +(defgroup erc-services nil
 +  "Configuration for IRC services.
 +
 +On some networks, there exists a special type of automated irc bot,
 +called Services.  Those usually allow you to register your nickname,
 +post/read memos to other registered users who are currently offline,
 +and do various other things.
 +
 +This group allows you to set variables to somewhat automate
 +communication with those Services."
 +  :group 'erc)
 +
 +(defcustom erc-nickserv-identify-mode 'both
 +  "The mode which is used when identifying to Nickserv.
 +
 +Possible settings are:.
 +
 +'autodetect  - Identify when the real Nickserv sends an identify request.
 +'nick-change - Identify when you log in or change your nickname.
 +'both        - Do the former if the network supports it, otherwise do the
 +               latter.
 +nil          - Disables automatic Nickserv identification.
 +
 +You can also use M-x erc-nickserv-identify-mode to change modes."
 +  :group 'erc-services
 +  :type '(choice (const autodetect)
 +		 (const nick-change)
 +		 (const both)
 +		 (const nil))
 +  :set (lambda (sym val)
 +	 (set sym val)
 +	 ;; avoid recursive load at startup
 +	 (when (featurep 'erc-services)
 +	   (erc-nickserv-identify-mode val))))
 +
 +;;;###autoload (autoload 'erc-services-mode "erc-services" nil t)
 +(define-erc-module services nickserv
 +  "This mode automates communication with services."
 +  ((erc-nickserv-identify-mode erc-nickserv-identify-mode))
 +  ((remove-hook 'erc-server-NOTICE-functions
 +		'erc-nickserv-identify-autodetect)
 +   (remove-hook 'erc-after-connect
 +		'erc-nickserv-identify-on-connect)
 +   (remove-hook 'erc-nick-changed-functions
 +		'erc-nickserv-identify-on-nick-change)))
 +
 +;;;###autoload
 +(defun erc-nickserv-identify-mode (mode)
 +  "Set up hooks according to which MODE the user has chosen."
 +  (interactive
 +   (list (intern (completing-read
 +		  "Choose Nickserv identify mode (RET to disable): "
 +		  '(("autodetect") ("nick-change") ("both")) nil t))))
 +  (cond ((eq mode 'autodetect)
 +	 (setq erc-nickserv-identify-mode 'autodetect)
 +	 (add-hook 'erc-server-NOTICE-functions
 +		   'erc-nickserv-identify-autodetect)
 +	 (remove-hook 'erc-nick-changed-functions
 +		      'erc-nickserv-identify-on-nick-change)
 +	 (remove-hook 'erc-after-connect
 +		      'erc-nickserv-identify-on-connect))
 +	((eq mode 'nick-change)
 +	 (setq erc-nickserv-identify-mode 'nick-change)
 +	 (add-hook 'erc-after-connect
 +		   'erc-nickserv-identify-on-connect)
 +	 (add-hook 'erc-nick-changed-functions
 +		   'erc-nickserv-identify-on-nick-change)
 +	 (remove-hook 'erc-server-NOTICE-functions
 +		      'erc-nickserv-identify-autodetect))
 +	((eq mode 'both)
 +	 (setq erc-nickserv-identify-mode 'both)
 +	 (add-hook 'erc-server-NOTICE-functions
 +		   'erc-nickserv-identify-autodetect)
 +	 (add-hook 'erc-after-connect
 +		   'erc-nickserv-identify-on-connect)
 +	 (add-hook 'erc-nick-changed-functions
 +		   'erc-nickserv-identify-on-nick-change))
 +	(t
 +	 (setq erc-nickserv-identify-mode nil)
 +	 (remove-hook 'erc-server-NOTICE-functions
 +		      'erc-nickserv-identify-autodetect)
 +	 (remove-hook 'erc-after-connect
 +		      'erc-nickserv-identify-on-connect)
 +	 (remove-hook 'erc-nick-changed-functions
 +		      'erc-nickserv-identify-on-nick-change))))
 +
 +(defcustom erc-prompt-for-nickserv-password t
 +  "Ask for the password when identifying to NickServ."
 +  :group 'erc-services
 +  :type 'boolean)
 +
 +(defcustom erc-nickserv-passwords nil
 +  "Passwords used when identifying to NickServ automatically.
 +
 +Example of use:
 +  (setq erc-nickserv-passwords
 +        '((freenode ((\"nick-one\" . \"password\")
 +                     (\"nick-two\" . \"password\")))
 +          (DALnet ((\"nick\" . \"password\")))))"
 +  :group 'erc-services
 +  :type '(repeat
 +	  (list :tag "Network"
 +		(choice :tag "Network name"
 +			(const Ars)
 +			(const Austnet)
 +			(const Azzurra)
 +			(const BitlBee)
 +			(const BRASnet)
 +			(const DALnet)
 +			(const freenode)
 +			(const GalaxyNet)
 +			(const iip)
 +			(const OFTC)
 +			(const QuakeNet)
 +			(const SlashNET)
 +			(symbol :tag "Network name"))
 +		(repeat :tag "Nickname and password"
 +			(cons :tag "Identity"
 +			      (string :tag "Nick")
 +			      (string :tag "Password"))))))
 +
 +;; Variables:
 +
 +(defcustom erc-nickserv-alist
 +  '((Ars
 +     nil nil
 +     "Census"
 +     "IDENTIFY" nil nil)
 +    (Austnet
 +     "NickOP!service@austnet.org"
 +     "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
 +     "nickop@austnet.org"
 +     "identify" nil nil)
 +    (Azzurra
 +     "NickServ!service@azzurra.org"
 +     "/ns\\s-IDENTIFY\\s-password"
 +     "NickServ"
 +     "IDENTIFY" nil nil)
 +    (BitlBee
 +     nil nil
 +     "&bitlbee"
 +     "identify" nil nil)
 +    (BRASnet
 +     "NickServ!services@brasnet.org"
 +     "/NickServ\\s-IDENTIFY\\s-senha"
 +     "NickServ"
 +     "IDENTIFY" nil "")
 +    (DALnet
 +     "NickServ!service@dal.net"
 +     "/msg\\s-NickServ@services.dal.net\\s-IDENTIFY\\s-<password>"
 +     "NickServ@services.dal.net"
 +     "IDENTIFY" nil nil)
 +    (freenode
 +     "NickServ!NickServ@services."
 +     "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
 +     "NickServ"
 +     "IDENTIFY" nil nil)
 +    (GalaxyNet
 +     "NS!nickserv@galaxynet.org"
 +     "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
 +     "NS@services.galaxynet.org"
 +     "AUTH" t nil)
 +    (iip
 +     "Trent@anon.iip"
 +     "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"
 +     "Trent@anon.iip"
 +     "IDENTIFY" nil "SQUERY")
 +    (OFTC
 +     "NickServ!services@services.oftc.net"
 +     "type\\s-/msg\\s-NickServ\\s-IDENTIFY\\s-password."
 +     "NickServ"
 +     "IDENTIFY" nil nil)
 +    (QuakeNet
 +     nil nil
 +     "Q@CServe.quakenet.org"
 +     "auth" t nil)
 +    (SlashNET
 +     "NickServ!services@services.slashnet.org"
 +     "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
 +     "NickServ@services.slashnet.org"
 +     "IDENTIFY" nil nil))
 +   "Alist of NickServer details, sorted by network.
 +Every element in the list has the form
 +  \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER)
 +
 +SYMBOL is a network identifier, a symbol, as used in `erc-networks-alist'.
 +NICKSERV is the description of the nickserv in the form nick!user@host.
 +REGEXP is a regular expression matching the message from nickserv.
 +NICK is nickserv's nickname.  Use nick@server where necessary/possible.
 +KEYWORD is the keyword to use in the reply message to identify yourself.
 +USE-CURRENT indicates whether the current nickname must be used when
 +  identifying.
 +ANSWER is the command to use for the answer.  The default is 'privmsg.
 +  This last element is optional."
 +   :group 'erc-services
 +   :type '(repeat
 +	   (list :tag "Nickserv data"
 +		 (symbol :tag "Network name")
 +		 (choice (string :tag "Nickserv's nick!user@host")
 +			 (const :tag "No message sent by Nickserv" nil))
 +		 (choice (regexp :tag "Identify request sent by Nickserv")
 +			 (const :tag "No message sent by Nickserv" nil))
 +		 (string :tag "Identify to")
 +		 (string :tag "Identify keyword")
 +		 (boolean :tag "Use current nick in identify message?")
 +		 (choice :tag "Command to use (optional)"
 +		  (string :tag "Command")
 +		  (const :tag "No special command necessary" nil)))))
 +
 +(defsubst erc-nickserv-alist-sender (network &optional entry)
 +  (nth 1 (or entry (assoc network erc-nickserv-alist))))
 +
 +(defsubst erc-nickserv-alist-regexp (network &optional entry)
 +  (nth 2 (or entry (assoc network erc-nickserv-alist))))
 +
 +(defsubst erc-nickserv-alist-nickserv (network &optional entry)
 +  (nth 3 (or entry (assoc network erc-nickserv-alist))))
 +
 +(defsubst erc-nickserv-alist-ident-keyword (network &optional entry)
 +  (nth 4 (or entry (assoc network erc-nickserv-alist))))
 +
 +(defsubst erc-nickserv-alist-use-nick-p (network &optional entry)
 +  (nth 5 (or entry (assoc network erc-nickserv-alist))))
 +
 +(defsubst erc-nickserv-alist-ident-command (network &optional entry)
 +  (nth 6 (or entry (assoc network erc-nickserv-alist))))
 +
 +;; Functions:
 +
 +(defun erc-nickserv-identify-autodetect (proc parsed)
 +  "Check for a NickServ identify request everytime a notice is received.
 +Make sure it is the real NickServ for this network and that it has
 +specifically asked the user to IDENTIFY.
 +If `erc-prompt-for-nickserv-password' is non-nil, prompt the user for the
 +password for this nickname, otherwise try to send it automatically."
 +  (unless (and (null erc-nickserv-passwords)
 +	       (null erc-prompt-for-nickserv-password))
 +    (let* ((network (erc-network))
 +	   (sender (erc-nickserv-alist-sender network))
 +	   (identify-regex (erc-nickserv-alist-regexp network))
 +	   (sspec (erc-response.sender parsed))
 +	   (nick (car (erc-response.command-args parsed)))
 +	   (msg (erc-response.contents parsed)))
 +      ;; continue only if we're sure it's the real nickserv for this network
 +      ;; and it's asked us to identify
 +      (when (and sender (equal sspec sender)
 +		 (string-match identify-regex msg))
 +	(erc-log "NickServ IDENTIFY request detected")
 +	(erc-nickserv-call-identify-function nick)
 +	nil))))
 +
 +(defun erc-nickserv-identify-on-connect (server nick)
 +  "Identify to Nickserv after the connection to the server is established."
 +  (unless (or (and (null erc-nickserv-passwords)
 +		   (null erc-prompt-for-nickserv-password))
 +	      (and (eq erc-nickserv-identify-mode 'both)
 +		   (erc-nickserv-alist-regexp (erc-network))))
 +    (erc-nickserv-call-identify-function nick)))
 +
 +(defun erc-nickserv-identify-on-nick-change (nick old-nick)
 +  "Identify to Nickserv whenever your nick changes."
 +  (unless (or (and (null erc-nickserv-passwords)
 +		   (null erc-prompt-for-nickserv-password))
 +	      (and (eq erc-nickserv-identify-mode 'both)
 +		   (erc-nickserv-alist-regexp (erc-network))))
 +    (erc-nickserv-call-identify-function nick)))
 +
 +(defun erc-nickserv-call-identify-function (nickname)
 +  "Call `erc-nickserv-identify' interactively or run it with NICKNAME's
 +password.
 +The action is determined by the value of `erc-prompt-for-nickserv-password'."
 +  (if erc-prompt-for-nickserv-password
 +      (call-interactively 'erc-nickserv-identify)
 +    (when erc-nickserv-passwords
 +      (erc-nickserv-identify
 +       (cdr (assoc nickname
 +		   (nth 1 (assoc (erc-network)
 +				 erc-nickserv-passwords))))))))
 +
 +;;;###autoload
 +(defun erc-nickserv-identify (password)
 +  "Send an \"identify <PASSWORD>\" message to NickServ.
 +When called interactively, read the password using `read-passwd'."
 +  (interactive
 +   (list (read-passwd
 +	  (format "NickServ password for %s on %s (RET to cancel): "
 +		  (erc-current-nick)
 +		  (or (and (erc-network)
 +			   (symbol-name (erc-network)))
 +		      "Unknown network")))))
 +  (when (and password (not (string= "" password)))
 +    (let* ((erc-auto-discard-away nil)
 +	   (network (erc-network))
 +	   (nickserv-info (assoc network erc-nickserv-alist))
 +	   (nickserv (or (erc-nickserv-alist-nickserv nil nickserv-info)
 +			 "NickServ"))
 +	   (identify-word (or (erc-nickserv-alist-ident-keyword
 +			       nil nickserv-info)
 +			      "IDENTIFY"))
 +	   (nick (if (erc-nickserv-alist-use-nick-p nil nickserv-info)
 +		     (concat (erc-current-nick) " ")
 +		   ""))
 +	   (msgtype (or (erc-nickserv-alist-ident-command nil nickserv-info)
 +			"PRIVMSG")))
 +      (erc-message msgtype
 +		   (concat nickserv " " identify-word " " nick password)))))
 +
 +(provide 'erc-services)
 +
 +;;; erc-services.el ends here
 +;;
 +;; Local Variables:
 +;; indent-tabs-mode: t
 +;; tab-width: 8
 +;; End:
 +
 +;; arch-tag: d401c8aa-d938-4255-96a9-3efb64c47e58
diff --cc erc-sound.el
index e152d8e,c5b0f81..fdac1cc
--- a/erc-sound.el
+++ b/erc-sound.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-sound.el --- CTCP SOUND support for ERC
  
- ;; Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
  
  ;; This file is part of GNU Emacs.
  
diff --cc erc-speedbar.el
index 7bc8546,653a302..0d88589
--- a/erc-speedbar.el
+++ b/erc-speedbar.el
@@@ -1,6 -1,6 +1,7 @@@
  ;;; erc-speedbar.el --- Speedbar support for ERC
  
- ;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
++;;   2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
diff --cc erc-spelling.el
index 612675f,2c81cc5..a15ca17
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-spelling.el --- use flyspell in ERC
  
- ;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2005, 2006  Free Software Foundation, Inc.
++;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Jorgen Schaefer <forcer@forcix.cx>
  ;; Keywords: irc
diff --cc erc-stamp.el
index 9edc40d,e382b5f..0b8017f
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; erc-stamp.el --- Timestamping for Emacs IRC CLient
 +;;; erc-stamp.el --- Timestamping for ERC messages
  
- ;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: comm, processes, timestamp
diff --cc erc-track.el
index f836a78,28d5589..188e8ee
--- a/erc-track.el
+++ b/erc-track.el
@@@ -1,6 -1,6 +1,7 @@@
  ;;; erc-track.el --- Track modified channel buffers
  
- ;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
++;;   2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: comm, faces
diff --cc erc-truncate.el
index 76475ab,49cd20d..440dc87
--- a/erc-truncate.el
+++ b/erc-truncate.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-truncate.el --- Functions for truncating ERC buffers
  
- ;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Andreas Fuchs <asf@void.at>
  ;; Keywords: IRC, chat, client, Internet, logging
diff --cc erc-xdcc.el
index d00dfc5,7c8ee6f..ea1fa27
--- a/erc-xdcc.el
+++ b/erc-xdcc.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; erc-xdcc.el --- XDCC file-server support for ERC
  
- ;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 -;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Mario Lang <mlang@delysid.org>
  ;; Keywords: comm, processes
diff --cc erc.texi
index bf04099,021e49d..eec8115
--- a/erc.texi
+++ b/erc.texi
@@@ -12,9 -12,9 +12,9 @@@
  @syncodeindex fn cp
  
  @copying
 -This manual is for ERC version 5.1.
 +This manual is for ERC version 5.1.4.
  
--Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
++Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
  
  @quotation
  Permission is granted to copy, distribute and/or modify this document



From MAILER-DAEMON Wed Oct 17 10:36:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0M-00037U-Kh
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvR3-0006EF-ED
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPa-0005Fw-3L
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPZ-0005Ek-4Z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:09 -0400
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@hcoop.net>) id 1IgvPW-000454-S3
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPV-0005Kd-53
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPV-0006mw-6G
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPV-0006mw-6G@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:05 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:09 -0400
Subject: [Erc-commit] [commit][emacs22] Replace GPLv2 with GPLv3 in manual
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, 14 Oct 2007 04:50:41 -0000

commit fe15fd3248890115e2b45c2e402858a916c84b12
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Jul 10 01:55:49 2007 +0000

    Replace GPLv2 with GPLv3 in manual
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-156

diff --git a/erc.texi b/erc.texi
index 60f6022..a803ff1 100644
--- a/erc.texi
+++ b/erc.texi
@@ -1009,402 +1009,727 @@ our revision control system.  Our mailing list address changed as well.
 
 @node Copying, GNU Free Documentation License, History, Top
 @comment  node-name,  next,  previous,  up
-@appendix COPYING
-@center Version 2, June 1991
-@cindex GPL
-@cindex GNU General Public License
+@unnumbered GNU General Public License
+@center Version 3, 29 June 2007
+
+@c This file is intended to be included in another file.
 
 @display
-Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
 
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 @end display
 
-@appendixsec Preamble
+@heading Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  When we speak of free software, we are referring to freedom, not
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users.  We, the Free Software Foundation,
+use the GNU General Public License for most of our software; it
+applies also to any other work released this way by its authors.  You
+can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too,
+receive or can get the source code.  And you must show them these
+terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so.  This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software.  The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products.  If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary.  To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
 modification follow.
 
-@iftex
-@appendixsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end iftex
-@ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end ifinfo
+@heading TERMS AND CONDITIONS
 
 @enumerate 0
-@item
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The ``Program'', below,
-refers to any such program or work, and a ``work based on the Program''
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term ``modification''.)  Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+@item Definitions.
+
+``This License'' refers to version 3 of the GNU General Public License.
+
+``Copyright'' also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+``The Program'' refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as ``you''.  ``Licensees'' and
+``recipients'' may be individuals or organizations.
+
+To ``modify'' a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy.  The resulting work is called a ``modified version'' of
+the earlier work or a work ``based on'' the earlier work.
+
+A ``covered work'' means either the unmodified Program or a work based
+on the Program.
+
+To ``propagate'' a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To ``convey'' a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays ``Appropriate Legal Notices'' to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+@item Source Code.
+
+The ``source code'' for a work means the preferred form of the work for
+making modifications to it.  ``Object code'' means any non-source form
+of a work.
+
+A ``Standard Interface'' means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The ``System Libraries'' of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+``Major Component'', in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The ``Corresponding Source'' for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+@item Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright.  Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+@item Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+@item Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+@item Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+@enumerate a
+@item 
+The work must carry prominent notices stating that you modified it,
+and giving a relevant date.
 
 @item
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+The work must carry prominent notices stating that it is released
+under this License and any conditions added under section 7.  This
+requirement modifies the requirement in section 4 to ``keep intact all
+notices''.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+@item
+You must license the entire work, as a whole, under this License to
+anyone who comes into possession of a copy.  This License will
+therefore apply, along with any applicable section 7 additional terms,
+to the whole of the work, and all its parts, regardless of how they
+are packaged.  This License gives no permission to license the work in
+any other way, but it does not invalidate such permission if you have
+separately received it.
 
 @item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your work
+need not make them do so.
+@end enumerate
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+``aggregate'' if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+@item  Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
 
 @enumerate a
 @item
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium customarily
+used for software interchange.
 
 @item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a written
+offer, valid for at least three years and valid for as long as you
+offer spare parts or customer support for that product model, to give
+anyone who possesses the object code either (1) a copy of the
+Corresponding Source for all the software in the product that is
+covered by this License, on a durable physical medium customarily used
+for software interchange, for a price no more than your reasonable
+cost of physically performing this conveying of source, or (2) access
+to copy the Corresponding Source from a network server at no charge.
 
 @item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
-@end enumerate
+Convey individual copies of the object code with a copy of the written
+offer to provide the Corresponding Source.  This alternative is
+allowed only occasionally and noncommercially, and only if you
+received the object code with such an offer, in accord with subsection
+6b.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+@item
+Convey the object code by offering access from a designated place
+(gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to copy
+the object code is a network server, the Corresponding Source may be
+on a different server (operated by you or a third party) that supports
+equivalent copying facilities, provided you maintain clear directions
+next to the object code saying where to find the Corresponding Source.
+Regardless of what server hosts the Corresponding Source, you remain
+obligated to ensure that it is available for as long as needed to
+satisfy these requirements.
 
 @item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+Convey the object code using peer-to-peer transmission, provided you
+inform other peers where the object code and Corresponding Source of
+the work are being offered to the general public at no charge under
+subsection 6d.
+
+@end enumerate
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A ``User Product'' is either (1) a ``consumer product'', which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling.  In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage.  For a particular product received by a particular user,
+``normally used'' refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product.  A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+``Installation Information'' for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source.  The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed.  Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+@item Additional Terms.
+
+``Additional permissions'' are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
 
 @enumerate a
 @item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
+Disclaiming warranty or limiting liability differently from the terms
+of sections 15 and 16 of this License; or
 
 @item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
+Requiring preservation of specified reasonable legal notices or author
+attributions in that material or in the Appropriate Legal Notices
+displayed by works containing it; or
 
 @item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
-@end enumerate
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
 
 @item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
 
 @item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+Declining to grant rights under trademark law for use of some trade
+names, trademarks, or service marks; or
 
 @item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+Requiring indemnification of licensors and authors of that material by
+anyone who conveys the material (or modified versions of it) with
+contractual assumptions of liability to the recipient, for any
+liability that these contractual assumptions directly impose on those
+licensors and authors.
+@end enumerate
+
+All other non-permissive additional terms are considered ``further
+restrictions'' within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+@item Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+@item Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+@item Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An ``entity transaction'' is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+@item Patents.
+
+A ``contributor'' is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's ``contributor version''.
+
+A contributor's ``essential patent claims'' are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, ``control'' includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-@item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a ``patent license'' is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To ``grant'' such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  ``Knowingly relying'' means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is ``discriminatory'' if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License.  You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+@item No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-@item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+excuse you from the conditions of this License.  If you cannot convey
+a covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all.  For example, if you agree
+to terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+@item Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+@item Revised Versions of this License.
 
-@item
 The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+of the GNU General Public License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
 
 Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-@item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
-
-@item
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+specifies that a certain numbered version of the GNU General Public
+License ``or any later version'' applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation.  If
+the Program does not specify a version number of the GNU General
+Public License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+@item Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+@item Limitation of Liability.
 
-@item
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+@item Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
 @end enumerate
 
-@iftex
 @heading END OF TERMS AND CONDITIONS
-@end iftex
-@ifinfo
-@center END OF TERMS AND CONDITIONS
-@end ifinfo
 
-@page
-@appendixsec Appendix: How to Apply These Terms to Your New Programs
+@heading How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+free software which everyone can redistribute and change under these
+terms.
 
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the ``copyright'' line and a pointer to where the full notice is found.
 
 @smallexample
-@var{one line to give the program's name and a brief idea of what it does.}
-Copyright (C) @var{yyyy}  @var{name of author}
+@var{one line to give the program's name and a brief idea of what it does.}  
+Copyright (C) @var{year} @var{name of author}
 
-This program is free software; you can redistribute it and/or modify
+This program 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 2 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
-This program 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.
+This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
 @smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+@var{program} Copyright (C) @var{year} @var{name of author} 
+This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
 This is free software, and you are welcome to redistribute it
-under certain conditions; type `show c' for details.
+under certain conditions; type @samp{show c} for details.
 @end smallexample
 
 The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than @samp{show w} and
-@samp{show c}; they could even be mouse-clicks or menu items---whatever
-suits your program.
+the appropriate parts of the General Public License.  Of course, your
+program's commands might be different; for a GUI interface, you would
+use an ``about box''.
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
-
-@example
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-`Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-@var{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-@end example
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a ``copyright disclaimer'' for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+@url{http://www.gnu.org/licenses/}.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use
+the GNU Lesser General Public License instead of this License.  But
+first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
 
 
 @node GNU Free Documentation License, Concept Index, Copying, Top
 @comment  node-name,  next,  previous,  up
-@appendix GNU Free Documentation License
+@unnumbered GNU Free Documentation License
 @center Version 1.2, November 2002
 
 @display



From MAILER-DAEMON Wed Oct 17 10:36:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0N-00037w-2J
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRF-0006Nf-2w
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRD-0006Lv-9W
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP5-00053k-42
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
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@hcoop.net>) id 1IgvP4-0003zP-7b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP1-00058c-US
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP2-00060P-08
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:36 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP2-00060P-08@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:36 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Merged from erc--emacs--22
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, 14 Oct 2007 04:50:53 -0000

commit 9df1edf87f569f9158947ddab1f16896fea39b4c
Merge: f32cb85... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Wed Dec 13 02:34:37 2006 +0000

    Merged from erc--emacs--22
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-30
       Sync from Emacs 22
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-70

diff --cc ChangeLog
index d6e8709,cef3944..a3e8c27
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,1138 -1,12 +1,1142 @@@
 +2006-12-13  Leo  <sdl.web@gmail.com>
 +
 +	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
 +	isn't active already, instead of leaving it on.
 +
++2006-12-10  Juanma Barranquero  <lekktu@gmail.com>
++
++	* erc-ezbounce.el (erc-ezb-init-session-list): Doc fix.
++
 +2006-12-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Juanma Barranquero.
 +
 +	* erc.el: Re-evaluate contributions from a contributor, and found
 +	them under 15 lines of non-obvious code, so it is safe to remove
 +	the copyright notice.
 +
 +2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
 +	(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook)
 +	(erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer)
 +	(erc-modules, erc-display-message-highlight, erc-process-input-line)
 +	(erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers)
 +	(erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers)
 +	(erc-echo-notice-in-first-user-buffer, erc-connection-established)
 +	(erc-update-user-nick, erc-update-channel-member, erc-highlight-notice)
 +	(erc-command-symbol, erc-add-query, erc-process-script-line)
 +	(erc-determine-parameters, erc-client-info, erc-popup-input-buffer):
 +	(erc-script-echo): Fix typos in docstrings.
 +	(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list)
 +	(define-erc-module, erc-once-with-server-event)
 +	(erc-once-with-server-event-global, erc-debug-irc-protocol)
 +	(erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user)
 +	(erc-update-current-channel-member, erc-load-script):
 +	(erc-mode-line-away-status-format): Doc fixes.
 +
 +2006-11-20  Andrea Russo  <rastandy@inventati.org>
 +
 +	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
 +	before calling `erc-display-prompt'.
 +
 +2006-11-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Display better error message when
 +	module not found.
 +
 +2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc.el (erc-after-connect, erc-open-ssl-stream)
 +	(erc-display-line-1, erc-display-line):
 +	* erc-backend.el (005): Fix space/tab mixup in docstrings.
 +
 +2006-11-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el: Save all log buffers when Emacs exits, in case
 +	someone ignores the warning about open processes.  Remove the
 +	advice code in the commentary.
 +	(erc-save-query-buffers): Docfix.
 +	(erc-log-save-all-buffers): New function that saves all ERC
 +	buffers to logs.
 +	(erc-current-logfile): Fix bug in filename selection, where the
 +	current buffer was erroneously being preferred over the given
 +	buffer.
 +
 +2006-11-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-string-to-port): Avoid error when a numerical port
 +	is passed.  Thanks to Zekeriya KOÇ for the report.
 +
 +2006-11-08  Łukasz Demianiuk  <ldemianiuk@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-header-line): Fix typo.
 +
 +2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
 +
 +	* erc.el (read-passwd):
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
 +	* erc-truncate.el (truncate): Fix typo in docstring.
 +
 +2006-10-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
 +	first loading iswitchb.  Thanks to Leo for the report.
 +
 +2006-10-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-default-port): Make the default be 6667 instead of
 +	ircd. since Mac OS X apparently has problems with looking up that
 +	port name.
 +
 +	* erc-backend.el (353): Receive names after displaying the initial
 +	message, instead of before.
 +
 +2006-10-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-my-nick-face): New face.
 +	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
 +	fixes a bug where the :full-name argument passed to the function
 +	was not respected.
 +	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
 +	make it easier to find messages you sent in conversations when
 +	`erc-show-my-nick' is non-nil.
 +	(erc-compute-server): Doc fix.
 +
 +2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
 +	from the erc-timestamp field.
 +
 +2006-09-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
 +	parenthesis.  Thanks to Stephan Stahl for the report.
 +
 +2006-09-10  Eric Hanchrow  <offby1@blarg.net>
 +
 +	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
 +	instead of a single user.
 +
 +2006-09-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-generate-new-buffer-name): If this is a server
 +	buffer and a process exists already, create a new buffer.
 +	(erc-open): If the IRC session was continued, restore the old
 +	point.  Thanks to Stephan Stahl for the report.
 +	(erc-member-ignore-case): Coding style tweak.
 +	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
 +	find the user listed verbatim, try to match them against the list
 +	using string-match.  In this case, prompt as to whether the regexp
 +	should be removed.
 +	(erc-ignored-user-p): Remove CL-ism.
 +
 +	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
 +	whether we are already away.
 +
 +	* erc-menu.el: Fix potential compiler warning.
 +
 +2006-09-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: Updated Commentary and URL.
 +	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
 +	(erc-arrange-session-in-multiple-windows): No need to check if
 +	`erc-server-process' is bound.
 +	(erc-server-buffer-live-p): Doc fix.
 +	(erc-part-from-channel): Don't use any initial contents at prompt.
 +	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
 +	(s367): Fixed to support only banmask and channel which is the
 +	standard.  Also, there's no reason to add a message to each banned
 +	user entry trying to persuade the user to use /banlist instead of
 +	/mode #channel +b.  That part of the message was a little
 +	confusing, anyways.
 +	(s367-set-by): New catalog entry.  The user who set the ban and
 +	the time of ban seem to be specific to only certain servers such
 +	as freenode.
 +
 +	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
 +
 +	* erc-backend.el (erc-server-process-alive): No need to check if
 +	`erc-server-process' is bound.
 +	(367): Use s367 or s367-set-by where appropriate.
 +
 +	* erc-compat.el: Fixed URL.
 +
 +	* erc-dcc.el: Updated copyright years.  Added Usage section.
 +	Changed supported Emacs version number from 21.3.50 to 22 in
 +	Commentary.
 +
 +	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
 +	to check if `erc-server-process' is bound.
 +
 +	* erc-nicklist.el: Added to the Commentary section an explanation
 +	that `erc-nicklist-quit' should be called from within the nicklist
 +	buffer.  Set file coding to utf-8 so a contributor's name is
 +	displayed correctly.
 +	(erc-nicklist-icons-directory): Use customize type directory
 +	instead of string.
 +	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
 +	if it wasn't found.  This fixes a bug where an error would occur
 +	when using `string=' on bbdb-nick if it was nil.
 +
 +	* erc-replace.el: Removed URL from file information since it
 +	doesn't exist.
 +
 +	* erc-sound.el: Updated copyright years.  Fixed Commentary and
 +	added Usage section.
 +	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
 +	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
 +	definitions.
 +	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
 +	(erc-ctcp-query-SOUND): Doc fix.
 +	(erc-play-command): Removed, not necessary anymore.
 +	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
 +	higher in code, added docstring.
 +	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
 +	as well since version 21 or earlier.  Removed commented-out older
 +	version of function.
 +
 +	* NEWS: Fixed formatting, added channel tracking change.
 +
 +	* README: Fixed typo.  Added more information to Installation
 +	section.  Updated URL.
 +
 +2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: M-x erc RET can now be used to start ERC.
 +	(erc-open): Renamed from `erc'.
 +	(erc-before-connect): Change erc-select to erc.
 +	(erc): Renamed from `erc-select'.  Use `erc-open'.
 +	(erc-select): Defined as alias of `erc'.
 +	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
 +	(erc-select-ssl): Defined as alias of `erc-ssl'.
 +	(erc-cmd-SERVER): Use `erc'.
 +	(erc-query, erc-handle-irc-url): Use `erc-open'.
 +
 +	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc'.
 +
 +	* erc-networks.el: Updated copyright years.
 +	(erc-server-select): Use keyword arguments when calling `erc'.
 +
 +	* erc.texi (Getting Started, Connecting): Changed erc-select to
 +	erc.
 +
 +	* README: Changed erc-select to erc.
 +
 +	* NEWS: Added note about these changes.
 +
 +	* FOR-RELEASE: Marked this item as done.
 +
 +2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
 +	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
 +	properties to channel name.
 +
 +2006-08-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd): New customization group.
 +	(erc-identd-port): New option that specifies the port to use if
 +	none is given as an argument to erc-identd-start.
 +	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
 +	instead of erc-identd-start so that we deal with the different
 +	meaning of the first argument.
 +	(erc-identd-start): Use erc-identd-port.
 +	(erc-identd-quickstart): New function that ignores any arguments
 +	and calls erc-identd-start.
 +
 +	* erc.el (erc-with-server-buffer): New macro that switches to the
 +	current ERC server buffer and runs some code.  If no server buffer
 +	is available, return nil.  This is a useful way to access
 +	variables in the server buffer.
 +	(erc-get-server-user, erc-add-server-user)
 +	(erc-remove-server-user, erc-change-user-nickname)
 +	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
 +	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
 +	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
 +	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
 +	(erc-format-channel-modes): Use it.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
 +	instead of gensym.
 +	(erc-open-server-buffer-p): New function that returns non-nil if
 +	the given buffer is an ERC server buffer that has an open IRC
 +	process.
 +	(erc-with-buffer): Use buffer-live-p here to set a good example,
 +	though it isn't really needed here.
 +	(erc-away): Mention erc-away-time.
 +	(erc): Don't propagate the erc-away setting, since it makes more
 +	sense to access it from the server buffer.  Set up the prompt
 +	before connecting rather than after.  Run erc-connect-pre-hook
 +	with the buffer as an argument, instead of no arguments.
 +	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
 +	erc-server-buffer-p so that only open connections are set away.
 +	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
 +	(erc-process-away): Docfix.  Don't set erc-away in channel
 +	buffers.
 +	(erc-set-current-nick): Make this uniform with the style used in
 +	erc-current-nick.
 +	(erc-away-time): Rename from erc-away-p, since this is no longer a
 +	boolean-style predicate.
 +	(erc-format-away-status): Use it.
 +	(erc-initialize-log-marker): Accept a `buffer' argument.
 +	(erc-connect-pre-hook): Docfix.
 +	(erc-connection-established): Make sure this runs in the correct
 +	buffer.
 +	(erc-set-initial-user-mode): Accept a `buffer' argument.
 +
 +	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
 +
 +	* erc-spelling.el (erc-spelling-init): Use
 +	erc-with-server-buffer.  Accept `buffer' argument.
 +	(spelling): Call erc-spelling-init with the `buffer' argument.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
 +	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
 +
 +	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
 +	erc-with-server-buffer.
 +
 +	* erc-networks.el (erc-network, erc-current-network)
 +	(erc-network-name): Use erc-with-server-buffer.
 +
 +	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
 +
 +	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
 +	erc-away-time.
 +
 +	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
 +	Pass `buffer' argument to erc-log-setup-logging instead of setting
 +	the current buffer.  Ditto for erc-log-disable-logging.
 +	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
 +	argument.
 +
 +	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
 +
 +	* erc-ibuffer.el (erc-away): Use erc-away-time.
 +
 +	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
 +	read only instead of permanently doing so.
 +
 +	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
 +	Emacs Lisp has make-symbol, which is better.
 +
 +	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
 +	erc-with-server-buffer.
 +
 +	* erc-capab.el (capab-identify): Only deal with server buffers
 +	that have an open IRC process.
 +	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
 +
 +	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
 +	`erc-server-process-alive' function.
 +	(erc-coding-system-for-target): Supply a default target if one is
 +	not given.
 +	(erc-server-send): Simplify slightly.
 +	(erc-call-hooks): Use erc-with-server-buffer.
 +	(erc-server-connect, erc-server-setup-periodical-ping): Accept
 +	`buffer' argument.
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
 +	higher to avoid an automatic load snafu.
 +	(erc-autoaway-some-server-buffer): New function that returns an
 +	ERC server buffer with a live connection, or nil otherwise.
 +	(erc-autoaway-insinuate-maybe): New function that adds the
 +	autoaway reset function to post-command-hook if at least one ERC
 +	process is alive.
 +	(erc-autoaway-remove-maybe): New function that removes the
 +	autoaway reset function from post-command-hook if no ERC process
 +	is alive.
 +	(autoaway): Don't touch post-command-hook unless an IRC process is
 +	already open.  Remove our addition to post-command-hook as soon as
 +	there are no more IRC processes open.  Reset the indicators before
 +	connecting to an IRC server, which fixes a bug when re-connecting.
 +	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
 +	there are no more IRC processes open.
 +	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
 +	argument which is a function call if we can't find one.
 +	(erc-autoaway-some-open-server-buffer): New function which returns
 +	an ERC server buffer with an open connection and a user that is
 +	not away.
 +	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
 +	(erc-autoaway-set-away): Accept a `notest' argument which is used
 +	to avoid testing the same thing twice.
 +	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
 +	higher in file to fix byte-compile warning.
 +
 +2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
 +	`erc-server-reconnect-p' check all condition cases.
 +	(erc-server-reconnect-p): Moved rest of checks from
 +	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
 +
 +2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
 +	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
 +	avoid confusion with rcirc and other clients.
 +
 +	* erc-backend.el (erc-server-banned): New variable.
 +	(erc-server-connect): Set `erc-server-banned' to nil.
 +	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
 +	(erc-server-reconnect-p): New function.  Return non-nil if the
 +	user wants automatic reconnects and if the user has not been
 +	banned from the server.  This should fix a bug where ERC gets into
 +	a loop trying to reconnect with no way to stop it when the user is
 +	denied access to the server due to a server ban.  It might also
 +	help when Tor users are blocked from freenode if freenode servers
 +	send the 465 message before disconnecting.
 +	(465): Handle "banned from server" error notices.
 +
 +2006-08-13  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
 +	prompt with a space.
 +
 +2006-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-timed-out): New variable that
 +	indicates whether the current connection has timed out due to
 +	failure to respond to a ping.
 +	(erc-server-send-ping): Set erc-server-timed-out to t.
 +	(erc-server-connect): Initialize erc-server-timed-out to nil.
 +	(erc-process-sentinel-1): Consult erc-server-timed-out.
 +
 +2006-08-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
 +	avoid errors when inserting disconnect messages and other messages
 +	that begin with newlines.
 +
 +2006-08-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
 +	in several places instead of inserting text.
 +	(erc-process-sentinel): Move to the input-marker before removing
 +	the prompt.
 +
 +	* erc.el (erc-port): Fix customization options.
 +	(erc-display-message): Handle null type explicitly.  Previously,
 +	this was relying on a chance side-effect.  Cosmetic indentation
 +	tweak.
 +	(english): Add 'finished and 'terminated entries to the catalog.
 +	Add initial and terminal newlines to 'disconnected and
 +	'disconnected-noreconnect entries.  Avoid long lines.
 +	(erc-cmd-QUIT): Bind the current erc-server-process to
 +	server-proc.  If the IRC server responds quickly, it is possible
 +	for the connection to close, and hence server buffer to be killed,
 +	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
 +	problem.
 +
 +2006-08-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-send-queue): Update from Circe
 +	version of this function.
 +	(erc-server-ping-timer-alist): New variable that keeps track of
 +	ping timers according to their associated server.
 +	(erc-server-last-received-time): New variable that specifies the
 +	time of the last message we received from the server.  This is
 +	used to detect hung processes.
 +	(erc-server-send-ping): New function that sends a ping to the IRC
 +	process corresponding with the given buffer.  Split from
 +	erc-server-setup-periodical-ping.  If the server buffer no longer
 +	exists, cancel the timer.  If the server process has not given us
 +	a message, including PING responses, since the last PING, kill it.
 +	This is necessary to deal with some aberrant freenode behavior.
 +	Idea taken from rcirc.
 +	(erc-server-setup-periodical-ping): Rename from
 +	erc-server-setup-periodical-server-ping.
 +	(erc-server-filter-function): Use erc-current-time instead of
 +	current-time.
 +
 +	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 +	multi-tty Emacs.
 +	(erc-select-startup-file): Fix bug introduced by recent change.
 +	(erc-cmd-QUIT): If the IRC process has not terminated itself
 +	within 4 seconds of completing our quit-hook, kill it manually.
 +	Freenode in particular needs this.
 +	(erc-connection-established): Use erc-server-setup-periodical-ping
 +	instead of erc-server-setup-periodical-server-ping.
 +
 +2006-08-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-standardize-name): New function that returns
 +	a filename that is safe for use for a log file.
 +	(erc-current-logfile): Use it.
 +
 +	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 +	since that is a fairly standard directory.
 +	(erc-select-startup-file): Re-write to use
 +	convert-standard-filename, which will ensure that MS-DOS systems
 +	look for the _ercrc.el file.
 +
 +2006-08-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.4.
 +
 +	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
 +
 +	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 +	to the wrong buffer.  Thanks to offby1 for the report.
 +
 +	* erc-backend.el (erc-coding-system-for-target): Handle case where
 +	target is nil.  Thanks to Kai Fan for the patch.
 +
 +2006-07-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 +	buffer.  It will be saved automatically killed.  Thanks to Johan
 +	Bockgård and Tassilo Horn for pointing this out.
 +
 +2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (define-erc-module): Make find-function and find-variable
 +	find the names constructed by `define-erc-module' in Emacs 22.
 +
 +2006-07-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (log): Make sure that we enable logging on
 +	already-opened buffers as well, in case the user toggles this
 +	module after loading ERC.  Also be sure to remove logging ability
 +	from all ERC buffers when the module is disabled.
 +	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 +	the empty string.  This should fix some errors that occur when
 +	quitting Emacs without first killing all ERC buffers.
 +	(erc-log-disable-logging): New function that removes the logging
 +	ability from the current buffer.
 +
 +	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
 +
 +2006-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 +	than call toggle-read-only.
 +
 +	* Makefile (debrelease-mwolson): Remove and consolidate with the
 +	`debrelease' target.
 +	(debrevision): Rename from `debrevision-mwolson'.
 +
 +	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
 +	add autoload cookie.
 +
 +2006-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.3.
 +
 +	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
 +
 +	* servers.pl: Add copyright notice.
 +
 +	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 +	from being set automatically away and current buffer is not an ERC
 +	buffer.
 +
 +	* erc-identd.el: Fix compiler error.
 +
 +	* erc.texi (Development): Use @subheading instead of @subsection.
 +	(Advanced Usage): Add menu.
 +	(Connecting): Fully document how to connect to an IRC server.
 +	(Options, Tips and Tricks, Sample Configuration): New unwritten
 +	sections.
 +
 +	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 +	(erc-user-full-name, erc-password): Docfixes and customization
 +	interface tweaks.
 +	(erc-try-new-nick-p): Rename from
 +	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 +	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 +	of `erc-nick-uniquifier', in case someone wants multiple
 +	characters.
 +	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 +	(erc-compute-port): Docfixes.
 +
 +	* FOR-RELEASE: Put in future-first order.
 +
 +	* erc-log.el (log): Move all add-hook calls here, rather than
 +	executing them immediately, and also cause them to be un-hooked
 +	when the module is removed.
 +	(erc-save-buffer-on-part): Move next to
 +	`erc-save-queries-on-quit'.
 +	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 +	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 +	nil.  This makes things fast, but reasonably failsafe, by default.
 +
 +2006-07-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 +	default, since most IRC clients don't do this.
 +	(erc-log-write-after-send): New option that determines whether the
 +	log file will be written to after every sent message.
 +	(erc-log-write-after-insert): New option that determines whether
 +	the log file will be written to when new text is added to a logged
 +	ERC buffer.
 +	(log): Use the aforementioned options.
 +
 +	* erc.texi (Modules): Document the "completion" module.
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 +	have a nil element in the list when ignore-self is non-nil.
 +
 +2006-07-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Use `set' instead of `set-default', since
 +	this setting should never be buffer-local.  Add the `list' and
 +	`page' modules to the list.
 +
 +	* erc.texi (Modules): Add entries for `list' and `page' modules.
 +	Change "spell" to "spelling".
 +	(History): Use past tense throughout.
 +
 +2006-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 +	can happen when doing /PART.
 +
 +	* erc.el (erc-quit-reason-various-alist)
 +	(erc-part-reason-various-alist): In the example, use "^$" as an
 +	example, since "" matches anything.
 +	(erc-quit-reason-various, erc-part-reason-various): If no argument
 +	is given, and no matches are found, use our default reason instead
 +	of "nil".
 +
 +2006-07-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd-start): XEmacs defines neither
 +	`make-network-process' nor `open-network-stream-server', so just
 +	fail silently.
 +
 +2006-06-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* HISTORY: Update.
 +
 +	* erc.texi (Modules): Mention identd.
 +	(Releases): Update mailing list address and download location.
 +	(Development): Refactor.  Provide updated directions for Arch.
 +	Make URLs clickable.
 +	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 +	(Getting Started): Give simpler example.  We do not need to
 +	explicitly load every module.
 +	(History): Update.
 +
 +	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 +	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 +	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 +	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 +	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 +	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 +	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 +	erc.el: Remove version strings.
 +
 +	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 +	module versions anymore.
 +	(erc-version-modules): Remove, since we do not use this function
 +	anymore.
 +	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 +	was only useful back when ERC consisted of one file.
 +	(erc-modules): Add line for identd.
 +	(erc-get-channel-mode-from-keypress): Typo fix.
 +
 +	* erc-imenu.el: Remove unnecessary lines in header.
 +
 +	* erc-goodies.el (erc-handle-irc-url): Docfix.
 +
 +	* erc-identd.el: Define an ERC module for this.
 +	(erc-identd-start): Don't create a process buffer if possible.
 +	Otherwise, use conventional hidden names for process buffers.
 +
 +2006-06-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-coding-system-for-target): Match
 +	case-insensitively.  Use a pattern match instead of `assoc', as
 +	per the documentation for `erc-encoding-coding-alist'.
 +
 +	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 +
 +2006-06-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Update maintainer information and URLs.
 +
 +2006-06-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (upload): Make this work with the GNU upload system.
 +
 +2006-06-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-active-buffer): If the active buffer has been
 +	deleted, default to the server buffer.
 +	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 +	control really toggle, not unconditionally turn off.
 +
 +2006-06-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add items since the 5.1.2 release.
 +
 +	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 +	indicates whether the current away status was caused by this
 +	module.
 +	(erc-autoaway-set-back): Only set back if this module set the user
 +	away.
 +	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 +	(erc-autoaway-reset-indicators): New function that resets some
 +	indicators when the user is no longer away.
 +	(autoaway): Add the above function to the 305 hook.
 +
 +2006-06-05  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc.texi (History): Fix various typos.
 +
 +2006-06-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 +	definition of the autoaway module.
 +	(autoaway): Don't do anything if erc-autoaway-idle-method is
 +	unbound.  This prevents an error on startup.
 +
 +2006-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 +	(erc-autoaway-idle-method): Renamed from
 +	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 +	how to do this, so it's best to make this take symbol values.
 +	Improve documentation.  Remove warning against Emacs idle-time;
 +	the point is moot now that we get user idle time via a different
 +	method.  Make sure we disable and re-enable the module when
 +	changing this value.
 +	(autoaway): Conditionalize on the above option.  If using the idle
 +	timer or user idle methods, don't add anything to the
 +	send-completed or server-001 hooks, since it is unnecessary.
 +	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 +	Docfix.
 +	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 +	(erc-autoaway-reset-idle-irc): Renamed from
 +	`erc-autoaway-reset-idle'.  Don't pass line to
 +	`erc-autoaway-set-away', since it is not used.
 +	(erc-autoaway-reset-idle-user): New function that resets the idle
 +	state for user idle time.
 +	(erc-autoaway-set-back): Remove line argument, since it is not
 +	used.
 +
 +	* Makefile (upload): Make this work for Savannah uploads.
 +
 +	* AUTHORS: Update for Savannah move.  No old entries have been
 +	removed, in case people have not registered yet on Savannah.
 +
 +2006-06-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 +	this are live.
 +
 +2006-05-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* README: Add License information.  Permit images to be used,
 +	distributed, and modified without restriction.
 +
 +2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
 +	a value for `url-irc-function'.
 +
 +2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 +	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 +	current nickname.  Doc fix.
 +	(pcomplete/erc-mode/complete-command): Don't complete the current
 +	nickname.
 +
 +2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 +	build date as it's shown in `emacs-version'.
 +
 +	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 +	with the same face property as the previous character.
 +
 +2006-04-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 +	erc.el: Make sure to include a newline inside of negated classes,
 +	so that a newline is not matched.
 +
 +2006-04-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-connect-function): Don't try to
 +	detect the existence of the `open-network-stream-nowait' function,
 +	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 +
 +2006-03-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.texi: Update direntry.  Remove unneeded local variables.
 +
 +2006-03-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-header-line): New face that will be used to colorize
 +	the text of the header-line, provided that
 +	`erc-header-line-face-method' is non-nil.
 +	(erc-prompt-face): Fix formatting.
 +	(erc-header-line-face-method): New option that determines the
 +	method used for colorizing header-line text.  This may be a
 +	function, nil, or non-nil.
 +	(erc-update-mode-line-buffer): Use the aforementioned option and
 +	face to colorize the header-line text, if that is what the user
 +	wants.
 +	(erc-send-input): If flood control is not activated, don't split
 +	the input line.
 +
 +2006-03-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 +	that fixes the case where there is no leading whitespace.  Only
 +	remove the first space character, though.
 +
 +	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 +	erc-identd-process is set properly.
 +	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 +	(erc-identd-start): Pass :host parameter so this works with Emacs
 +	22.
 +
 +2006-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Nelson Ferreira.  Change contact address.
 +
 +	* erc-bbdb.el: Install patch from Nelson Ferreira.
 +	(erc-bbdb-electric-p): New option that indicates whether to make
 +	the BBDB buffer electric.  Defaults to "not electric".
 +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
 +
 +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
 +	<C-tab> for `erc-button-previous' as it is a more standard key
 +	binding for this type of function.
 +
 +2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Removed things that were accidentally committed on
 +	2006-02-20.  Removed Todo section.
 +	(erc-capab-unidentified): Removed.
 +
 +2006-02-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 +	(erc-capab-unidentified): Fix compiler warning by specifying
 +	group.
 +
 +2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 +	to explain thoughts better.  `erc-server-parameters' is an
 +	associated list when it's set, not a string.
 +
 +2006-02-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +	parameters are strings before using them.  Thanks to Alejandro
 +	Benitez for the report.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.2.
 +
 +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +	<C-tab>.
 +	(erc-button-previous): New function.
 +
 +2006-02-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add category for ERC 5.2.
 +
 +	* erc.el (erc): Move to the end of the buffer when a continued
 +	session is detected.  Thanks to e1f and indio for the report and
 +	testing a potential fix.
 +
 +2006-02-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Prepare a new Debian package.
 +
 +	* Makefile (debprepare): New rule that creates an ERC snapshot
 +	directory for use in both new Debian releases and revisions for
 +	Debian packages.
 +	(debrelease, debrevision-mwolson): Use debprepare.
 +
 +	* NEWS: Bring up-to-date.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
 +	timestamps before rather than after erc-fill-column when
 +	erc-timestamp-right-column is nil.  This way we won't surprise
 +	anyone unpleasantly, or so it is hoped.
 +
 +2006-02-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 +
 +2006-02-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
 +	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
 +	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
 +	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
 +	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
 +	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
 +	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
 +	Add 2006 to copyright years, to comply with the changed guidelines.
 +
 +2006-02-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Handle erc-capab-identify
 +	correctly.  Make some requirements shorter, so that it's easier to
 +	see why they are needed.
 +
 +	* erc-capab.el: Add autoload cookie for capab-identify.
 +	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 +	Minor whitespace fix in code.
 +
 +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
 +	whether we are in Emacs 22, and using X.  Improve documentation.
 +	(erc-insert-aligned): Remove calculation of offset, since
 +	:align-to pos works after all.  Unlike the previous solution, this
 +	one works when erc-stamp.el is compiled.
 +	(erc-insert-timestamp-right): Don't add length of string, and then
 +	later remove its displayed width.  This puts timestamps after
 +	erc-fill-column when erc-timestamp-right-column is nil, rather
 +	than before it.  It also fixes a subtle bug.  Remove use of
 +	`current-window', since there is no variable by that name in
 +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
 +	`erc-fill-column' is non-nil before using it.
 +
 +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Define `list' module which sets the alias
 +	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 +	`erc-list-channels-simple' when disabled.
 +	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 +	(erc-list-channels-simple): New function.
 +
 +	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 +	`capab-identify' description.  Moved customization options left in
 +	source code.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 +
 +	* erc-capab.el: Put a little more detail into Usage section.
 +	(define-erc-module): Run `erc-capab-identify-setup' in all open
 +	server buffers when enabling.
 +	(erc-capab-identify-setup): Make PROC and PARSED optional
 +	arguments.
 +	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 +	should now also match nicknames that are formatted differently
 +	than the default.
 +
 +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 +	before calling `with-current-buffer'.
 +
 +2006-02-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debbuild): Split from debrelease.
 +	(debrevision-mwolson): New rule that causes a Debian revision to
 +	be built.
 +
 +	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 +	Johan Bockgård.
 +	(erc-modules): Change use of 'pcomplete to 'completion.
 +
 +2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Require erc.
 +	(erc-capab-send-identify-messages): Use `erc-server-send'.
 +	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 +	the flags so we can also check whether the `erc-identified' text
 +	property is there at all.
 +	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 +	This fixes a bug where the prefix wasn't inserted when timestamps
 +	are inserted on the right.  Tweaked nickname regexp.
 +	(erc-capab-find-parsed): New function.
 +	(erc-capab-get-unidentified-nickname): Updated to check for 0
 +	flag.  Only get nickname if there's a nickuserhost associated with
 +	this message.
 +
 +	* erc-capab.el: New file.  Adds the new module
 +	`erc-capab-identify', which allows flagging of unidentified users
 +	on servers running an ircd based on dancer - irc.freenode.net, for
 +	example.
 +
 +	* erc.el (erc-modules): Added `capab-identify' to options.
 +	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 +	(erc-version-string): Remove "(CVS)".
 +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
 +	connections work as expected.  Connecting with `open-tls-stream'
 +	only seems to work (if at all?) when using the tls.el located in
 +	lisp/net/ in Emacs22.
 +
 +	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved these functions to erc.el
 +	since they can be useful outside of the text matching module.
 +
 +	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 +	erc-services.el since the file name has changed.
 +
 +	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 +
 +	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 +	to "ERC".
 +
 +2006-02-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 +	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 +	the filenames in DOS.
 +
 +	* erc-goodies.el: Comment fix.
 +
 +	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 +	commentary.  Use define-erc-module so that it's possible to
 +	actually use this.
 +	(erc-hecomplete): Rename function from `erc-complete'.
 +	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 +
 +	* erc-join.el: Rename from erc-autojoin.el.
 +
 +	* erc-networks.el: Rename from erc-nets.el.
 +
 +	* erc-services.el: Rename from erc-nickserv.el.
 +
 +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
 +	the simpler `indent-to' function when
 +	`erc-timestamp-right-align-by-pixel' is nil.
 +	(erc-insert-timestamp-right): If the timestamp goes on the
 +	following line, don't add timestamp properties to the spaces in
 +	front of it.
 +
 +	* erc.el (erc-migrate-modules): New function that eases migration
 +	of module names.
 +	(erc-modules): Call erc-migrate-modules in the :get accessor.
 +	(erc-modules, erc-update-modules): Update for new modules names.
 +
 +2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* FOR-RELEASE: Added two things to do before the next release of
 +	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 +	the `C-c C-SPC' and `C-c C-@' global keybindings.
 +
 +2006-02-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
 +	directory correctly.
 +
 +	* debian/changelog: Update for 5.1.1 release.
 +
 +	* debian/control (Suggests): Suggest emacs-chess instead of
 +	Recommending it.  Thanks to Era Eriksson for the report.
 +
 +	* debian/maint/postinst: Install the Info documentation.
 +
 +	* debian/maint/prerm: Handle removing of Info documentation.
 +
 +	* debian/rules (configure, configure-stamp, build, build-stamp):
 +	Generate HTML and Info documentation.
 +	(binary-erc): Install HTML and Info documentation.
 +
 +	* erc-spelling.el (erc-spelling-init): If
 +	`erc-spelling-dictionaries' is nil, do not set
 +	ispell-local-dictionary.  Before, it was being set to nil, which
 +	was causing a long delay while the ispell process restarted.
 +	(erc-spelling-unhighlight-word): New function that removes
 +	flyspell properties from a spell-checked word.
 +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
 +	that have '/' before them.
 +
 +2006-02-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (VERSION): Update to 5.1.1.
 +
 +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
 +	that Emacs does in its NEWS file.
 +
 +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 +
 +	* erc-complete.el (erc-nick-completion-exclude-myself)
 +	(erc-try-complete-nick): Use better function for getting list of
 +	channel users.
 +
 +	* erc-goodies.el: Docfix.
 +
 +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 +	being treated properly.
 +
 +	* erc.texi (History): Note that ERC is now included with Emacs.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.1.
 +
 +2006-01-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el: Update copyright years.
 +
 +2006-01-30  Simon Josefsson  <jas@extundo.com>
 +
 +	* erc.el (erc-open-ssl-stream): Use tls.el.
 +
 +2006-01-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
 +	that determines whether to use pixel values to align right
 +	timestamps.  The default is not to do so, since it only works with
 +	Emacs22 on X, and even then some people have trouble.
 +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 +
 +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-viper.el: Ensure we only alter Viper's configuration when
 +	necessary, as Viper may already take ERC into account.
 +
 +2006-01-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
 +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
 +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
 +	variable.
 +	(erc-speedbar-goto-buffer): Fix compiler warning.
 +
 +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
 +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
 +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 +	work without compiler warnings.
 +
 +	* man/erc.texi (Obtaining ERC, Installation): Note that these
 +	sections may be skipped if using the version of ERC that comes
 +	with Emacs.
 +
  2006-01-28  Michael Olson  <mwolson@gnu.org>
  
 -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
 -	Space out copyright years like the rest of Emacs.  Use the Emacs
 -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
 -	IRC Client", since there are now several IRC clients for Emacs.
 +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
 +	guidelines.
  
 -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
 -	insert spaces instead of using special text property.
 +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
 +	the Emacs copyright statement.  Refer to ourselves as ERC rather
 +	than "Emacs IRC Client", since there are now several IRC clients
 +	for Emacs.
 +
 +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
 +
 +	* erc-ibuffer.el: Require 'erc.
 +
 +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
 +	it exists.
 +
 +	* erc-stamp.el (erc-insert-aligned): Only use the special text
 +	property when window-system is X.
 +
 +	* erc.texi (History): Note that ERC 5.1 is released.
  
  2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
  
diff --cc erc-ezbounce.el
index d04fe78,e6f359b..ea5afca
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@@ -126,7 -129,7 +126,7 @@@ in the alist is `nil', prompt for the a
  
  ;;;###autoload
  (defun erc-ezb-init-session-list (message)
--  "Reset the EZBounce session list to NIL."
++  "Reset the EZBounce session list to nil."
    (setq erc-ezb-session-list nil)
    (setq erc-ezb-inside-session-listing t))
  
@@@ -134,7 -137,7 +134,7 @@@
  (defun erc-ezb-end-of-session-list (message)
    "Indicate the end of the EZBounce session listing."
    (setq erc-ezb-inside-session-listing nil))
--  
++
  ;;;###autoload
  (defun erc-ezb-add-session (message)
    "Add an EZBounce session to the session list."
@@@ -157,7 -160,7 +157,7 @@@
  	     (read-from-minibuffer "IRC port: "
  				   (erc-port-to-string "6667")))))
        (erc-server-send (format "CONN %s %s" server port)))))
--    
++
  
  ;;;###autoload
  (defun erc-ezb-select-session ()
@@@ -173,7 -176,7 +173,7 @@@
  (defun erc-ezb-initialize ()
    "Add EZBouncer convenience functions to ERC."
    (add-hook 'erc-server-NOTICE-functions 'erc-ezb-notice-autodetect))
--	
++
  (provide 'erc-ezbounce)
  
  ;; arch-tag: e972aa7b-a9f4-4d16-a489-074ec7a1002e



From MAILER-DAEMON Wed Oct 17 10:36:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0M-00037i-S0
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRC-0006L7-KJ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRB-0006KI-UA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:50:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP5-00053l-4M
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
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@hcoop.net>) id 1IgvP1-0003zF-Cw
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:39 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvP0-00058E-LL
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvP0-0005yP-NW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvP0-0005yP-NW@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:34 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:09 -0400
Subject: [Erc-commit] [commit][emacs22] Merged from erc--emacs--22
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, 14 Oct 2007 04:50:51 -0000

commit 31ca5253503c210b9ed20a64291ef2bb9dcfb705
Merge: 0b75c8b... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Dec 8 04:45:02 2006 +0000

    Merged from erc--emacs--22
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-27
       Sync from Emacs 22
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-66

diff --cc ChangeLog
index 62ee2d3,cef3944..4b5b955
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,1099 -1,12 +1,1125 @@@
++2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
++
++	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
++	(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook)
++	(erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer)
++	(erc-modules, erc-display-message-highlight, erc-process-input-line)
++	(erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers)
++	(erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers)
++	(erc-echo-notice-in-first-user-buffer, erc-connection-established)
++	(erc-update-user-nick, erc-update-channel-member, erc-highlight-notice)
++	(erc-command-symbol, erc-add-query, erc-process-script-line)
++	(erc-determine-parameters, erc-client-info, erc-popup-input-buffer):
++	(erc-script-echo): Fix typos in docstrings.
++	(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list)
++	(define-erc-module, erc-once-with-server-event)
++	(erc-once-with-server-event-global, erc-debug-irc-protocol)
++	(erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user)
++	(erc-update-current-channel-member, erc-load-script):
++	(erc-mode-line-away-status-format): Doc fixes.
++
 +2006-11-20  Andrea Russo  <rastandy@inventati.org>
 +
 +	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
 +	before calling `erc-display-prompt'.
 +
 +2006-11-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Display better error message when
 +	module not found.
 +
++2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
++
++	* erc.el (erc-after-connect, erc-open-ssl-stream)
++	(erc-display-line-1, erc-display-line):
++	* erc-backend.el (005): Fix space/tab mixup in docstrings.
++
 +2006-11-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el: Save all log buffers when Emacs exits, in case
 +	someone ignores the warning about open processes.  Remove the
 +	advice code in the commentary.
 +	(erc-save-query-buffers): Docfix.
 +	(erc-log-save-all-buffers): New function that saves all ERC
 +	buffers to logs.
 +	(erc-current-logfile): Fix bug in filename selection, where the
 +	current buffer was erroneously being preferred over the given
 +	buffer.
 +
 +2006-11-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-string-to-port): Avoid error when a numerical port
 +	is passed.  Thanks to Zekeriya KOÇ for the report.
 +
 +2006-11-08  Łukasz Demianiuk  <ldemianiuk@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-header-line): Fix typo.
 +
 +2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
 +
 +	* erc.el (read-passwd):
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
 +	* erc-truncate.el (truncate): Fix typo in docstring.
 +
 +2006-10-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
 +	first loading iswitchb.  Thanks to Leo for the report.
 +
 +2006-10-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-default-port): Make the default be 6667 instead of
 +	ircd. since Mac OS X apparently has problems with looking up that
 +	port name.
 +
 +	* erc-backend.el (353): Receive names after displaying the initial
 +	message, instead of before.
 +
 +2006-10-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-my-nick-face): New face.
 +	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
 +	fixes a bug where the :full-name argument passed to the function
 +	was not respected.
 +	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
 +	make it easier to find messages you sent in conversations when
 +	`erc-show-my-nick' is non-nil.
 +	(erc-compute-server): Doc fix.
 +
 +2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
 +	from the erc-timestamp field.
 +
 +2006-09-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
 +	parenthesis.  Thanks to Stephan Stahl for the report.
 +
 +2006-09-10  Eric Hanchrow  <offby1@blarg.net>
 +
 +	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
 +	instead of a single user.
 +
 +2006-09-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-generate-new-buffer-name): If this is a server
 +	buffer and a process exists already, create a new buffer.
 +	(erc-open): If the IRC session was continued, restore the old
 +	point.  Thanks to Stephan Stahl for the report.
 +	(erc-member-ignore-case): Coding style tweak.
 +	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
 +	find the user listed verbatim, try to match them against the list
 +	using string-match.  In this case, prompt as to whether the regexp
 +	should be removed.
 +	(erc-ignored-user-p): Remove CL-ism.
 +
 +	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
 +	whether we are already away.
 +
 +	* erc-menu.el: Fix potential compiler warning.
 +
 +2006-09-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: Updated Commentary and URL.
 +	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
 +	(erc-arrange-session-in-multiple-windows): No need to check if
 +	`erc-server-process' is bound.
 +	(erc-server-buffer-live-p): Doc fix.
 +	(erc-part-from-channel): Don't use any initial contents at prompt.
 +	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
 +	(s367): Fixed to support only banmask and channel which is the
 +	standard.  Also, there's no reason to add a message to each banned
 +	user entry trying to persuade the user to use /banlist instead of
 +	/mode #channel +b.  That part of the message was a little
 +	confusing, anyways.
 +	(s367-set-by): New catalog entry.  The user who set the ban and
 +	the time of ban seem to be specific to only certain servers such
 +	as freenode.
 +
 +	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
 +
 +	* erc-backend.el (erc-server-process-alive): No need to check if
 +	`erc-server-process' is bound.
 +	(367): Use s367 or s367-set-by where appropriate.
 +
 +	* erc-compat.el: Fixed URL.
 +
 +	* erc-dcc.el: Updated copyright years.  Added Usage section.
 +	Changed supported Emacs version number from 21.3.50 to 22 in
 +	Commentary.
 +
 +	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
 +	to check if `erc-server-process' is bound.
 +
 +	* erc-nicklist.el: Added to the Commentary section an explanation
 +	that `erc-nicklist-quit' should be called from within the nicklist
 +	buffer.  Set file coding to utf-8 so a contributor's name is
 +	displayed correctly.
 +	(erc-nicklist-icons-directory): Use customize type directory
 +	instead of string.
 +	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
 +	if it wasn't found.  This fixes a bug where an error would occur
 +	when using `string=' on bbdb-nick if it was nil.
 +
 +	* erc-replace.el: Removed URL from file information since it
 +	doesn't exist.
 +
 +	* erc-sound.el: Updated copyright years.  Fixed Commentary and
 +	added Usage section.
 +	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
 +	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
 +	definitions.
 +	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
 +	(erc-ctcp-query-SOUND): Doc fix.
 +	(erc-play-command): Removed, not necessary anymore.
 +	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
 +	higher in code, added docstring.
 +	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
 +	as well since version 21 or earlier.  Removed commented-out older
 +	version of function.
 +
 +	* NEWS: Fixed formatting, added channel tracking change.
 +
 +	* README: Fixed typo.  Added more information to Installation
 +	section.  Updated URL.
 +
 +2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: M-x erc RET can now be used to start ERC.
 +	(erc-open): Renamed from `erc'.
 +	(erc-before-connect): Change erc-select to erc.
 +	(erc): Renamed from `erc-select'.  Use `erc-open'.
 +	(erc-select): Defined as alias of `erc'.
 +	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
 +	(erc-select-ssl): Defined as alias of `erc-ssl'.
 +	(erc-cmd-SERVER): Use `erc'.
 +	(erc-query, erc-handle-irc-url): Use `erc-open'.
 +
 +	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc'.
 +
 +	* erc-networks.el: Updated copyright years.
 +	(erc-server-select): Use keyword arguments when calling `erc'.
 +
 +	* erc.texi (Getting Started, Connecting): Changed erc-select to
 +	erc.
 +
 +	* README: Changed erc-select to erc.
 +
 +	* NEWS: Added note about these changes.
 +
 +	* FOR-RELEASE: Marked this item as done.
 +
 +2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
 +	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
 +	properties to channel name.
 +
 +2006-08-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd): New customization group.
 +	(erc-identd-port): New option that specifies the port to use if
 +	none is given as an argument to erc-identd-start.
 +	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
 +	instead of erc-identd-start so that we deal with the different
 +	meaning of the first argument.
 +	(erc-identd-start): Use erc-identd-port.
 +	(erc-identd-quickstart): New function that ignores any arguments
 +	and calls erc-identd-start.
 +
 +	* erc.el (erc-with-server-buffer): New macro that switches to the
 +	current ERC server buffer and runs some code.  If no server buffer
 +	is available, return nil.  This is a useful way to access
 +	variables in the server buffer.
 +	(erc-get-server-user, erc-add-server-user)
 +	(erc-remove-server-user, erc-change-user-nickname)
 +	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
 +	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
 +	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
 +	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
 +	(erc-format-channel-modes): Use it.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
 +	instead of gensym.
 +	(erc-open-server-buffer-p): New function that returns non-nil if
 +	the given buffer is an ERC server buffer that has an open IRC
 +	process.
 +	(erc-with-buffer): Use buffer-live-p here to set a good example,
 +	though it isn't really needed here.
 +	(erc-away): Mention erc-away-time.
 +	(erc): Don't propagate the erc-away setting, since it makes more
 +	sense to access it from the server buffer.  Set up the prompt
 +	before connecting rather than after.  Run erc-connect-pre-hook
 +	with the buffer as an argument, instead of no arguments.
 +	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
 +	erc-server-buffer-p so that only open connections are set away.
 +	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
 +	(erc-process-away): Docfix.  Don't set erc-away in channel
 +	buffers.
 +	(erc-set-current-nick): Make this uniform with the style used in
 +	erc-current-nick.
 +	(erc-away-time): Rename from erc-away-p, since this is no longer a
 +	boolean-style predicate.
 +	(erc-format-away-status): Use it.
 +	(erc-initialize-log-marker): Accept a `buffer' argument.
 +	(erc-connect-pre-hook): Docfix.
 +	(erc-connection-established): Make sure this runs in the correct
 +	buffer.
 +	(erc-set-initial-user-mode): Accept a `buffer' argument.
 +
 +	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
 +
 +	* erc-spelling.el (erc-spelling-init): Use
 +	erc-with-server-buffer.  Accept `buffer' argument.
 +	(spelling): Call erc-spelling-init with the `buffer' argument.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
 +	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
 +
 +	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
 +	erc-with-server-buffer.
 +
 +	* erc-networks.el (erc-network, erc-current-network)
 +	(erc-network-name): Use erc-with-server-buffer.
 +
 +	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
 +
 +	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
 +	erc-away-time.
 +
 +	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
 +	Pass `buffer' argument to erc-log-setup-logging instead of setting
 +	the current buffer.  Ditto for erc-log-disable-logging.
 +	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
 +	argument.
 +
 +	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
 +
 +	* erc-ibuffer.el (erc-away): Use erc-away-time.
 +
 +	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
 +	read only instead of permanently doing so.
 +
 +	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
 +	Emacs Lisp has make-symbol, which is better.
 +
 +	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
 +	erc-with-server-buffer.
 +
 +	* erc-capab.el (capab-identify): Only deal with server buffers
 +	that have an open IRC process.
 +	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
 +
 +	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
 +	`erc-server-process-alive' function.
 +	(erc-coding-system-for-target): Supply a default target if one is
 +	not given.
 +	(erc-server-send): Simplify slightly.
 +	(erc-call-hooks): Use erc-with-server-buffer.
 +	(erc-server-connect, erc-server-setup-periodical-ping): Accept
 +	`buffer' argument.
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
 +	higher to avoid an automatic load snafu.
 +	(erc-autoaway-some-server-buffer): New function that returns an
 +	ERC server buffer with a live connection, or nil otherwise.
 +	(erc-autoaway-insinuate-maybe): New function that adds the
 +	autoaway reset function to post-command-hook if at least one ERC
 +	process is alive.
 +	(erc-autoaway-remove-maybe): New function that removes the
 +	autoaway reset function from post-command-hook if no ERC process
 +	is alive.
 +	(autoaway): Don't touch post-command-hook unless an IRC process is
 +	already open.  Remove our addition to post-command-hook as soon as
 +	there are no more IRC processes open.  Reset the indicators before
 +	connecting to an IRC server, which fixes a bug when re-connecting.
 +	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
 +	there are no more IRC processes open.
 +	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
 +	argument which is a function call if we can't find one.
 +	(erc-autoaway-some-open-server-buffer): New function which returns
 +	an ERC server buffer with an open connection and a user that is
 +	not away.
 +	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
 +	(erc-autoaway-set-away): Accept a `notest' argument which is used
 +	to avoid testing the same thing twice.
 +	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
 +	higher in file to fix byte-compile warning.
 +
 +2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
 +	`erc-server-reconnect-p' check all condition cases.
 +	(erc-server-reconnect-p): Moved rest of checks from
 +	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
 +
 +2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
 +	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
 +	avoid confusion with rcirc and other clients.
 +
 +	* erc-backend.el (erc-server-banned): New variable.
 +	(erc-server-connect): Set `erc-server-banned' to nil.
 +	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
 +	(erc-server-reconnect-p): New function.  Return non-nil if the
 +	user wants automatic reconnects and if the user has not been
 +	banned from the server.  This should fix a bug where ERC gets into
 +	a loop trying to reconnect with no way to stop it when the user is
 +	denied access to the server due to a server ban.  It might also
 +	help when Tor users are blocked from freenode if freenode servers
 +	send the 465 message before disconnecting.
 +	(465): Handle "banned from server" error notices.
 +
 +2006-08-13  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
 +	prompt with a space.
 +
 +2006-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-timed-out): New variable that
 +	indicates whether the current connection has timed out due to
 +	failure to respond to a ping.
 +	(erc-server-send-ping): Set erc-server-timed-out to t.
 +	(erc-server-connect): Initialize erc-server-timed-out to nil.
 +	(erc-process-sentinel-1): Consult erc-server-timed-out.
 +
 +2006-08-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
 +	avoid errors when inserting disconnect messages and other messages
 +	that begin with newlines.
 +
 +2006-08-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
 +	in several places instead of inserting text.
 +	(erc-process-sentinel): Move to the input-marker before removing
 +	the prompt.
 +
 +	* erc.el (erc-port): Fix customization options.
 +	(erc-display-message): Handle null type explicitly.  Previously,
 +	this was relying on a chance side-effect.  Cosmetic indentation
 +	tweak.
 +	(english): Add 'finished and 'terminated entries to the catalog.
 +	Add initial and terminal newlines to 'disconnected and
 +	'disconnected-noreconnect entries.  Avoid long lines.
 +	(erc-cmd-QUIT): Bind the current erc-server-process to
 +	server-proc.  If the IRC server responds quickly, it is possible
 +	for the connection to close, and hence server buffer to be killed,
 +	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
 +	problem.
 +
 +2006-08-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-send-queue): Update from Circe
 +	version of this function.
 +	(erc-server-ping-timer-alist): New variable that keeps track of
 +	ping timers according to their associated server.
 +	(erc-server-last-received-time): New variable that specifies the
 +	time of the last message we received from the server.  This is
 +	used to detect hung processes.
 +	(erc-server-send-ping): New function that sends a ping to the IRC
 +	process corresponding with the given buffer.  Split from
 +	erc-server-setup-periodical-ping.  If the server buffer no longer
 +	exists, cancel the timer.  If the server process has not given us
 +	a message, including PING responses, since the last PING, kill it.
 +	This is necessary to deal with some aberrant freenode behavior.
 +	Idea taken from rcirc.
 +	(erc-server-setup-periodical-ping): Rename from
 +	erc-server-setup-periodical-server-ping.
 +	(erc-server-filter-function): Use erc-current-time instead of
 +	current-time.
 +
 +	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 +	multi-tty Emacs.
 +	(erc-select-startup-file): Fix bug introduced by recent change.
 +	(erc-cmd-QUIT): If the IRC process has not terminated itself
 +	within 4 seconds of completing our quit-hook, kill it manually.
 +	Freenode in particular needs this.
 +	(erc-connection-established): Use erc-server-setup-periodical-ping
 +	instead of erc-server-setup-periodical-server-ping.
 +
 +2006-08-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-standardize-name): New function that returns
 +	a filename that is safe for use for a log file.
 +	(erc-current-logfile): Use it.
 +
 +	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 +	since that is a fairly standard directory.
 +	(erc-select-startup-file): Re-write to use
 +	convert-standard-filename, which will ensure that MS-DOS systems
 +	look for the _ercrc.el file.
 +
 +2006-08-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.4.
 +
 +	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
 +
 +	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 +	to the wrong buffer.  Thanks to offby1 for the report.
 +
 +	* erc-backend.el (erc-coding-system-for-target): Handle case where
 +	target is nil.  Thanks to Kai Fan for the patch.
 +
 +2006-07-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 +	buffer.  It will be saved automatically killed.  Thanks to Johan
 +	Bockgård and Tassilo Horn for pointing this out.
 +
 +2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (define-erc-module): Make find-function and find-variable
 +	find the names constructed by `define-erc-module' in Emacs 22.
 +
 +2006-07-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (log): Make sure that we enable logging on
 +	already-opened buffers as well, in case the user toggles this
 +	module after loading ERC.  Also be sure to remove logging ability
 +	from all ERC buffers when the module is disabled.
 +	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 +	the empty string.  This should fix some errors that occur when
 +	quitting Emacs without first killing all ERC buffers.
 +	(erc-log-disable-logging): New function that removes the logging
 +	ability from the current buffer.
 +
 +	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
 +
 +2006-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 +	than call toggle-read-only.
 +
 +	* Makefile (debrelease-mwolson): Remove and consolidate with the
 +	`debrelease' target.
 +	(debrevision): Rename from `debrevision-mwolson'.
 +
 +	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
 +	add autoload cookie.
 +
 +2006-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.3.
 +
 +	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
 +
 +	* servers.pl: Add copyright notice.
 +
 +	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 +	from being set automatically away and current buffer is not an ERC
 +	buffer.
 +
 +	* erc-identd.el: Fix compiler error.
 +
 +	* erc.texi (Development): Use @subheading instead of @subsection.
 +	(Advanced Usage): Add menu.
 +	(Connecting): Fully document how to connect to an IRC server.
 +	(Options, Tips and Tricks, Sample Configuration): New unwritten
 +	sections.
 +
 +	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 +	(erc-user-full-name, erc-password): Docfixes and customization
 +	interface tweaks.
 +	(erc-try-new-nick-p): Rename from
 +	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 +	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 +	of `erc-nick-uniquifier', in case someone wants multiple
 +	characters.
 +	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 +	(erc-compute-port): Docfixes.
 +
 +	* FOR-RELEASE: Put in future-first order.
 +
 +	* erc-log.el (log): Move all add-hook calls here, rather than
 +	executing them immediately, and also cause them to be un-hooked
 +	when the module is removed.
 +	(erc-save-buffer-on-part): Move next to
 +	`erc-save-queries-on-quit'.
 +	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 +	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 +	nil.  This makes things fast, but reasonably failsafe, by default.
 +
 +2006-07-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 +	default, since most IRC clients don't do this.
 +	(erc-log-write-after-send): New option that determines whether the
 +	log file will be written to after every sent message.
 +	(erc-log-write-after-insert): New option that determines whether
 +	the log file will be written to when new text is added to a logged
 +	ERC buffer.
 +	(log): Use the aforementioned options.
 +
 +	* erc.texi (Modules): Document the "completion" module.
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 +	have a nil element in the list when ignore-self is non-nil.
 +
 +2006-07-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Use `set' instead of `set-default', since
 +	this setting should never be buffer-local.  Add the `list' and
 +	`page' modules to the list.
 +
 +	* erc.texi (Modules): Add entries for `list' and `page' modules.
 +	Change "spell" to "spelling".
 +	(History): Use past tense throughout.
 +
 +2006-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 +	can happen when doing /PART.
 +
 +	* erc.el (erc-quit-reason-various-alist)
 +	(erc-part-reason-various-alist): In the example, use "^$" as an
 +	example, since "" matches anything.
 +	(erc-quit-reason-various, erc-part-reason-various): If no argument
 +	is given, and no matches are found, use our default reason instead
 +	of "nil".
 +
 +2006-07-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd-start): XEmacs defines neither
 +	`make-network-process' nor `open-network-stream-server', so just
 +	fail silently.
 +
 +2006-06-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* HISTORY: Update.
 +
 +	* erc.texi (Modules): Mention identd.
 +	(Releases): Update mailing list address and download location.
 +	(Development): Refactor.  Provide updated directions for Arch.
 +	Make URLs clickable.
 +	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 +	(Getting Started): Give simpler example.  We do not need to
 +	explicitly load every module.
 +	(History): Update.
 +
 +	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 +	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 +	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 +	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 +	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 +	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 +	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 +	erc.el: Remove version strings.
 +
 +	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 +	module versions anymore.
 +	(erc-version-modules): Remove, since we do not use this function
 +	anymore.
 +	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 +	was only useful back when ERC consisted of one file.
 +	(erc-modules): Add line for identd.
 +	(erc-get-channel-mode-from-keypress): Typo fix.
 +
 +	* erc-imenu.el: Remove unnecessary lines in header.
 +
 +	* erc-goodies.el (erc-handle-irc-url): Docfix.
 +
 +	* erc-identd.el: Define an ERC module for this.
 +	(erc-identd-start): Don't create a process buffer if possible.
 +	Otherwise, use conventional hidden names for process buffers.
 +
 +2006-06-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-coding-system-for-target): Match
 +	case-insensitively.  Use a pattern match instead of `assoc', as
 +	per the documentation for `erc-encoding-coding-alist'.
 +
 +	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 +
 +2006-06-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Update maintainer information and URLs.
 +
 +2006-06-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (upload): Make this work with the GNU upload system.
 +
 +2006-06-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-active-buffer): If the active buffer has been
 +	deleted, default to the server buffer.
 +	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 +	control really toggle, not unconditionally turn off.
 +
 +2006-06-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add items since the 5.1.2 release.
 +
 +	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 +	indicates whether the current away status was caused by this
 +	module.
 +	(erc-autoaway-set-back): Only set back if this module set the user
 +	away.
 +	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 +	(erc-autoaway-reset-indicators): New function that resets some
 +	indicators when the user is no longer away.
 +	(autoaway): Add the above function to the 305 hook.
 +
 +2006-06-05  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc.texi (History): Fix various typos.
 +
 +2006-06-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 +	definition of the autoaway module.
 +	(autoaway): Don't do anything if erc-autoaway-idle-method is
 +	unbound.  This prevents an error on startup.
 +
 +2006-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 +	(erc-autoaway-idle-method): Renamed from
 +	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 +	how to do this, so it's best to make this take symbol values.
 +	Improve documentation.  Remove warning against Emacs idle-time;
 +	the point is moot now that we get user idle time via a different
 +	method.  Make sure we disable and re-enable the module when
 +	changing this value.
 +	(autoaway): Conditionalize on the above option.  If using the idle
 +	timer or user idle methods, don't add anything to the
 +	send-completed or server-001 hooks, since it is unnecessary.
 +	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 +	Docfix.
 +	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 +	(erc-autoaway-reset-idle-irc): Renamed from
 +	`erc-autoaway-reset-idle'.  Don't pass line to
 +	`erc-autoaway-set-away', since it is not used.
 +	(erc-autoaway-reset-idle-user): New function that resets the idle
 +	state for user idle time.
 +	(erc-autoaway-set-back): Remove line argument, since it is not
 +	used.
 +
 +	* Makefile (upload): Make this work for Savannah uploads.
 +
 +	* AUTHORS: Update for Savannah move.  No old entries have been
 +	removed, in case people have not registered yet on Savannah.
 +
 +2006-06-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 +	this are live.
 +
 +2006-05-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* README: Add License information.  Permit images to be used,
 +	distributed, and modified without restriction.
 +
 +2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
 +	a value for `url-irc-function'.
 +
 +2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 +	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 +	current nickname.  Doc fix.
 +	(pcomplete/erc-mode/complete-command): Don't complete the current
 +	nickname.
 +
 +2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 +	build date as it's shown in `emacs-version'.
 +
 +	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 +	with the same face property as the previous character.
 +
 +2006-04-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 +	erc.el: Make sure to include a newline inside of negated classes,
 +	so that a newline is not matched.
 +
 +2006-04-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-connect-function): Don't try to
 +	detect the existence of the `open-network-stream-nowait' function,
 +	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 +
 +2006-03-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.texi: Update direntry.  Remove unneeded local variables.
 +
 +2006-03-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-header-line): New face that will be used to colorize
 +	the text of the header-line, provided that
 +	`erc-header-line-face-method' is non-nil.
 +	(erc-prompt-face): Fix formatting.
 +	(erc-header-line-face-method): New option that determines the
 +	method used for colorizing header-line text.  This may be a
 +	function, nil, or non-nil.
 +	(erc-update-mode-line-buffer): Use the aforementioned option and
 +	face to colorize the header-line text, if that is what the user
 +	wants.
 +	(erc-send-input): If flood control is not activated, don't split
 +	the input line.
 +
 +2006-03-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 +	that fixes the case where there is no leading whitespace.  Only
 +	remove the first space character, though.
 +
 +	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 +	erc-identd-process is set properly.
 +	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 +	(erc-identd-start): Pass :host parameter so this works with Emacs
 +	22.
 +
 +2006-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Nelson Ferreira.  Change contact address.
 +
 +	* erc-bbdb.el: Install patch from Nelson Ferreira.
 +	(erc-bbdb-electric-p): New option that indicates whether to make
 +	the BBDB buffer electric.  Defaults to "not electric".
 +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
 +
 +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
 +	<C-tab> for `erc-button-previous' as it is a more standard key
 +	binding for this type of function.
 +
 +2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Removed things that were accidentally committed on
 +	2006-02-20.  Removed Todo section.
 +	(erc-capab-unidentified): Removed.
 +
 +2006-02-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 +	(erc-capab-unidentified): Fix compiler warning by specifying
 +	group.
 +
 +2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 +	to explain thoughts better.  `erc-server-parameters' is an
 +	associated list when it's set, not a string.
 +
 +2006-02-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +	parameters are strings before using them.  Thanks to Alejandro
 +	Benitez for the report.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.2.
 +
 +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +	<C-tab>.
 +	(erc-button-previous): New function.
 +
 +2006-02-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add category for ERC 5.2.
 +
 +	* erc.el (erc): Move to the end of the buffer when a continued
 +	session is detected.  Thanks to e1f and indio for the report and
 +	testing a potential fix.
 +
 +2006-02-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Prepare a new Debian package.
 +
 +	* Makefile (debprepare): New rule that creates an ERC snapshot
 +	directory for use in both new Debian releases and revisions for
 +	Debian packages.
 +	(debrelease, debrevision-mwolson): Use debprepare.
 +
 +	* NEWS: Bring up-to-date.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
 +	timestamps before rather than after erc-fill-column when
 +	erc-timestamp-right-column is nil.  This way we won't surprise
 +	anyone unpleasantly, or so it is hoped.
 +
 +2006-02-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 +
 +2006-02-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
 +	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
 +	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
 +	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
 +	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
 +	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
 +	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
 +	Add 2006 to copyright years, to comply with the changed guidelines.
 +
 +2006-02-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Handle erc-capab-identify
 +	correctly.  Make some requirements shorter, so that it's easier to
 +	see why they are needed.
 +
 +	* erc-capab.el: Add autoload cookie for capab-identify.
 +	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 +	Minor whitespace fix in code.
 +
 +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
 +	whether we are in Emacs 22, and using X.  Improve documentation.
 +	(erc-insert-aligned): Remove calculation of offset, since
 +	:align-to pos works after all.  Unlike the previous solution, this
 +	one works when erc-stamp.el is compiled.
 +	(erc-insert-timestamp-right): Don't add length of string, and then
 +	later remove its displayed width.  This puts timestamps after
 +	erc-fill-column when erc-timestamp-right-column is nil, rather
 +	than before it.  It also fixes a subtle bug.  Remove use of
 +	`current-window', since there is no variable by that name in
 +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
 +	`erc-fill-column' is non-nil before using it.
 +
 +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Define `list' module which sets the alias
 +	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 +	`erc-list-channels-simple' when disabled.
 +	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 +	(erc-list-channels-simple): New function.
 +
 +	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 +	`capab-identify' description.  Moved customization options left in
 +	source code.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 +
 +	* erc-capab.el: Put a little more detail into Usage section.
 +	(define-erc-module): Run `erc-capab-identify-setup' in all open
 +	server buffers when enabling.
 +	(erc-capab-identify-setup): Make PROC and PARSED optional
 +	arguments.
 +	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 +	should now also match nicknames that are formatted differently
 +	than the default.
 +
 +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 +	before calling `with-current-buffer'.
 +
 +2006-02-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debbuild): Split from debrelease.
 +	(debrevision-mwolson): New rule that causes a Debian revision to
 +	be built.
 +
 +	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 +	Johan Bockgård.
 +	(erc-modules): Change use of 'pcomplete to 'completion.
 +
 +2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Require erc.
 +	(erc-capab-send-identify-messages): Use `erc-server-send'.
 +	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 +	the flags so we can also check whether the `erc-identified' text
 +	property is there at all.
 +	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 +	This fixes a bug where the prefix wasn't inserted when timestamps
 +	are inserted on the right.  Tweaked nickname regexp.
 +	(erc-capab-find-parsed): New function.
 +	(erc-capab-get-unidentified-nickname): Updated to check for 0
 +	flag.  Only get nickname if there's a nickuserhost associated with
 +	this message.
 +
 +	* erc-capab.el: New file.  Adds the new module
 +	`erc-capab-identify', which allows flagging of unidentified users
 +	on servers running an ircd based on dancer - irc.freenode.net, for
 +	example.
 +
 +	* erc.el (erc-modules): Added `capab-identify' to options.
 +	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 +	(erc-version-string): Remove "(CVS)".
 +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
 +	connections work as expected.  Connecting with `open-tls-stream'
 +	only seems to work (if at all?) when using the tls.el located in
 +	lisp/net/ in Emacs22.
 +
 +	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved these functions to erc.el
 +	since they can be useful outside of the text matching module.
 +
 +	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 +	erc-services.el since the file name has changed.
 +
 +	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 +
 +	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 +	to "ERC".
 +
 +2006-02-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 +	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 +	the filenames in DOS.
 +
 +	* erc-goodies.el: Comment fix.
 +
 +	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 +	commentary.  Use define-erc-module so that it's possible to
 +	actually use this.
 +	(erc-hecomplete): Rename function from `erc-complete'.
 +	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 +
 +	* erc-join.el: Rename from erc-autojoin.el.
 +
 +	* erc-networks.el: Rename from erc-nets.el.
 +
 +	* erc-services.el: Rename from erc-nickserv.el.
 +
 +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
 +	the simpler `indent-to' function when
 +	`erc-timestamp-right-align-by-pixel' is nil.
 +	(erc-insert-timestamp-right): If the timestamp goes on the
 +	following line, don't add timestamp properties to the spaces in
 +	front of it.
 +
 +	* erc.el (erc-migrate-modules): New function that eases migration
 +	of module names.
 +	(erc-modules): Call erc-migrate-modules in the :get accessor.
 +	(erc-modules, erc-update-modules): Update for new modules names.
 +
 +2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* FOR-RELEASE: Added two things to do before the next release of
 +	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 +	the `C-c C-SPC' and `C-c C-@' global keybindings.
 +
 +2006-02-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
 +	directory correctly.
 +
 +	* debian/changelog: Update for 5.1.1 release.
 +
 +	* debian/control (Suggests): Suggest emacs-chess instead of
 +	Recommending it.  Thanks to Era Eriksson for the report.
 +
 +	* debian/maint/postinst: Install the Info documentation.
 +
 +	* debian/maint/prerm: Handle removing of Info documentation.
 +
 +	* debian/rules (configure, configure-stamp, build, build-stamp):
 +	Generate HTML and Info documentation.
 +	(binary-erc): Install HTML and Info documentation.
 +
 +	* erc-spelling.el (erc-spelling-init): If
 +	`erc-spelling-dictionaries' is nil, do not set
 +	ispell-local-dictionary.  Before, it was being set to nil, which
 +	was causing a long delay while the ispell process restarted.
 +	(erc-spelling-unhighlight-word): New function that removes
 +	flyspell properties from a spell-checked word.
 +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
 +	that have '/' before them.
 +
 +2006-02-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (VERSION): Update to 5.1.1.
 +
 +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
 +	that Emacs does in its NEWS file.
 +
 +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 +
 +	* erc-complete.el (erc-nick-completion-exclude-myself)
 +	(erc-try-complete-nick): Use better function for getting list of
 +	channel users.
 +
 +	* erc-goodies.el: Docfix.
 +
 +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 +	being treated properly.
 +
 +	* erc.texi (History): Note that ERC is now included with Emacs.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.1.
 +
 +2006-01-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el: Update copyright years.
 +
 +2006-01-30  Simon Josefsson  <jas@extundo.com>
 +
 +	* erc.el (erc-open-ssl-stream): Use tls.el.
 +
 +2006-01-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
 +	that determines whether to use pixel values to align right
 +	timestamps.  The default is not to do so, since it only works with
 +	Emacs22 on X, and even then some people have trouble.
 +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 +
 +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-viper.el: Ensure we only alter Viper's configuration when
 +	necessary, as Viper may already take ERC into account.
 +
 +2006-01-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
 +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
 +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
 +	variable.
 +	(erc-speedbar-goto-buffer): Fix compiler warning.
 +
 +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
 +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
 +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 +	work without compiler warnings.
 +
 +	* man/erc.texi (Obtaining ERC, Installation): Note that these
 +	sections may be skipped if using the version of ERC that comes
 +	with Emacs.
 +
  2006-01-28  Michael Olson  <mwolson@gnu.org>
  
 -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
 -	Space out copyright years like the rest of Emacs.  Use the Emacs
 -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
 -	IRC Client", since there are now several IRC clients for Emacs.
 +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
 +	guidelines.
 +
 +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
 +	the Emacs copyright statement.  Refer to ourselves as ERC rather
 +	than "Emacs IRC Client", since there are now several IRC clients
 +	for Emacs.
 +
 +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
  
 -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
 -	insert spaces instead of using special text property.
 +	* erc-ibuffer.el: Require 'erc.
 +
 +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
 +	it exists.
 +
 +	* erc-stamp.el (erc-insert-aligned): Only use the special text
 +	property when window-system is X.
 +
 +	* erc.texi (History): Note that ERC 5.1 is released.
  
  2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
  
diff --cc ChangeLog.01
index 5d6bdf8,0000000..79d487d
mode 100644,000000..100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@@ -1,1046 -1,0 +1,1046 @@@
 +2001-12-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.176: * Added missing 747 numreply (banned)
 +
 +2001-12-15  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/scripts/install 1.4, debian/rules 1.6:
 +	updated to 2.1.cvs.20011215-1
 +
 +	* debian/changelog 1.12: Debian version 2.1.cvs.20011215-1
 +
 +2001-12-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.175:
 +	* applied a nicer version of mhp's patch to remove the last prompt from
 +	  saved logs
 +
 +	* erc-replace.el 1.1: * Initial checkin
 +
 +2001-12-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.174:
 +	* fixed bug triggered when reuse-buffer was enabled (the default).
 +	  Another silly port type problem. Maybe we should unify that once and for all sometimes...
 +
 +2001-12-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.173: * erc-message-english: New QUIT and s004 entries.
 +	* erc-save-buffer-on-part: New variable.
 +	* erc-kill-buffer-on-part: New variable.
 +	* (erc-server-PART): Use above variables.
 +	* (erc-join-channel): Use DEF argument instead of initial input for completing-read.
 +
 +2001-12-08  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.172: added defcustom erc-nick-uniquifier ^ (i prefer _)
 +
 +2001-12-07  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.11: changelog for version 2.1.cvs.20011208-1
 +
 +2001-12-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.171:
 +	Added erc-scroll-to-bottom as an erc-insert-hook function.  It still bugs a bit, so please test it, thanks
 +
 +2001-12-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.170: * Fixed silly bug in erc-server-TOPIC (thanks mhp)
 +
 +	* erc-speak.el 1.17:
 +	* Fix non-greedy matching bug. That one somehow swallowed text
 +
 +	* erc.el 1.169:
 +	Fix Emacs20 problem. For now, we disable erc-track-modified-channels-minor-mode in emacs20
 +
 +2001-12-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.5:
 +	* Fix another stupid one-off error. This time it really works!
 +	 (Until I find the next bug. I guess you can hold your breath) (-:
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.4: * Fixed static filling:
 +	** No more \ed (continued on next line) lines anymore
 +	** Fixed bug with previous version where longer lines wouldn't get
 +	   filled correctly (i.e. at all)
 +
 +2001-12-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.10: changelog for 2.1.cvs.20011206-1 added
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.168:
 +	* Don't discard away status when identifying to NickServ
 +	* Modify `erc-already-logged-in': check for port, too.
 +
 +	* erc-fill.el 1.3:
 +	* Fix stupid loop non-termination error in erc-fill-static when filling
 +	  one-line regions.
 +	* Make erc-count-lines return meaningful values
 +
 +2001-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.167:
 +	* (erc-process-input): Make ' /command' work for quoting /commands
 +
 +	* erc-speak.el 1.16: see changelog
 +
 +	* erc-fill.el 1.2: see erc.el changelog
 +
 +	* erc.el 1.166:
 +	* erc-insert-hook: Changed strategy completely, no start end parameters any more.
 +	We narrow-to-region now, thats much cleaner.
 +	* rename erc-fill-region to erc-fill and change the autoload
 +	** You'll probably need to restart Emacs
 +
 +2001-12-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.165:
 +	* (erc-send-current-line): Fixed long outstanding bug. XEmacs users with erc-fill-region on erc-insert-hook knew that one a long time.
 +
 +	* erc.el 1.164: fix order of attack
 +
 +	* erc.el 1.163: * macroexpanded define-minor-mode for XEmacs
 +
 +	* erc.el 1.162: First try to make channel tracking mouse sensitive
 +
 +	* erc.el 1.161: * More erc-message-format conversion.
 +	  erc-format-message-english-PART as an example on how to use functions to format message
 +	* (erc-format-message): Fallback mechanism to use english catalog if variable is not bound
 +
 +2001-12-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.160: * (erc-iswitchb): Rewrite, docfix.
 +	Make it use erc-modified-channels as default if available.
 +
 +	* erc-menu.el 1.2:
 +	* Fixage related to erc-track-modified-channels-minor-mode rewrite
 +
 +	* erc.el 1.159:
 +	* erc-track-modified-channels-minor-mode: Use buffer objects instead of erc-default-target return value for internal state keeping.
 +
 +	* erc.el 1.158: * Made reconnect behave nicer (erc-process-sentinel)
 +	* Rewrote erc-modified-channels-tracking completely.
 +	  Its now a minor mode (erc-track-modified-channels-minor-mode)
 +	  It uses a list as internal representation now, so all silly string-parsing
 +	  related bugs should be gone.
 +	  Use (erc-track-modified-channels-minor-mode t) now to toggle this functionality.
 +	  Dont set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
 +
 +2001-11-29  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.9: final version
 +
 +2001-11-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.157:
 +	* (erc-channel-p): Make it work with string and buffer as parameter. buffer.
 +	* (erc-format-message): Add a check for functionp. This allows a format-specifier also to be a function name, which gets called with args applied and needs to return the actual format string.
 +	* Converted some formats, JOIN, JOIN-you, MODE, ...
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.156:
 +	* (erc-prepare-mode-line-format): Added sanity checks to prevent it from having problems with server buffers where the connection failed
 +
 +	* erc-bbdb.el 1.7:
 +	* (erc-bbdb-JOIN): regexp-quote the fingerhost before searching, some people have really strange characters as their user names
 +
 +	* erc.el 1.155: Remove a stupid debug like (message ...) call
 +
 +2001-11-28  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.8: draft of 2.1.cvs.20011128-1
 +
 +	* debian/rules 1.5: simplify for the all-in-one erc package
 +
 +	* debian/control 1.3: integrated erc-speak back into erc
 +
 +	* debian/maint/conffiles 1.3, debian/maint/conffiles.in 1.2, debian/maint/postinst 1.3, 
 +	  debian/maint/postinst.in 1.2, debian/maint/prerm 1.3, debian/maint/prerm.in 1.2, 
 +	  debian/scripts/install 1.3, debian/scripts/install.in 1.3, debian/scripts/remove 1.3, 
 +	  debian/scripts/remove.in 1.2, debian/scripts/startup.erc-speak 1.2:
 +	since erc-speak is gone, resurrect the static files, and update them to support the latest erc
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.154: * (erc-mode): Shouldn't be interactive.
 +	* (erc-info-mode): Ditto.
 +
 +	* erc.el 1.153: * (erc-server-352): Added hopcount parsing.
 +	Added call to erc-update-channel-member to fill in channel-members information
 +	on /WHO if the channel is joined.
 +
 +2001-11-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.6: *** empty log message ***
 +
 +	* erc-speedbar.el 1.5: * (erc-speedbar-expand-user): New function.
 +	Used when more information than just the nick name is available about a dude.
 +
 +	* erc.el 1.152: * Fixed stupid edit,checkin,save cycle error :)
 +
 +	* erc.el 1.151:
 +	* (erc-generate-log-file-name-default): Renamed to -long
 +	Doc fix.
 +	* (erc-generate-log-file-name-old): Renamed to -long
 +	Doc fix.
 +	* erc-generate-log-file-name-function: Set default to ...-long
 +	Doc fixes
 +
 +	* erc-speedbar.el 1.4: *** empty log message ***
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.3: * Integrated channel names list
 +	  what else do we need to replace info buffers???
 +	  please test that code and comment on erc-ehlp, thanks
 +
 +	* erc-speedbar.el 1.2:
 +	* Added erc-speedbar-goto-buffer and therefore enable switching to the buffers from speedbar
 +
 +	* erc-speedbar.el 1.1:
 +	I had to check this in, it works !! sort of,, megaalphagammaversion, first version. test, play, submit ideas/patches
 +
 +2001-11-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.150 (erc-mode): moved erc-last-saved-position here
 +	moved buffer naming code from here..
 +	(erc): ...to here
 +	(erc-generate-log-file-name-old): only prepend target if it exists
 +
 +	made erc-log-insert-log-on-open a defcustom
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.149:
 +	* Applied antifuchs/mhp patches, the latest on erc-help, unmodified
 +	* New variable: erc-reuse-buffers default to t.
 +	* Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
 +	  then one can assume thats the same channel/query target again.
 +
 +2001-11-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.6:
 +	* new function erc-BBDB-NICK to handle nickname anotation on a nick-change event of a known record
 +
 +	* erc.el 1.148: * Remove erc-rename-buffer, its no longer necessary
 +	* Remove erc-autoop-*. it was broken, and needed rewrite anyway
 +	* write erc-already-logged-in in terms of erc-buffer-list and make the duplicate login check work again
 +
 +	* erc.el 1.147: * Fixed stupid typo
 +
 +2001-11-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.146: * New local variable, erc-announced-server-name
 +	* erc-mode-line-format supports a new symbol, target-and/or-server
 +	* The mode-line displays the announced server name now (for autojoin later..., 
 +	  greets Adam)
 +	* New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
 +	  Thanks go to the guy from #emacs who helped with that
 +	* erc-fill-region is now autoloaded from erc-fill.el
 +	  * erc-fill.el implements a new fill method, erc-fill-static
 +	    (setq erc-fill-function 'erc-fill-static)
 +	* Some other things I forgot right now
 +
 +	* erc-bbdb.el 1.5: *** empty log message ***
 +
 +	* erc-fill.el 1.1: Initial version.
 +
 +	* erc-complete.el 1.4:
 +	Applied antifuchs patch to make completion work with (string= erc-prompt "")
 +
 +	* erc-complete.el 1.3:
 +	added function erc-nick-completion-exclude-myself
 +	you can set erc-nick-completion to 'erc-nick-completion-exclude-myself to use it
 +
 +2001-11-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.4:
 +	* Changed usage of 'finger-host to bbdb-finger-host-field
 +
 +	* erc-bbdb.el 1.3:
 +	* Changed WHOIS to use finger-host instead of net field.
 +	* Added 'visible as option to erc-bbdb-popup-p to only pop-up the bbdb buffer if a join happened in a visible buffer on any visible frame.
 +	* Added (regexp-quote ...) for nickname search in erc-bbdb-JOIN
 +
 +2001-11-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.2: * Added JOIN support
 +
 +2001-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.145:
 +	Initial message catalog code. converted erc-action-format usage to use it
 +
 +	* erc.el 1.144: * erc-play-sound: Added XEmacs related check
 +
 +	* erc-bbdb.el 1.1: * Initial version, many thanks to Andreas Fuchs
 +
 +	* erc.el 1.143: * Fixed silly problem with whois/was handling
 +
 +	* erc.el 1.142: * Renamed prev-rd to erc-previous-read
 +	* Removed erc-next-line-add-newlines and s next-line-add-newlines to nil in defun erc by default
 +
 +	* erc.el 1.141:
 +	fixed xemacs compatibility prob with delete, thanks Adam
 +
 +2001-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.140: numreplies 301 & 461
 +
 +2001-11-13  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.139:
 +	Added code for error reply 421 "Unknown command", to test the new server parsing system.
 +	This was really easy!  Thanks ZenIRC guys & delysid :-)
 +
 +2001-11-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.138: * Allow connecting to SSL enabled irc servers.
 +	   Ugly hack, but it works for now. Be sure to use the numeric irc port 994 so that erc can recognize what you want
 +	  good example is
 +	irc server: ircs.segfault.net
 +	port: 994
 +
 +	meet me there, I am still delYsid :)
 +
 +	* erc.el 1.137: * some more numreply handlers
 +	* cleanup in erc-process-away-p
 +	* new function erc-display-error-notice
 +
 +	* erc.el 1.136: * numreply 501 and 221
 +
 +	* erc.el 1.135:
 +	removed obsolete old hook variables. Your functions may break, but it is easy to hook them up to the new hooks.
 +	erc-part-hook: use erc-server-PART-hook instead
 +	erc-kick-hook: use erc-server-KICK-hook instead
 +	and so on
 +
 +	* erc.el 1.134:
 +	fixed serious bug which cause privmsgs vanishing when erc-auto-query was set to nil
 +
 +	* erc.el 1.133: cleaned up erc-process-filter
 +
 +	* erc.el 1.132: * 401 and 320 numreplies implemented
 +
 +	* erc.el 1.131: * Removed old/now obsolete code
 +
 +	* erc.el 1.130: * Fixed bug in erc-server-MODE
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.129: fixed it
 +
 +	* erc.el 1.128:
 +	*** We switched over. New server message parsing/handling is running now. Thansk to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
 +
 +	* erc.el 1.127: *** empty log message ***
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.125:
 +	Fixed bug in erc-get-buffer, now channel names are compared in
 +	a case-insensitive way.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.124: erc-server-353
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.123: Fixed docstring for erc-get-buffer.
 +	Added erc-process to a lot of calls to erc-get-buffer, so
 +	that only the local process is searched.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.122: * erc-buffer-filter: do it differently
 +
 +	* erc.el 1.121: ugly but working fix for mhp's query problem
 +
 +	* erc.el 1.120: * erc-server-PRIVMSG-or-NOTICE
 +	  Now, all the server word replies are finished. Going to numreplies now
 +
 +	* erc.el 1.119:
 +	* debugging fascilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
 +
 +	* erc.el 1.118: * erc-server-KICK and erc-server-TOPIC. new functions
 +	* erc-server-305-or-306 and erc-server-311-or-314
 +
 +	* erc.el 1.117:
 +	* ported PART and QUIT msgs to the new scheme, many to go. but it is a easy task. does someone wanna try and start with numreplies?
 +
 +	* erc.el 1.116: * erc-server-JOIN
 +
 +	* erc.el 1.115: * Ported erc-server-INVITE code
 +
 +	* erc.el 1.114: * erc-server-ERROR and erc-server-MODE
 +
 +2001-11-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.113: * zen
 +
 +	* erc.el 1.112: * New variable erc-connect-function.
 +
 +	* erc.el 1.111:
 +	* New function erc-channel-p and use it where appropriate
 +
 +	* erc.el 1.110: * Removed the variable erc-buffer-list completely now
 +	* Moved erc-dbuf around a bit
 +
 +	* erc.el 1.109: * Fix silly change in quit/rename msg handling
 +
 +	* erc.el 1.108: thanks mhp, fixed
 +
 +	* erc.el 1.107: * Tijs van Bakel's work from 10th Nov. merged in
 +	* My additions to that idea merged in too
 +	Basicly, this is a major rewrite, if you are scared and want avoid problems,
 +	stay at your current version. It seems fairly stable though.
 +	That changed? erc-buffer-name handling was completely rewritten,
 +	and erc-buffer-list local variable handling removed.
 +	Simplifies alot of code. Poke at it. read the diff. report bug/send patches!
 +
 +	* erc.el 1.106: * Added variable listing when /set is used without args
 +
 +2001-11-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.105:
 +	* Comment/structure cleanup, removal of unnecessary code
 +
 +	* erc.el 1.104: only some code beautification
 +
 +	* erc-imenu.el 1.2:
 +	remove add-hook call, thats done in erc.el now for autoloadability
 +
 +	* erc.el 1.103: * Make erc-imenu autoloadable
 +
 +	* erc.el 1.102:
 +	* The long promised erc-mode-line-format handling rewrite
 +	   Poke at it, try it, play with it, report bugs
 +
 +	* erc.el 1.101:
 +	some regex-quote fixes, new function erc-cmd-set, and minor things
 +
 +2001-11-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.100:
 +	* added second timestamp-format (erc-away-timestamp-format) for marking msgs when being away
 +
 +	* erc-complete.el 1.2: fixed silly deffun
 +
 +	* erc.el 1.99: * Rewrote erc-load-irc-script (simplified)
 +	* Removed depricated code
 +
 +	* erc-speak.el 1.15: * reflect changes in erc.el
 +
 +	* erc.el 1.98:
 +	* Moved completion related functions into erc-complete.el
 +	  placed an autoload instead into erc.el. That quite cool,
 +	  because erc-complete.el only gets loaded when you use
 +	  TAB first time in erc.
 +
 +	* erc-complete.el 1.1: _ Initial checkin
 +
 +	* erc.el 1.97: * New function: erc-chain-hook-with-args
 +	* Changed calls to erc-insert-hook to use it
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.96: * Patch from Fabien Penso
 +	  Make completion case insensitive. try it! its cool
 +
 +	* erc.el 1.95: * Reduction patch 2
 +	  This time, we move the input ring handling into erc-ring.el
 +	  Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
 +	  And remeber, that you dont need it if you dont use input ring :-)
 +
 +	* erc-ring.el 1.1: * Initial checkin
 +
 +	* erc.el 1.94: * The great reduction patch :-)
 +	  moved relevant function from erc.el to new file erc-menu.el and erc-imenu.el
 +
 +	* erc-imenu.el 1.1: nitial version
 +
 +	* erc-menu.el 1.1: * Initial version
 +
 +	* erc.el 1.93: * wording change suggested by Benjamin Drieu
 +
 +2001-11-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.92: Added Emacs version to /SV
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.91: * Hookification patch, read the diff
 +
 +	* erc.el 1.90: too tired for a changelog :)
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.89:
 +	* make erc-cmd-op and erc-cmd-deop take multiple nicknames as argument
 +
 +2001-11-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.7: sync
 +
 +	* debian/rules 1.4: fixed a typo: PKGDIR, not PKIDR
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.88:
 +	* Changed timestamping when away to use erc-timestamp-format and append the timestamp instead of prepending it..
 +	* minor cleanup, s/(if (not /(unless/ and thelike
 +
 +2001-11-06  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.87: Fixed OP and DEOP commands to return T.
 +	Added SV say-version command.
 +	Added erc-send-message utility function, but it's not used everywhere yet.
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.86: stupid delYsid, forgot require 'format-spec. good nite
 +
 +	* erc.el 1.85:
 +	* new variable erc-action-format. Some erc-notice-prefix fixes again
 +
 +	* erc.el 1.84: * erc-minibuffer-privmsg defaults to t
 +
 +	* erc.el 1.83:
 +	* Small fix in relation to the transition to erc-make-notice
 +
 +2001-11-05  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.82:
 +	Renamed erc-message-notices to erc-minibuffer-notice, and renamed erc-prevent-minibuffer-privmsg to erc-minibuffer-privmsg, inverting its functionality
 +
 +	* erc.el 1.81: Added support for channel names starting with & + and !.
 +	Also, many changes partially discussed on the mailinglist:
 +
 +		* erc.el (cl): Add requirement for cl package.
 +		(erc-buffer-list): Make this variable global again.
 +		(erc-default-face): Fix typo.
 +		(erc-timestamp-face): Add face for timestamps.
 +		(erc-join-buffer, erc): Add a 'bury option.
 +		(erc-send-action): Add timestamp.
 +		(erc-command-table): Add /CLEAR, /DEOP, /OP, /Q.
 +		(erc-send-current-line): Add timestamp.
 +		(erc-send-current-line): Add call to erc-insert-hook.
 +		(erc-cmd-clear): New command to clear buffer contents.
 +		(erc-cmd-whois): Fix cut'n'paste-o.
 +		(erc-cmd-deop): New command to deop a user.
 +		(erc-cmd-op): New command to op a user.
 +		(erc-make-notice): Moved a lot of duplicate code here.  Perhaps
 +		this should also be done for erc-highlight-error.
 +		(erc-parse-line-from-server): Now NOTICE will also open a new
 +		query, just as PRIVMSG.
 +		(erc-parse-line-from-server): Call erc-put-text-property on a
 +		channel message/notice first, before concatenating nick and
 +		timestamp &c.
 +		(erc-message-notices): Add option to display notices in
 +		minibuffer.
 +		(erc-fill-region): No longer strip spaces in front of incoming
 +		messages.
 +		(erc-parse-current-line): No longer strip spaces in front of text
 +		input by user.
 +
 +	Hopefully I didn't break too much :(
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.80:
 +	* New function erc-nickserv-identify-autodetect for erc-insert-hook. Added by default currently.
 +
 +	* erc.el 1.79:
 +	* Mini-fix in erc-process-num-reply (= n 353): Added @ as prefix character to make certain channels on opn work again nicely
 +
 +2001-10-31  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.6: updated to reflect changes
 +
 +	* debian/scripts/install.in 1.2:
 +	moved #PKGFLAG# before -f batch-byte-compile
 +
 +2001-10-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.78:
 +	Imenu fixed somehow, added IRC services interactive function for indentify to NickServ. Read the diff
 +
 +2001-10-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.5: sigh. -2
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.4: updated to reflect changes
 +
 +	* debian/rules 1.3: handle conffiles.in too
 +
 +	* debian/maint/conffiles.in 1.1: new file
 +
 +	* debian/maint/conffiles 1.2: superceded by conffiles.in
 +
 +	* debian/scripts/startup 1.2: superceded by startup.erc
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/startup.erc-speak 1.1: * Initial version
 +
 +	* debian/scripts/startup.erc 1.1: * Added and fixes minimal typo
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.3: updated to reflect changes
 +
 +	* debian/rules 1.2:
 +	modified to be able to build the erc-speak package too
 +
 +	* debian/control 1.2: added the new erc-speak package
 +
 +	* debian/README.erc-speak 1.1, debian/maint/postinst.in 1.1, debian/maint/prerm.in 1.1, 
 +	  debian/scripts/install.in 1.1, debian/scripts/remove.in 1.1:
 +	new file
 +
 +	* debian/maint/postinst 1.2, debian/maint/prerm 1.2, debian/scripts/install 1.2, 
 +	  debian/scripts/remove 1.2:
 +	removed, superceded by it's .in counterpart
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.77: * Fixed some defcustom :type 's
 +	* Added erc-before-connect hook which gets called with server port and nick.
 +	  Use this hook to e.g. setup a tunnel before actually connecting.
 +	  something like (when (string= server "localhost") ...)
 +
 +2001-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.76: * Patch by smoke: fix erc-cmd-* commands and add aliases
 +
 +2001-10-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.14:
 +	* Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
 +	  especially if you are on more than one channel simultaniously.
 +
 +	* erc.el 1.75:
 +	* Made the completion postfix customizable through erc-nick-completion-postfix
 +
 +	* erc-speak.el 1.13, erc.el 1.74:
 +	* Added erc-prevent-minibuffer-privmsg
 +
 +	* erc-speak.el 1.12:
 +	* Quickish hack to allow exclusion of timestamps from speaking. see erc-speak-filter-timestamps
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.11:
 +	* Removed now really obsolete code. Package size reduced by 50%
 +
 +	* erc-speak.el 1.10:
 +	* Very important fix! Now erc-speak is really complete. Messages dont get cut anymore. Be sure to use auditory icons, 
 +	  it's reallllly cool now!!!
 +
 +	* erc-speak.el 1.9: *** empty log message ***
 +
 +	* erc-speak.el 1.5: * Major simplification. depends on erc.el,v 1.73
 +	* Things removed, read diff
 +
 +2001-10-21  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.2: oops, silly typo
 +
 +	* debian/changelog 1.1, debian/control 1.1, debian/copyright 1.1, 
 +	  debian/maint/conffiles 1.1, debian/maint/postinst 1.1, debian/maint/prerm 1.1, 
 +	  debian/rules 1.1, debian/scripts/install 1.1, debian/scripts/remove 1.1, 
 +	  debian/scripts/startup 1.1:
 +	initial check-in
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.73:
 +	* Changed erc-insert-hook to get two arguments, START and END of the region
 +	  which got inserted. CAREFUL! This could break stuff, but it makes the hook
 +	  much more useable.
 +
 +	* erc.el 1.72:
 +	* Made erc-smiley a new option, currently set to t to showoff this feature. :)
 +
 +2001-10-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.71: * Add missing erc-mode-hook variable
 +	* Add smiley-support (preliminary test)
 +
 +2001-10-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.70:
 +	Replaced all occurences of put-text-property with a call to
 +	erc-put-text-property.
 +	(erc-put-text-property): New function.
 +	(erc-tracking-modified-channels): Moved to the front of the file such
 +	that it is already defined when the menu is being defined.
 +	(erc-modified-channel-string): Ditto.
 +
 +2001-10-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.69: Removed some commentary.  The wiki page is the place to
 +	put such information.
 +	(erc-fill-prefix): Doc change.
 +	(erc-notice-highlight-type): Doc change, now a user option.
 +	(erc-pal-highlight-type): Doc change, now a user option.
 +	(erc-fool-highlight-type): New option.
 +	(erc-keyword-highlight-type): New option.
 +	(erc-dangerous-host-highlight-type): New option.
 +	(erc-uncontrol-input-line): Doc change.
 +	(erc-interpret-controls-p): Doc change, now a user option.
 +	(erc-multiline-input): Doc change.
 +	(erc-auto-discard-away): Doc change.
 +	(erc-pals): Changed from string to regexp.
 +	(erc-fools): New option.
 +	(erc-keywords): Renamed from erc-highlight-strings.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-dangerous-hosts): Renamed from erc-host-danger-highlight.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-menu-definition): Added menu entries for fools, keywords and
 +	dangerous hosts.
 +	(erc-mode-map): Changed keybindings from C-c <plain ascii> to
 +	various C-c <C-ascii> combinations.
 +	(erc-dangerous-host-face): Renamed from erc-host-danger-face.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-fool-face): New face.
 +	(erc-keyword-face): Renamed from erc-highlight-face.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-parse-line-from-server): Fixed highlighting in the cases
 +	where (equal erc-pal-highlight-type 'all), added code to handle
 +	erc-fool-highlight-type, erc-dangerous-host-highlight-type
 +	(erc-update-modes): Replaced erc-delete-string with delete.
 +	(erc-keywords): Renamed from erc-highlight-strings, handle
 +	erc-keyword-highlight-type.
 +	(erc-delete-string): Removed.
 +	(erc-list-match): New function.
 +	(erc-pal-p): Use erc-list-match.
 +	(erc-fool-p): New function.
 +	(erc-keyword-p): New function.
 +	(erc-dangerous-host-p): Renamed from erc-host-danger-p, use
 +	erc-list-match.
 +	(erc-directed-at-fool-p): New function.
 +	(erc-add-entry-to-list): New function.
 +	(erc-remove-entry-from-list): New function.
 +	(erc-add-pal): Use erc-add-entry-to-list.
 +	(erc-delete-pal): Use erc-remove-entry-from-list.
 +	(erc-add-fool): New function.
 +	(erc-delete-fool): New function.
 +	(erc-add-keyword): New function.
 +	(erc-delete-keyword): New function.
 +	(erc-add-dangerous-host): New function.
 +	(erc-delete-dangerous-host): New function.
 +
 +2001-10-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.68: * irc vs ircd default port fixed
 +
 +	* erc.el 1.67: * Added topic-change to imenu
 +
 +	* erc.el 1.66: * More imenu spiffyness
 +
 +	* erc.el 1.65: * Added imenu support
 +
 +	* erc.el 1.64:
 +	* Fix to /topic to show topic instead of setting it to null :)
 +
 +2001-10-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.63: * First version of erc-rename-buffer
 +
 +	* erc.el 1.62: * more header-line tricks.
 +
 +	* erc.el 1.61:
 +	* Small fix to do erc-update-mode-line-buffer in erc-update-channel-topic
 +
 +	* erc.el 1.60: * Added erc-header-line-format
 +
 +2001-10-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.59: * mini-fix, add msgp to auto-query code
 +
 +	* erc.el 1.58: * Added command-names to completion (erc-command-table)
 +	* New variable erc-auto-query. When set, every arriving message to you
 +	will open a query buffer for that sender if not already open.
 +	* Compatibility function fo non-existing line-beginning|end-position functions in XEmacs.
 +
 +2001-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.57:
 +	* Removed alot of (progn ...) where they were not necessary
 +	* Changed some (if ...) without else part to (when ...)
 +	* Some (while ...) to use (dolist ...)
 +	* Fix for completion popup generating tracebacks.
 +	* New function erc-arrange-session-in-mulptiple-windows
 +	* Lots of other stuff, read the diff
 +
 +2001-10-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.56: * Added erc-kill-input and keybinding C-c C-u for it
 +
 +2001-10-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.55: * Another fix to nick-completion
 +	* Additional checks in erc-track-modified-channels
 +
 +2001-09-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.54: * Fixed completion (alex)
 +	  * Now popup buffer doesnt destroy your window configuration.
 +	* Fixed away handling (incomplete)
 +
 +2001-09-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.53: Fixed silly quoting-escape error
 +
 +2001-09-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.52: * Added auto-op support (unfinished)
 +	* Added erc-latest-version.
 +	* Added erc-ediff-latest-version.
 +
 +2001-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.51:
 +	* Minor menu additions (invite only mode is now a checkbox)
 +
 +2001-09-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.50:
 +	* Fix (erc-cmd-names): This should fix C-c C-n too, hoepfully it was the right fix and doesnt break anything else.
 +
 +	* erc.el 1.49: * Fixes XEmacs easymenu usage (2nd time).
 +
 +2001-09-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.48:
 +	* (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
 +
 +	* erc.el 1.47:
 +	* Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
 +	* Fix for custom problem with :must-match on XEmacs (thanks shapr)
 +	* Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
 +	* Fix for case-sensitivity problem with pals (they are now all downcased)
 +	* Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
 +	  instead of just displaying it in the minibuffer.
 +
 +2001-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.46: Updated erc-version-string
 +
 +	* erc.el 1.45: Version number change and last read-through...
 +
 +2001-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.44: Added some asterisks
 +
 +2001-08-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.43:
 +	Fixed hidden channel buffer tracking (sort of), now using switch-to-buffer for advice.
 +	This version is unofficially named 2.1prebeta1. Please test it and send
 +	fixes to various problems you may encounter so that we can eventually
 +	release 2.1 soon.
 +
 +2001-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.42:
 +	Added function erc-bol and keybinding C-c C-a for it (contributed by Benjamin Rutt <brutt@bloomington.in.us)
 +
 +2001-08-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.41:
 +	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesnt seem to work.
 +	Removed (nick -> #channel) from mode-line. (CLOSED) and (AWAY...) should still be displayed when appropriate
 +
 +2001-08-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.40:
 +	added local-variable channel-list in session-buffers and make /LIST use it.
 +	erc-join-channel can now do completion after /LIST was executed
 +
 +2001-08-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.39: Tweaked erc-join-channel and erc-part-from-channel
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.38: some more defcustom stuff
 +
 +	* erc.el 1.37: Patch from Henrik Enberg <henrik@enberg.org>:
 +	   Adds variables erc-frame-alist and erc-frame-dedicated-p.
 +
 +	* erc.el 1.36: fixed erc-part-from-channel
 +
 +	* erc.el 1.35:
 +	fixed match-string problem and added interactive topic setting function.
 +
 +	* erc.el 1.34: fixed silly string-match bug
 +
 +	* erc.el 1.33:
 +	Added erc-join-channel and erc-part-from-channel (interactive prompts), as well as keybindings. C-c C-j #emacs RET is now enough :)
 +
 +2001-07-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.32 (erc-display-line-buffer): Simplified filling.
 +	(erc-fill-region): New function.
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.31: Added redundancy check in output
 +
 +2001-07-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.30 (erc-send-action): Add text-property stuff.
 +	(erc-input-action): Removed text-property stuff.
 +	(erc-command-table): Corrected command for DESCRIBE.  Still
 +	doesn't work though.  No idea what it should do.  Looks like a no op.
 +	(erc-cmd-me): Doc change.
 +
 +2001-07-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.29:
 +	fixed one occurence of a setq with only one argument (XEmacs didnt like that)
 +
 +	* erc.el 1.28:
 +	Added erc-next-line-add-newlines customisation possibility.
 +
 +	* erc.el 1.27:
 +	added erc-fill-prefix for defining your own way of filling and fixed filling somehow
 +
 +	* erc.el 1.26:
 +	fixed small incompatibility in erc-parse-line-from-server at (and (= n 353) regexp
 +
 +2001-07-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.25:
 +	Added erc-filling and filling code to erc-display-line-buffer.
 +
 +2001-07-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.24 (try-complete-erc-nick): Make the ": " part of the
 +	expansion
 +
 +	* erc.el 1.23: require ring
 +
 +2001-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.22: *** empty log message ***
 +
 +2001-07-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.21: typo
 +
 +	* erc.el 1.20: ommit
 +	:wq
 +
 +2001-07-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.19 (erc-mode): Call erc-input-ring-setup.
 +	(erc-send-current-line): Call erc-add-to-input-ring.
 +	(erc-input-ring): New variable.  Currently not buffer local.
 +	(erc-input-ring-index): New variable.  Currently not buffer local.
 +	(erc-input-ring-setup): New function.
 +	(erc-add-to-input-ring): New function.
 +	(erc-previous-command): New function.
 +	(erc-next-command): New function.
 +	(erc-mode-map): Uncommented keybindings for erc-next-command and
 +	erc-previous-command.
 +
 +2001-07-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.18 (erc-highlight-strings): Removed debug message.
 +
 +	* erc.el 1.17 (erc-join-buffer): Changed default to 'buffer.
 +	(erc-join-info-buffer): Changed default to 'disable.
 +	(erc-nick-completion): Changed default to 'all.
 +
 +2001-07-04  uid31117  <uid31117@confusibombus>
 +
 +	* erc.el 1.16: Resolved...
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.15 (erc-highlight-strings): New option and new function.
 +	(erc-parse-line-from-server): Use it.
 +	Various empty lines removed.  Various doc strings fixed.
 +
 +	* erc.el 1.14: Removed more empty lines.
 +
 +	* erc.el 1.13 (erc-member-string): replaced by plain member
 +	Otherwise, lots of deleting of empty lines...  I'm not too happy with that
 +	but I feel better when the code is "cleaned up".
 +
 +2001-07-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.12: Ugly hack, but looks nicer when giving commands
 +
 +	* erc-speak.el 1.4: ugly hack, but looks nicer now
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.11 (try-complete-erc-nick): New function.
 +	(erc-try-complete-nick): New function.
 +	(erc-nick-completion): New option.
 +	(erc-complete): Call hippie-expand such that erc-try-complete-nick
 +	will be called eventually.  Based on erc-nick-completion
 +	try-complete-erc-nick will then complete on the nick at point.
 +
 +2001-07-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.10:
 +	Insert (erc-current-nick) instead of (erc-display-prompt). good night :)
 +
 +	* erc.el 1.9:
 +	small, but it was anoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
 +
 +2001-06-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.8: Use defface to define all faces.
 +	Removed some history from the commentary, as well as some other
 +	commentary editing.
 +
 +2001-06-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.7: hmm, defcustom for erc-user-full-name
 +
 +	* erc-speak.el 1.3, erc.el 1.6: *** empty log message ***
 +
 +2001-06-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.5: typo
 +
 +	* erc.el 1.4: Some more defcustom
 +
 +	* erc-speak.el 1.2: nothing, really
 +
 +2001-06-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.3: Some defcustom stuff. Still no defgroup though :)
 +
 +	* erc.el 1.2:
 +	Initial change to erc.el (2.0). Mainly list of ideas and features
 +	and syntax-table entries.
 +
 +	* erc-speak.el 1.1.1.1, erc.el 1.1.1.1: Initial Import
 +
 +	* erc-speak.el 1.1, erc.el 1.1: New file.
 +
-     Copyright (C) 2001 Free Software Foundation, Inc.
++    Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
diff --cc ChangeLog.02
index 297b9d3,0000000..961e7d8
mode 100644,000000..100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@@ -1,2607 -1,0 +1,2607 @@@
 +2002-12-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.398 (erc-split-command):
 +	Removed assignment to free variable "continue".
 +	(erc-strip-controls): New function.  Takes a string, returns the string with
 +	all IRC color/bold/underline/etc. control codes stripped out.
 +	(erc-interpret-controls): If variable erc-interpret-controls-p is nil, now
 +	uses erc-strip-controls to strip control codes.
 +	(erc-ctcp-reply-ECHO): Changed reference and assignment to free variable "s"
 +	into reference/assignment to "msg", which appears to be the original author's
 +	intent.
 +
 +	* erc-list.el 1.8 (erc-chanlist):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.
 +
 +	* erc-notify.el 1.10 (erc-notify-timer):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.  Also fixed a bug were variable
 +	erc-last-ison was being read from a non-server buffer (thus giving its default
 +	value instead of its per-server value).
 +
 +	* erc.el 1.397 (erc-once-with-server-event):
 +	This is now a function.  It was a macro with a
 +	bug (the call to gensym happened at byte-compile-time not macro-call-time).
 +	(erc-toggle-debug-irc-protocol): Now [return] is bound to this function in
 +	the *erc-protocol* buffer.
 +
 +2002-12-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.10 (erc-autoaway-idletimer): Doc,
 +	ref. erc-autoaway-use-emacs-idle.
 +	(autoaway): Doc, explain different idle definitions.  Reestablish
 +	the idletimer only when erc-autoaway-use-emacs-idle is non-nil.
 +	(erc-auto-set-away): Doc, ref erc-auto-discard-away.
 +	(erc-auto-discard-away): Doc, ref erc-auto-set-away.
 +	(erc-autoaway-use-emacs-idle): Doc, ref erc-autoaway-mode, and
 +	added a note that this feature is currently broken.
 +	(erc-autoaway-reestablish-idletimer): Doc.
 +	(erc-autoaway-possibly-set-away): Split test such that
 +	erc-time-diff is only computed when necessary, add a comment why
 +	erc-process-alive is not necessary.
 +	(erc-autoaway-set-away): Test for erc-process-alive.
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.9:
 +	Changed the order of defcustoms to avoid errors in the :set property
 +	of erc-autoaway-idle-seconds.
 +
 +2002-12-29  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.42:
 +	* (erc-track-get-active-buffer): remove superflous (+ arg 0)
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.8 (erc-autoaway): Moved the defgroup up to the
 +	top, before the define-erc-module call.
 +	(autoaway): Extended doc.
 +	(erc-autoaway-idle-seconds): Use a :set property to handle
 +	erc-autoaway-use-emacs-idle.
 +	(erc-auto-set-away): Set default to t.  Added doc strings where
 +	necessary, reformatted doc strings such that the first line can
 +	stand on its own.  This is important for the output of M-x
 +	apropos.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-auto.in 1.3:
 +	added (provide 'erc-auto), which is required for (require 'erc-auto) :)
 +
 +	* erc.el 1.396 (erc-display-prompt):
 +	Set the face property of the prompt to
 +	everything but the last character.
 +
 +	* erc.el 1.395 (erc-send-current-line):
 +	Check wether point is in the input line. If
 +	not, just beep and do nothing.
 +
 +2002-12-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.394 (erc-bol):
 +	Fixed bug when there is only a prompt, and no property
 +	change.
 +
 +	* erc.el 1.393 (erc-display-prompt): Rewrote using a save-excursion
 +	and erc-propertize.  No longer use a field for the prompt, but a
 +	plain text property called erc-prompt.
 +	(erc-bol): Use the erc-prompt text property instead of a field.
 +	Return point instead of t.
 +	(erc-parse-current-line): No need to call point here, then, since
 +	erc-bol now returns point.
 +
 +	* Makefile 1.11:
 +	make ChangeLog .PHONY, thus forcing it always to be rebuilt.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.392 (erc-log-irc-protocol):
 +	Removed check wether get-buffer-create
 +	    returned nil. "The value is never nil", says the docstring.
 +
 +	* erc.el 1.391: Day Of The Small Changes
 +
 +	(erc-display-prompt): Make the prompt 'front-sticky, which prevents it
 +	    from being modified. It *should* also make end-of-line move to the
 +	    end of the field (i.e. the end of the prompt) when point is at the
 +	    beginning of the prompt, but it doesn't. Dunno why. :(
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.10:
 +	Added "-f" to "rm" command in rule for target "realclean".
 +
 +	* erc.el 1.390:
 +	New function: erc-log-irc-protocol.  Consolidates nearly duplicate code
 +	from functions erc-send-command and erc-process-filter into one function.
 +
 +	* erc.el 1.389 (erc-toggle-debug-irc-protocol):
 +	Removed unneeded argument PREFIX and code
 +	which referenced it at end of function.
 +	(erc-send-command): Now we only append a newline to the logged copy
 +	of output protocol text if it doesn't have one.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.388 (erc-toggle-debug-irc-protocol):
 +	Display buffer if it's not shown
 +	    already, and use view-mode.
 +	(erc-toggle-debug-irc-protocol), (erc-send-command),
 +	    (erc-process-filter): inhibit-only t to insert into the
 +	    *erc-protocol* buffer (view-mode)
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.387 (erc-mode-map):
 +	Removed keybinding for erc-toggle-debug-irc-protocol.
 +	(erc-toggle-debug-irc-protocol): Now used erc-make-notice to propertize the
 +	face of the enabled/disabled messages in the *erc-protocol* buffer.
 +	(erc-send-command): Now outgoing IRC protocol traffic is logged too.
 +
 +	* erc.el 1.386:
 +	Added user-customizable variable erc-debug-irc-protocol.
 +	Added function erc-toggle-debug-irc-protocol.
 +	(erc-process-filter): Now supports IRC protocol logging.  If variable
 +	erc-debug-irc-protocol is non-nil, all IRC protocol traffic is appended
 +	to buffer *erc-protocol*, which is created if necessary.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.385 (erc-display-prompt):
 +	Don't make the prompt intangible; that didn't
 +	    make things that much better for the user, but confused ispell,
 +	    which checked the prompt when it should check the first word
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.4: fixed resolve's email add
 +
 +	* AUTHORS 1.3: added damien
 +
 +	* erc.el 1.384 (erc-truncate-buffer-on-save):
 +	Removed documentation that
 +	described behaviour now changed.  It used to say "When nil, no
 +	buffer is ever truncated."  This is no longer true; even when
 +	buffers are NOT truncated on save, they can be truncated, eg. by
 +	adding erc-truncate-buffer to the hook.
 +	(erc-logging-enabled): New function.
 +	(erc-current-logfile): New function.
 +	(erc): Use erc-logging-enabled and erc-current-logfile.
 +	(erc-truncate-buffer-to-size): Rewrote it, and made sure to use a
 +	(save-restriction (widen) ...) such that the truncation actually
 +	runs in the whole buffer, not in the last message only (as
 +	erc-insert-post-hook will do!).  This should fix rw's
 +	out-of-bounds error.
 +	(erc-generate-log-file-name-short): Made all but the BUFFER
 +	argument optional.  Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-generate-log-file-name-long): Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-save-buffer-in-logs): Use erc-logging-enabled and
 +	erc-current-logfile.  Doc: Mention erc-logging-enabbled.
 +
 +	(erc-encode-string-for-target): Only do the real work when
 +	featurep mule; else just return the string unchanged.
 +
 +2002-12-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.383:
 +	erc-encoding-default: check for (coding-system-p) for older emacs versions
 +
 +	* erc.el 1.382 (erc-connect): missing ()s added. "don't commit at 2am"
 +
 +	* erc.el 1.381 (erc-connect):
 +	check if (set-process-coding-system) is available before use
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.2: added franl
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.14 (pcomplete-parse-erc-arguments):
 +	Reworked, and fixed a bug that had
 +	caused completions to corrupt preceding text under some circumstances.
 +
 +	* erc.el 1.380 (erc-encoding-default): New.
 +	(erc-encode-string-for-target): Use it instead of a hard-coded ctext.
 +	(erc-encoding-coding-alist): Doc.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.379:
 +	Removed fix for bug 658552 recently checked-in, because it doesn't work.
 +
 +	* erc.el 1.378 (erc-kill-buffer-function):
 +	Removed check that connection is up
 +	before running erc-kill-server-hook hooks.  Those hooks should use
 +	erc-process-alive to avoid interacting with the process.
 +
 +	* erc.el 1.377:
 +	Fixed erc-send-current-line so it no longer assigns the free variable "s", and
 +	it doesn't move point to end-of-buffer in non-ERC buffers.  Fixed
 +	erc-kill-buffer-function so it doesn't run the erc-kill-server-hook hooks if the
 +	server connection is closed.  Fixed bug 658552, which is described in detail at
 +	http://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.376 (erc-cmd-SMV): Bug, now call erc-version-modules.
 +
 +	* erc-pcomplete.el 1.13 (erc-pcomplete-version): New.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el 1.12:
 +	Fix for bug where you could not complete a nick when there was text following
 +	the nick.
 +
 +2002-12-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.375 (erc-already-logged-in): Use erc-process-alive.
 +	(erc-prepare-mode-line-format): Use erc-process-alive.
 +	(erc-process-alive): Check erc-process for boundp and processp.
 +
 +	* erc.el 1.374 (erc-kill-buffer-function):
 +	Do not check wether the process is
 +	alive before running the hook, because there might be functions on
 +	the hook that need to run even when the process is dead.  And
 +	function that wants to check this, should use (erc-process-alive).
 +	(erc-process-alive): New function.
 +	(erc-kill-server): Use it.
 +	(erc-kill-channel): Use it.
 +
 +	* erc.el 1.373 (erc-kill-buffer-function):
 +	Reverted ignore-error change.
 +	ignore-error is dangerous because we might miss bugs in functions
 +	on erc-kill-server-hook.
 +
 +	* erc.el 1.372 (erc-kill-buffer-function): Use memq instead of member
 +	when checking process-status.  Added doc string with references to
 +	the other hooks.
 +	(erc-kill-server): Only send the command when the erc-process is
 +	still alive.  This prevents the error: "Process
 +	erc-irc.openprojects.net-6667 not running" when killing the buffer
 +	after having used /QUIT.
 +
 +2002-12-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.371 (erc-server-ERROR):
 +	Show the error reason, not only the originating host.
 +
 +	* erc.el 1.370 (erc-kill-buffer-function):
 +	(ignore-errors ...) in 'erc-kill-server-hook.
 +	    When the process for this server does not exist anymore, the hook
 +	    will cause an error, effectively preventing the buffer from being
 +	    killed.
 +
 +2002-12-24  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.9:
 +	Fixed erc-notify-timer so that it passes the correct nick to
 +	the functions on erc-notify-signoff-hook.
 +
 +2002-12-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.41: Doc
 +
 +	* erc-track.el 1.40 (erc-make-mode-line-buffer-name): Removed a
 +	superfluous if construct around erc-track-showcount-string.
 +	(erc-track-modified-channels): Use 1+.
 +	Plus some doc and comment changes.
 +
 +2002-12-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.369: Fix (erc-version) string
 +
 +2002-12-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.368:
 +	Removed unnecessary assignment to free-variable "p" in erc-downcase.
 +
 +	* erc.el 1.367:
 +	Now /PART reason strings are generated the same way /QUIT reason strings
 +	are generated (see variable erc-part-reason).  Also, when a server buffer
 +	is killed, a QUIT command is automatically sent to the server.
 +
 +	* erc.el 1.366:
 +	Changed erc-string-no-properties so that it is more efficient.  Now it uses
 +	set-text-properties instead of creating and deleting a temporary buffer.
 +
 +2002-12-21  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.365:
 +	erc-kill-input: added a check to prevent a (ding) and an error when
 +	    there's nothing to kill (thanks to Francis Litterio, franl on IRC)
 +
 +2002-12-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.364:
 +	AWAY notice duplication prevention. erc-prevent-duplicates now set to ("301") by default, and timeout to 60
 +
 +	* erc.el 1.363: erc-prevent-duplicates: New variable, see docstring
 +
 +2002-12-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.39:
 +	erc-track-modified-channels: Use cddr of cell for old-face. cdr of
 +	    cell is '(1 . face-name), i have no idea why :)
 +
 +2002-12-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.362 (erc-current-nick):
 +	check the server buffer is active before using
 +
 +	Also tabified and cleaned up some trailing whitespace
 +
 +2002-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.38: erc-track-count patch by az
 +
 +2002-12-14  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.361:
 +	last-peers: initialise to a cons. thanks to Francis Litterio
 +	    <franl@world.std.com> for the patch
 +
 +	* erc.el 1.360:
 +	erc-kill-channel-hook, erc-kill-buffer-hook, (erc-kill-channel):
 +	    both hooks now call erc-save-buffer-in-logs, so that query buffers are
 +	    saved properly now, and not just channel buffers.
 +
 +2002-12-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.37 (erc-unique-channel-names): Fix another #hurd
 +	vs. #hurd-bunny bug.
 +
 +	* erc-match.el 1.17 (match): No longer modify erc-send-modify-hook,
 +	since it does not work without a parsed text property, anyway.
 +	(erc-keywords): Allow cons cells.
 +	(erc-remove-entry-from-list): Deal with cons cells.
 +	(erc-keyword-p): Ditto.
 +	(erc-match-message): Ditto.
 +
 +	Moved nil to the beginning of the list, removed :tags for the
 +	-type variables:
 +	(erc-current-nick-highlight-type): Ditto.
 +	(erc-pal-highlight-type): Ditto.
 +	(erc-fool-highlight-type): Ditto.
 +	(erc-keyword-highlight-type): Ditto.
 +	(erc-dangerous-host-highlight-type): Ditto.
 +	(erc-log-matches-flag): Moved nil to the beginning.
 +
 +2002-12-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.359:
 +	erc-beg-of-input-line: Don't do (goto-char (beginning-of-line)), since
 +	    beginning-of-line always moves point and returns nil. Thanks to
 +	    franl on IRC for noting this.
 +
 +	* erc-stamp.el 1.20:
 +	erc-insert-timestamp-left, erc-insert-timestamp-right: Made the
 +	    timestamp a 'field named 'erc-timestamp. Now end-of-line and
 +	    beginning-of-line will move over the timestamp.
 +
 +2002-12-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.34 (erc-button-add-button):
 +	make the created button rear-nonsticky, to allow
 +	cutting and pasting of buttons without worrying about the button properties
 +	being inherited by the text typed afterwards.
 +
 +	* erc.el 1.358: save logfile when killing buffer
 +
 +2002-12-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.36 (erc-modified-channels-display): Reworked.
 +	(erc-track-face-more-important-p): Removed.
 +	(erc-track-find-face): Return only one face.
 +	(erc-track-modified-channels): Reworked.
 +	(erc-modified-channels-string): Changed from (BUFFER FACE...) to
 +	(BUFFER . FACE)
 +
 +	* erc-stamp.el 1.19 (erc-insert-timestamp-right): Do not assume
 +	erc-fill-column is available.
 +
 +2002-12-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.357:
 +	erc-ech-notices-in-minibuffer-flag, erc-minibuffer-notice: Clarified
 +	    the difference in the docstrings.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.356: erc-noncommands-list: added erc-cmd-SM and erc-cmd-SMV
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.355 (erc-cmd-SM): New.
 +	(erc-cmd-SMV): New.
 +
 +	* erc.el 1.354 (erc-modes): New.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.9:
 +	field-end: use (not (fboundp 'field-end)) instead of (featurep 'xemacs)
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.353 (erc-version-modules): New.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/changelog 1.19, debian/control 1.7, debian/scripts/startup.erc 1.3:
 +	debian release 3.0.cvs.20021208
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.352 (erc-split-command): Do the right thing with CTCPs.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.18: Be a bit more functional
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.8:
 +	XEmacs doesn't seem to have field-end, so we provide our own version here.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.9: Small fixes to debrelease target
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.351:
 +	make-obsolete-variable: xemacs doesn't have the WHEN parameter, remove it.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-imenu.el 1.5 (erc-create-imenu-index):
 +	Use (forward-line 0) instead of
 +	  (beginning-of-line) now, sine the latter ignores fields (used in the
 +	  prompt).
 +
 +	* erc.el 1.350:
 +	Rewrite of the prompt stuff to use a field named 'erc-prompt:
 +
 +	erc-prompt: Removed getter and setter functions. The properties were
 +	  already set (and overwritten) in erc-display-prompt.
 +	(erc-prompt): Add the trailing space here, not all over the code.
 +	(erc-display-prompt): Cleaned up a bit. The text-properties now are
 +	  valid on the whole prompt. Also, made the prompt 'intangible to
 +	  avoid confused users.
 +	(erc-bol): Now use the field 'erc-prompt for finding the prompt
 +	(erc-parse-current-line): Cleaned up considerably. Uses (erc-bol) now.
 +	(erc-load-irc-script-lines): Adjusted for the new (erc-prompt).
 +	(erc-save-buffer-in-logs): Adjusted for the new (erc-prompt).
 +
 +	* erc.el 1.349:
 +	erc-uncontrol-input-line: The comment said "Consider it deprecated",
 +	so I removed it now.
 +	erc-prompt-interactive-input: Marked obsolete as of 1.348
 +
 +	* erc.el 1.348:
 +	erc-smiley, erc-unmorse: Put at the end to separate it from the
 +	important parts of erc.el.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.17 (erc-insert-timestamp-right): New algorithm.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.347:
 +	last-peers, erc-message: Explained what last-peers is used for.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.3 (erc-cmd-PAGE): New function.
 +	(erc-ctcp-query-PAGE): Use the catalog entry for the message, too.
 +	(erc-ctcp-query-PAGE-hook): Added custom type.
 +	(erc-page-function): Changed custom type from ... function-item to
 +	... function.
 +	As well as doc strings.
 +
 +2002-12-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.2: provide feature at the end
 +
 +2002-12-06  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-nickserv.el 1.10:
 +	Added austnet in erc-nickserv.el (thanks to Damien Elmes
 +	<resolve@repose.cx>)
 +
 +2002-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.13: Add autoload cookie
 +
 +	* erc-speak.el 1.24: Small fix to make proper voice-changes
 +
 +2002-12-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-lang.el 1.1: New
 +
 +2002-12-03  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.346:
 +	erc-mode-map: Put back C-c C-p (PART) and C-c C-q (QUIT)
 +
 +2002-12-02  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.345:
 +	erc-insert-post-hook: Add :options erc-make-read-only, erc-save-buffer-in-logs
 +	erc-send-post-hook: Add :options erc-make-read-only
 +
 +	* erc.el 1.344: erc-insert-hook: Removed ("this hook is obsolescent")
 +	erc-insert-post-hook: Added :options '(erc-truncate-buffer)
 +
 +2002-12-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.343: Add missing requires
 +
 +2002-11-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.342 (erc-quit-reason-normal):
 +	Remove v before %s so it's "Version ..." not
 +	   "vVersion ..."
 +
 +2002-11-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.7 (erc-encode-coding-string): Add second argument
 +		coding-system, and for non-mule xemacsen, use a new defun instead
 +		of identity.
 +
 +	* erc.el 1.341:  (define-erc-module): Use the appropriate group.
 +	(erc-port): Changed custom type.
 +	(erc-insert-hook): Custom group changed to erc-hooks.
 +	(erc-after-connect): ditto
 +	(erc-before-connect): ditto
 +	(erc-disconnected-hook): ditto
 +
 +	* erc-button.el 1.33 (erc-button): New group, changed all custom groups
 +	from erc to erc-button, but left all erc-faces as-is.
 +
 +	* erc-track.el 1.35 (erc-track): New group, changed all custom groups
 +	from erc to erc-track.
 +
 +2002-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-macs.el 1.1:
 +	Macros for erc-victim handling.  Primary idea is to use setf and some fancy things to get nice syntax. have a look
 +
 +2002-11-26  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.340:
 +	pings, erc-cmd-PING, erc-ctcp-reply-PING, catalog entry CTCP-PING:
 +	Cleaned up. Removed buffer-local variable pings which stored a list of
 +	all sent CTCP PING requests. Now send our full time with the CTCP PING
 +	request and interpret the answer.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.339: nick-stk: replaced by the local variable current-nick.
 +
 +2002-11-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.338 (erc-send-command): Use erc-encode-string-for-target.
 +	(erc-encode-string-for-target): New.
 +
 +	* erc-compat.el 1.6 (erc-encode-coding-string): Add second argument
 +	coding-system, and for non-mule xemacsen, use a new defun instead
 +	of identity.
 +
 +	* erc-nickserv.el 1.9 (erc-nickserv-version): New.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* Makefile 1.8:
 +	UNCOMPILED: erc-chess.el depends on chess-network.el, which might not
 +	be installed. Don't compile it.
 +
 +	* erc.el 1.337:
 +	erc-mode-map: Added C-a as erc-bol (no reason why it shouldn't be),
 +	and removed C-c C-p (part channel) and C-c C-q (quite server) as these
 +	are a bit drastic in their consequences and easy to mistype.
 +
 +2002-11-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.34: erc-track-faces-priority-list: Extended list
 +
 +	* erc.el 1.336:
 +	channel-members: Updated docstring: We have a VOICE predicate, too.
 +
 +	* erc-track.el 1.33 (erc-unique-substrings):
 +	Don't shorten a single channel to "#", but
 +	always give at least 2 chars (except when there are no two chars).
 +
 +2002-11-23  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-nickserv.el 1.8:
 +	support for BrasNET. Thanks to rw on IRC for the settings.
 +
 +2002-11-23  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.335: (erc-default-recipients, erc-session-user-full-name)
 +		(nick-stk, pings, erc-announced-server-name, erc-connected)
 +		(channel-user-limit, last-peers, invitation, away, channel-list)
 +		(last-sent-time, last-ping-time, last-ctcp-time, erc-lines-sent)
 +		(erc-bytes-sent, quitting, bad-nick, erc-logged-in)
 +		(erc-default-nicks): Defvars.
 +
 +	* erc-compat.el 1.5: Switched tests to iso-8859-1 instead of latin-1.
 +
 +	* erc-compat.el 1.4 (erc-compat-version): New.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.334 (smiley): Smileys are a very small module, now.
 +
 +2002-11-22  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.333:
 +	erc-event-to-hook, erc-event-to-hook-name: eval-and-compile these,
 +	    since we need them in a macro. ERC now compiles again!
 +
 +	* erc-speak.el 1.23:
 +	erc-minibuffer-privmsg: Removed setting this variable to nil, since it
 +	    was removed from erc.el.
 +
 +	* erc.el 1.332 (erc-interactive-input-map): Added docstring.
 +	(erc-wash-quit-reason): Extended docstring.
 +	(erc-server-ERROR): Added docstring.
 +	(erc-server-321): buffer-local variable channel-list probably
 +	    shouldn't be renamed erc-channel-list - removed FIXME.
 +
 +	* erc.el 1.331: small cleanup.
 +	("was not used anymore" here means "not used in erc/*.el nor in
 +	fsbot", thanks to deego for checking that.)
 +
 +	erc-minibuffer-privmsg: Removed (was not used anymore)
 +	(erc-reformat-command): Removed (was not used anymore)
 +	(erc-strip-erc-parsed-property): Removed (was not used anymore)
 +	(erc-process-ctcp-response): Removed (replaced by ctcp-query-XXX-hook)
 +	(erc-send-paragraph): Removed ("Note that this function is obsolete,
 +	    erc-send-current-line handles multiline input.")
 +	(erc-input-hook): Removed ("This hook is obsolete. See
 +	    `erc-send-pre-hook', `erc-send-modify-hook' and
 +	    `erc-send-post-hook' instead.")
 +	(erc-message-hook): Removed ("This hook is obsolete. See
 +	    `erc-server-PRIVMSG-hook' and `erc-server-NOTICE-hook'.")
 +	(erc-cmd-default-channel): Removed ("FIXME: no clue what this is
 +	    supposed to do." - it was supposed to prepend the default channel
 +	    to a command before sending it. E.g. typing "/FOO now!" would send
 +	    the IRC command "FOO #mycurrentchannel now!")
 +
 +	* erc.el 1.330:
 +	erc-ctcp-query-PING: Send the whole argument back, not just the first
 +	number. This is required for many clients (e.g. irssi, BitchX, ...)
 +	which send their ping times in two different numbers for microsecond
 +	accuracy.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.32 (erc-track-shorten-function): Allow nil.
 +
 +2002-11-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.31 (erc-unique-channel-names): Fixed bug that appeared
 +	if one target name was a substring of another -- eg. #hurd and
 +	#hurd-bunny.  Added appropriate test.
 +
 +2002-11-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.30:
 +	erc-unique-channel-names: Don't take a substring of channel that could
 +	be longer than the channel, but at most (min (length candidate)
 +	(length channel). (thanks to deego for noticing this)
 +
 +2002-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.8: * (require pcomplete): Only when compiling.
 +
 +2002-11-19  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.29:
 +	erc-track-faces-priority-list: New variable, defines what faces will
 +	be shown in the modeline. If set to nil, the old behavior ("all")
 +	remains.
 +	erc-track-face-more-important-p: new function
 +	erc-track-find-face: new function
 +
 +2002-11-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-fill.el 1.20 (erc-stamp): Require it.
 +
 +	* erc-match.el 1.16 (away): devar for the compiler.
 +
 +	* erc-stamp.el 1.16 (stamp): Moved.
 +
 +	* erc.el 1.329 (erc-version-string): New version.
 +
 +	* erc-autoaway.el 1.7 (erc-autoaway-idletimer): Moved to the front of
 +	the file.
 +
 +	* erc-auto.in 1.2: (generated-autoload-file, command-line-args-left):
 +	Added defvar without value to silence byte compiler.
 +
 +	* Makefile 1.7 (realclean): renamed fullclean to realclean.
 +	(UNCOMPILED): New list, for erc-bbdb.el, erc-ibuffer.el,
 +	erc-speak.el.
 +	(SOURCE): Do not compile UNCOMPILED.
 +	(release): New target.
 +	(ChangeLog): New target.
 +	(todo): New target.
 +
 +	* erc-complete.el 1.12 (erc-match): Require it.
 +	(hippie-exp): Require it.
 +
 +	* erc-ezbounce.el 1.3 (erc): Require it.
 +
 +	* erc-imenu.el 1.4 (imenu): Require it.
 +
 +	* erc-nickserv.el 1.7 (erc-networks): Moved up.
 +
 +	* erc-notify.el 1.7 (pcomplete): Require it.
 +
 +	* erc-replace.el 1.5 (erc): Require it.
 +
 +	* erc-sound.el 1.3 (sound): Typo -- define-key in erc-mode-map.
 +
 +	* erc-speedbar.el 1.10 (dframe): Require it.
 +	(speedbar): Require it.
 +
 +	* erc-track.el 1.28 (erc-default-recipients): devar for the compiler.
 +
 +	* README 1.1: New file.
 +
 +2002-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.1: File needed for mkChangeLog
 +
 +	* mkChangeLog 1.1: Original code by mhp
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.32 (erc-button-list): Renamed to erc-list and moved
 +	to erc.el.
 +
 +	* erc.el 1.328 (erc-list): New.
 +
 +	* erc-track.el 1.27 (erc-make-mode-line-buffer-name): Simplified.
 +	(erc-modified-channels-display): Simplified.  Now works with all
 +	faces, and fixes the bug that when two faces where used (bold
 +	erc-current-nick-face), then no faces was added.
 +
 +	* erc-track.el 1.26: Lots of new tests.  Moved some defuns around in
 +	the file.
 +	(erc-all-channel-names): Renamed.
 +	(erc-all-buffer-names): New name, now include query buffers as
 +	well.
 +	(erc-modified-channels-update-inside): New variable.
 +	(erc-modified-channels-update): Use it to prevent running display
 +	if already inside it.  This prevented debugging of
 +	`erc-modified-channels-display'.
 +	(erc-make-mode-line-buffer-name): Moved.
 +	(erc-track-shorten-names): Don't test using erc-channel-p as that
 +	failed with query buffers.
 +	(erc-unique-substrings): Move setq i + 1 to the end of the while
 +	loop, so that start is used as a default value instead of start +
 +	1.
 +
 +2002-11-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.25:
 +	erc-unique-substrings: define this before using it in assert
 +
 +	* erc.el 1.327:
 +	with-erc-channel-buffer: Define *before* using this macro. This
 +	hopefully fixes a bug noted on IRC.
 +
 +	* erc-notify.el 1.6:
 +	erc-notify-signon-hook, erc-notify-signoff-hook: New hooks. They're
 +	even run when their name suggests!
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-list.el 1.7: Typo.
 +
 +	* erc-speedbar.el 1.9: Whitespace only.
 +
 +	* erc.el 1.326 (define-erc-module): Avoid defining an alias if name and
 +	alias are the same.
 +
 +	* erc-ibuffer.el 1.17: URL
 +
 +	* erc-imenu.el 1.3 (erc-imenu-version): New constant.
 +
 +	* erc-ibuffer.el 1.16 (erc-ibuffer-version): New constant.
 +
 +	* erc-ibuffer.el 1.15: File header, comments.
 +
 +	* erc-fill.el 1.19 (erc-fill-version): New constant.
 +
 +	* erc-ezbounce.el 1.2 (erc-ezb-version): New constant.
 +
 +	* erc-complete.el 1.11 (erc-complete-version): New constant.
 +
 +	* erc-chess.el 1.21 (erc-chess-version): New constant.
 +
 +	* erc-chess.el 1.20: Whitespace only.
 +
 +	* erc-bbdb.el 1.20 (erc-bbdb-version): Typo.
 +
 +	* erc-bbdb.el 1.19 (erc-bbdb-version): New constant.
 +	Lots of whitespace changes.  Changes to the header.
 +
 +	* erc-track.el 1.24 (erc-track-shorten-aggressively): Doc.
 +	(erc-all-channel-names): New function.
 +	(erc-unique-channel-names): New function.
 +	(unique-substrings): Renamed.
 +	(erc-unique-substrings): New name
 +	(unique-substrings-1): Renamed.
 +	(erc-unique-substring-1): New name.  Added lots of tests.
 +	(erc-track-shorten-names): Call erc-unique-channel-names instead
 +
 +	* erc-match.el 1.15 (match): Rewrote a as module.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-netsplit.el 1.6 (erc-netsplit-version): New.
 +	(netsplit): Defined as a module, replacing erc-netsplit-initialize
 +	and erc-netsplit-destroy.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.23 (erc-track-switch-buffer):
 +	define-erc-module defines erc-track-mode,
 +	not erc-track-modified-channels-mode.
 +
 +	* erc.el 1.325:
 +	Variables erc-play-sound, erc-sound-path, erc-default-sound,
 +	erc-play-command, erc-ctcp-query-SOUND-hook and functions
 +	erc-cmd-SOUND, erc-ctcp-query-SOUND, erc-play-sound, erc-toggle-sound
 +	moved to erc-sound.el
 +
 +	Variables erc-page-function, erc-ctcp-query-PAGE-hook and function
 +	erc-ctcp-query-PAGE moved to erc-page.el
 +
 +	* erc-page.el 1.1:
 +	erc-page.el: New file. CTCP PAGE support for ERC, extracted from erc.el.
 +
 +	* erc-sound.el 1.2:
 +	defin-erc-module: Typo. Autoload should do erc-sound-mode and "erc-sound".
 +
 +	* erc-sound.el 1.1:
 +	erc-sound.el: New file. Contains all the CTCP SOUND stuff from erc.el.
 +
 +	* erc.el 1.324 (erc-process-ctcp-request):
 +	Removed (old-style CTCP handling)
 +	(erc-join-autogreet): Removed (was broken anyways)
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.31 (erc-button-version): New constant.
 +
 +	* erc-button.el 1.30 (button): rewrote as a module.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.323: New functions:
 +	(erc-event-to-hook), (erc-event-to-hook-name): Convert an event to the
 +	corresponding hook. The latter only returns the name, while the former
 +	interns the hook symbol and returns it.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-replace.el 1.4:
 +	Practically total rewrite.  All smiley stuff deleted.
 +
 +	* erc-track.el 1.22 (track): typo.
 +
 +	* erc.el 1.322 (define-erc-module): Doc change.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.6: Changed to use define-erc-module.
 +
 +	* erc.el 1.321 (define-erc-module):
 +	Make the enable/disable functions interactive.
 +
 +	* erc.el 1.320 (erc):
 +	Don't use switch-to-buffer when we're in the minibuffer,
 +	because that does not work. Use display-buffer instead. This leaves
 +	two problems: The point does not advance to the end of the buffer for
 +	whatever reason, and after leaving the minibuffer, the new window gets
 +	buried.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.15 (stamp): Doc change.
 +
 +	* erc-stamp.el 1.14 (erc-stamp-version): New constant.
 +	(stamp): downcase alias name of the mode.
 +
 +	* erc.el 1.319 (define-erc-module): Added defalias option, renamed
 +	parameters again.
 +
 +	* erc-track.el 1.21: erc-track-modified-channels-mode is now only an
 +	alias to erc-track-mode.  Only erc-track-mode is autoloaded.
 +	(track): Rewrote call to define-erc-module.
 +
 +2002-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.5: * Spelling fix
 +
 +	* erc-fill.el 1.18: * Fix autoload definition for erc-fill-mode
 +
 +	* debian/control 1.6, debian/maint/postinst 1.4, debian/maint/prerm 1.4:
 +	* Remove /usr/doc -> /usr/share/doc link handling
 +
 +	* debian/changelog 1.18: * Sync with reality
 +
 +	* debian/scripts/startup.erc 1.2:
 +	* Add /usr/share/emacs/site-lisp/erc/ to load-path
 +	* (load "erc-auto")
 +
 +	* debian/README.Debian 1.4:
 +	* Info about the changes since last release updated
 +
 +	* erc-pcomplete.el 1.11: * Fix emacs/xemacs compatibility
 +
 +	* debian/scripts/install 1.10: * Dont compile erc-compat, fix ELCDIR
 +
 +	* debian/control 1.5: * Change maintainer field
 +
 +	* erc.el 1.318:
 +	* (defin-erc-module): Renamed argument mode-name to mname because silly byte-compiler thought we were talking about `mode-name'.
 +
 +	* Makefile 1.6: * Added debrelease target
 +
 +	* erc-bbdb.el 1.18, erc-pcomplete.el 1.10, erc-stamp.el 1.13, erc.el 1.317:
 +	* (define-erc-module): Added mode-name argument.
 +	* Converted erc-bbdb, erc-pcomplete and erc-stamp to new macro.
 +	* autoload fixes
 +
 +	* erc-bbdb.el 1.17:
 +	* Create a global-minor-mode (i.e., make it a proper erc-module)
 +
 +	* erc.el 1.316: * (define-erc-modle): New defmacro
 +
 +2002-11-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.5 (erc-autoaway-idle-seconds):
 +	t in docstrings should be non-nil
 +
 +2002-11-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, 
 +	  erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20:
 +	Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
 +
 +	* erc-stamp.el 1.12 (erc-insert-away-timestamp-function):
 +	New custom type.
 +	(erc-insert-timestamp-function): New custom type.
 +
 +	* erc-fill.el 1.16 (erc-fill-function): Doc, new custom type.
 +	(erc-fill-static): Doc.
 +	(erc-fill-enable): New function.
 +	(erc-fill-disable): New function.
 +	(erc-fill-mode): New function.
 +
 +	* erc-match.el 1.13 (erc-match-enable): add-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +	(erc-match-disable): remove-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +
 +2002-11-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.3:
 +	- Added a way to use auto-away using emacs idle timers
 +	- Renamed erc-set-autoaway to erc-autoaway-possibly-set-away for consistency
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.315: erc-mode-map: Removed the C-c C-g binding for erc-grab
 +
 +	* erc.el 1.314:
 +	(erc-server-341) Another instance of the channel/chnl problem i didn't
 +	see last time
 +
 +2002-11-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.3 (erc-decode-coding-string): typo
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.313 (erc-server-341):
 +	variable name should be chnl not channel, as it is
 +	used this way in this function, and the other erc-server-[0-9]* use
 +	chnl too.
 +
 +	* erc-autoaway.el 1.2:
 +	Set back on all servers, not just the current one, since we're set
 +	away on all servers as well.
 +
 +	* HISTORY 1.2: Fixed typo (ngu.org => gnu.org)
 +
 +	* erc-autoaway.el 1.1, erc-fill.el 1.15, erc.el 1.312: erc-autoaway.el:
 +	* new file
 +
 +	erc.el:
 +	* Removed auto-discard-away facility (now included in erc-autoaway.el)
 +	* (erc-away-p): new function
 +
 +	erc-fill.el:
 +	* (erc-fill-variable): Check wether erc-timestamp-format is bound before
 +	                       using it (erc-fill.el does not require erc-stamp).
 +
 +2002-11-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* TODO 1.4:
 +	TODO: moved it to http://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO
 +
 +	* erc.el 1.311 (with-erc-channel-buffer): Rudimentary doc string.
 +
 +2002-11-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.28 (erc-nick-popup-alist): Made a defcustom.
 +
 +	* erc-button.el 1.27 (erc-button-disable): New function.
 +	(erc-button-enable): New function, replaces the add-hook calls at top-level.
 +	(erc-button-mode): New minor mode.
 +
 +2002-11-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.26 (erc-button-entry): Use erc-button-syntax-table.
 +
 +	* erc.el 1.310, erc-stamp.el 1.10: Doc changes.
 +
 +	* erc-match.el 1.12 (erc-match-mode): New function, replacing the
 +	add-hook.
 +	(erc-match-enable): New function.
 +	(erc-match-disable): New function.
 +	(erc-current-nick-highlight-type): Changed from 'nickname to 'nick
 +	to make it consistent with the others.
 +	(erc-match-message): Ditto.
 +
 +	* erc-button.el 1.25 (erc-button-syntax-table): New variable.
 +	(erc-button-add-buttons): Use it.
 +
 +2002-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.309:
 +	1) (bug) ERC pops up a new buffer and window when being messaged
 +	   from an ignored person. fixed
 +	2) (misfeature) ERC notices the user in the minibuffer when it
 +	   ignores something - this can get very annoying, since the
 +	   minibuffer is also visible when not looking at ERC buffers.
 +	   Added a customizeable variable for this, the default is nil.
 +	3) (wishlist) There is no IGNORE or UNIGNORE command.
 +	   Added.
 +	4) (wishlist) Some IRC clients, notably irssi, allow the user to
 +	   ignore "replies" to ignored people. A reply is defined as a
 +	   line starting with "nick:", where nick is the nick of an
 +	   ignored person. Added that functionaly.
 +	Done by Jorgen Schaefer <forcer@forcix.cx>
 +
 +2002-11-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.308 (erc-connect): set-process-coding-system to raw-text.
 +
 +2002-11-01  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-pcomplete.el 1.9, erc-stamp.el 1.9, erc-track.el 1.19:
 +	Fixed more autoloads
 +
 +	* erc-compat.el 1.2: Added autoload for erc-define-minor-mode
 +
 +2002-11-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.307: * (erc-send-command): will break long messages into
 +	a bunch of smaller ones, to prevent them from being truncated by the server.
 +	The patch also axes some trailing whitespace. :-) <resolve>
 +
 +2002-10-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.8 (erc-compat): Require.
 +	(erc-completion-mode): Use erc-define-minor-mode.
 +
 +	* erc-track.el 1.18 (erc-compat): Require.
 +	(erc-track-modified-channels-mode): Use erc-define-minor-mode.
 +
 +	* erc-stamp.el 1.8 (erc-compat): Require.
 +	(erc-timestamp-mode): Use erc-define-minor-mode.
 +
 +	* erc-compat.el 1.1: New file with the code for erc-define-minor-mode,
 +	erc-encode-coding-string and erc-decode-coding-string.  Essentially
 +	all the stuff that cannot be tested for using a simple boundp or
 +	fboundp -- eg. because the number of arguments are wrong.
 +
 +	* erc.el 1.306 (erc-compat): Require.
 +	(erc-process-coding-system): Moved to erc-compat.el.
 +	(erc-connect): Do not set-process-coding-system.
 +	(encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(decode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-decode-coding-string): Compatibility code moved to erc-compat.el.
 +
 +2002-10-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.305 (erc-display-line-1): Removed call to
 +	erc-decode-coding-string.
 +	(erc-parse-line-from-server): Added call to
 +	erc-decode-coding-string before anything gets parsed at all.
 +	(erc-decode-coding-string): Use undecided coding system.
 +
 +2002-10-24  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-button.el 1.24, erc.el 1.304:
 +	Added LASTLOG command and action for nick-button
 +
 +2002-10-22  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.7:
 +	Fixed nopruning bug, added /MODE channel (mode) [nicks...] completion - mode not completed yet.
 +
 +2002-10-16  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.6:
 +	Fixed 'Hi delysid:' bug in SAY completion after realizing that pcomplete on commands already took care of completing the initial nick:
 +
 +2002-10-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.5: update from sachac
 +
 +2002-10-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.303 (erc-emacs-time-to-erc-time): Catch when tm is nil.
 +
 +2002-10-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.302:
 +	* Fixed `erc-scroll-to-bottom' to scroll to the bottom even when
 +	  in the middle of a line. Might also fix the Magic ECHAN Bug[tm]. (-:
 +
 +2002-10-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.6: Fixed erc-networks for the opn->freenode change
 +
 +2002-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.4:
 +	Make erc-completion-mode work interactively with already joined channel buffers
 +
 +	* erc-chess.el 1.19: Add autoload cookies
 +
 +	* erc-notify.el 1.5: Add pcomplete support
 +
 +	* erc.el 1.301:
 +	Remove autoload statments, remove autoload cookie from erc-mode and erc-info-mode
 +
 +	* erc-fill.el 1.14, erc-match.el 1.11: add/remove autoload cookies
 +
 +2002-10-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.3 (erc-completion-mode): New global minor mode
 +	with autoload cookie.
 +	(erc-pcomplete-enable): Renamed erc-pcomplete-initialize.
 +	(erc-pcomplete-disable): New function.
 +
 +	* erc-complete.el 1.10: Doc changes.
 +
 +	* erc-stamp.el 1.7 (erc-stamp-enable): Renamed erc-stamp-initialize.
 +	(erc-stamp-disable): Renamed erc-stamp-destroy.
 +	(erc-timestamp-mode): Use new names.
 +
 +	* erc.el 1.300: Removed autload for erc-complete and
 +	erc-track-modified-channels-mode -- the autoload cookie should do
 +	that instead.
 +	(erc-input-message): Doc string, removed binding for erc-complete.
 +	(erc-mode-map): Removed binding for erc-complete.
 +
 +2002-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.4:
 +	New functions erc-notify-JOIN and erc-notify-QUIT to catch some common cases (warning, untested)
 +
 +2002-10-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.6 (erc-timestamp-mode): New function.  Removed call
 +	to erc-stamp-initialize at the end.
 +
 +2002-09-25  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.299:
 +	Added customizable `erc-process-coding-system' variable.
 +
 +2002-09-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-fill.el 1.13:
 +	`erc-fill-variable' now does the right thing when `erc-hide-timestamps' is non-nil
 +
 +2002-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.12:
 +	patch from Peter Solodov <peter@alcor.concordia.ca>  (note, its slightly broken still
 +
 +2002-09-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.2: Added LEAVE as alias for PART
 +
 +2002-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.1:
 +	By sachac (good work!) keep up doing such things
 +
 +2002-08-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.298:
 +	A fix for Bug#133267: now you can put (erc-save-buffer-in-logs) on erc-insert-post-hook to save *every* incoming message.
 +
 +2002-08-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.297:
 +	Changed default value of erc-common-server-suffixes because of the OPN
 +	name change
 +
 +2002-08-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.5: Try to reactivate isearch in xemacs
 +
 +	* erc-stamp.el 1.4:
 +	fixes issues related to comparative emacsology and a silly bug
 +
 +2002-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.296:
 +	New hook erc-send-completed-hook (for robot stuff), changed alexanders email address to reflect reality, little fix to erc-auto-query to get a bit of a speedup
 +
 +2002-08-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.23:
 +	Fixed case-fold-search (thanks sachac), now lambda works in erc-button-alist, added wardwiki+google+symvar+rfc+itime regexps from the wiki
 +
 +2002-08-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.22:
 +	erc-nick-popup-alist: New variable to make erc-nick-popup configurable
 +
 +2002-08-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.21 (erc-recompute-nick-regexp): Fixed regexp.
 +
 +	* erc-button.el 1.20 (erc-button-buttonize-nicks): Changed custom type
 +	to integer.
 +	(erc-button-add-buttons): Moved button removal code to new
 +	function.
 +	(erc-button-remove-old-buttons): New function.
 +	(erc-button-add-button): Removed use of overlays and used
 +	erc-button-add-face instead.
 +	(erc-button-add-face): New function to merge faces as text
 +	properties.  This should be much faster when lots of buttons
 +	appear.
 +	(erc-button-list): New helper function.
 +
 +	* erc.el 1.295 (erc-display-message): Fixed argument list.
 +	(erc-display-prompt): Reduced calls to length, use start-open
 +	property for XEmacs to prevent a little box of erc-prompt-face at
 +	the end of messages other people send.
 +	(erc-refresh-channel-members): Fix XEmacs calls to split-string,
 +	which may return an empty string at the end of the list.  This
 +	would cause hangups in erc-button in re-search-forward loops.
 +	(erc-get-channel-mode-from-keypress): Replaced control codes with
 +	octal escape sequences.
 +
 +2002-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.19:
 +	Try to be compatible to XEmacs regexp-opt. (Im going to quit this job if I find more of those damn differencies
 +
 +	* debian/README.Debian 1.3, debian/scripts/install 1.9:
 +	* Added info to README.Debian
 +	* Finished debian/scripts/install
 +
 +2002-08-13  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/install 1.8: First attempt to fix it
 +
 +	* debian/README.Debian 1.2, debian/changelog 1.17, debian/scripts/install 1.7:
 +	changelog: Changed maintainer and added new entry
 +	README.Debian: Re-explained the byte-compile issue
 +	scripts/install: Exclude erc-bbdb|chess|ibuffer|speedbar from
 +	byte-compiling
 +
 +	* erc-track.el 1.17: Added C-c C-SPC in addition to C-c C-@
 +
 +	* erc-notify.el 1.3: Little docstring change
 +
 +2002-08-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.3:
 +	Change one use of set-text-properties to add-text-properties (tnx Lathi)
 +
 +2002-08-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.2: added erc-timestamp-only-if-changed-flag
 +
 +2002-07-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.294:
 +	Removed timestamp related code and moved into erc-stampe.l
 +
 +	* erc-stamp.el 1.1:
 +	Timestamping code moved out of erc.el. Additional, now we can timestamp either on the left or on the right side
 +
 +2002-07-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.293:
 +	* Make ctcp ping return its message in the active buffer, instead of the server buffer
 +	* Corrected minimal typo in catalog
 +	* Added var and variable as alias for /set
 +
 +2002-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.16:
 +	* New function erc-track-switch-buffer (by resolve)
 +	  Bound to C-c C-SPC, enjoy!
 +
 +2002-07-08  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.16: New snapshot deb
 +
 +	* debian/scripts/install 1.6: Rewrote in make.
 +	Does not byte-compile erc-speak.el at all, and excludes erc-track.el too, if
 +	ran for xemacs.
 +
 +	* debian/control 1.4: Added dependency on make
 +
 +	* debian/copyright 1.2: Updated copyright info
 +
 +	* debian/rules 1.10: Use $(wildcard *.el) instead of a hardcoded list
 +
 +2002-07-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.292:
 +	erc-iswitchb now works correctly if erc-modified-channels-alist is non-nil
 +
 +2002-07-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.8:
 +	* changed how we check if we should activate "Track hidden channels" and
 +	  whether it should be selected - fixes a bug Xemacs where whole menu bar
 +	  does not work if menu is loaded
 +
 +	* erc-menu.el 1.7:
 +	* added "Disconnect from server", only selectable if erc-connected is non-nil
 +
 +	* topic is allowed to be set by normal users if channel mode is not +t
 +
 +	* add " ..." after description if arguments needed after selecting menu item
 +
 +	* only allow selecting of menu points needing a channel if current buffer is
 +	  a channel buffer - done by testing if channel-members is non-nil
 +
 +	* put erc-match functions in new group "Pals, fools and other keywords"
 +
 +	* erc.el 1.291:
 +	* moved definition of erc-show-my-nick to GUI variables section
 +
 +	* erc-connected variable now defined with defvar
 +	  now set in channel and query buffers, was only in server buffer before
 +	  upon disconnect, set erc-connected to nil in all the server's buffers
 +
 +	* added erc-cmd-GQUIT and its alias erc-cmd-GQ - quit all servers at once
 +
 +	* added interactive function erc-quit-server, bound to C-c C-q
 +
 +	* added erc-server-WALLOPS
 +
 +	* added WALLOPS to english catalog, fixed s461 (was showing message twice)
 +
 +	* typo fixes, spacing change
 +
 +2002-06-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.290: Use pp-to-string in /set (without args)
 +
 +	* erc-netsplit.el 1.5:
 +	Make /set anonymous-lign set erc-anonymous-login, also report
 +	which var was set to which val.
 +
 +2002-06-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.6: added "Customize ERC"
 +
 +2002-06-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.289: New variable: erc-use-info-buffers, defaults to nil.
 +	  This prevents info-buffers from being created/updated.
 +	  Set to t if you use :INFO buffers.
 +	  (by rw)
 +	Delete (erc-display-prompt) from reconnect to avoid clutter
 +
 +2002-06-23  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.288:
 +	erc-get-channel-mode-from-keypress is now bound to C-c C-m
 +	erc-insert-mode-command is taken care of by this function as well
 +
 +2002-06-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.15:
 +	Fixed bug where buffer-names suddenly had text-properties.
 +
 +2002-06-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* Makefile 1.5: changed erc-auto.el to $(SPECIAL) in make fullclean
 +
 +	* Makefile 1.4: remove erc-auto.el on make fullclean
 +
 +2002-06-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.10: fixed spelling error
 +
 +	* erc-track.el 1.14, erc-match.el 1.9: * erc-match.el:
 +	  highlight current nickname in its own face (deactivated by default):
 +	  - added erc-current-nick-highlight-type, erc-current-nick-face,
 +	    erc-current-nick-p
 +
 +	* erc-track.el:
 +	  added support for erc-current-nick-face
 +
 +2002-06-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.287: * added beginning suport for 005 numerics:
 +	  - added buffer local variable erc-server-parameters
 +	  - added erc-server-005, which sets erc-server-parameters if the server has
 +	    used this code to show its parameters
 +
 +2002-06-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.286:
 +	* bugfix: when pasting lines with blank lines in between, remove the blank lines
 +	  but send the rest
 +
 +	* since we know the command, use it when checking what's in erc-hide-list
 +	  added check to erc-server-KICK
 +
 +	* added some blank lines for better readability
 +
 +2002-06-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.5 (erc-nickserv-alist): Fixed typo.
 +
 +2002-06-15  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.4 (erc-networks): Added doc string.
 +	(erc-nickserv-alist): Added doc string.
 +
 +2002-06-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el 1.4:
 +	fixed bug so that the prompt and command always get put at the end of the buffer
 +
 +2002-06-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.3: Added iip support.
 +	Added :type for erc-nickserv-passwords custom.
 +	Fixed hook usage.
 +
 +2002-06-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.2: * added GalaxyNet
 +
 +	* erc-nickserv-alist:
 +	  - sorting networks alphabetically
 +	  - added two more pieces of information in erc-nickserv-alist:
 +	    word to use for identification and whether to use the nickname
 +
 +	* erc-current-network:
 +	  - made regex case insensitive, downcase server to match
 +	  - uses the new information
 +	  - now uses new variable erc-networks instead of doing checking manually
 +
 +	* added variable erc-networks
 +
 +	* fixed some indentation, documentation
 +
 +2002-06-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.285: Fix for kill-buffer hook stuff
 +
 +2002-06-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.284: Added /squery command
 +
 +2002-06-06  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.5: * made group Channel modes
 +	  - moved change mode and invite only mode to here
 +	  - added secret, moderated, no external send, topic lock, limit, key
 +
 +	* check that user is in a channel buffer and user is a channel operator
 +	  for all op-related actions
 +
 +	* "Identify to nickserv" needs erc-nickserv-identify defined
 +
 +	* added "Show ERC version"
 +
 +	* erc.el 1.283:
 +	* added erc-set-channel-limit, erc-set-channel-key, erc-toggle-channel-mode
 +
 +	* added erc-get-channel-mode-from-keypress, which is binded to C-c m
 +	  sends the next character which is typed to one of the 3 new functions
 +	  - did not remove erc-invite-only-mode and it's key binding in case
 +	    people are used to it, although it probably should be removed...
 +
 +	* in erc-server-MODE:
 +	  added check if tgt equal to user's nick
 +	  removed erc-display-line, only using the erc-display-message
 +
 +	* added s461 to english catalog
 +
 +	* fixed bug where Xemacs would not quit if erc-quit-reason was
 +	  set to erc-quit-reason-various and assoc-default was not defined
 +
 +2002-06-04  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-ezbounce.el 1.1, erc-match.el 1.8:
 +	* erc-ezbounce.el: Added. Provides support for ezbouncer; automatic login,
 +	                   session management implemented. I've contacted the author
 +			   about stuff in EZBounce's logging.
 +	* erc-match.el: Fixed a stupid mistake where
 +	                "*** Your new nick is <foo>" would trigger an error.
 +
 +2002-06-04  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.1, erc.el 1.282: * added erc-nickserv.el
 +	* moved nickserv identification variables and functions to the new file
 +	  (require 'erc-nickserv) is now necessary for this to work
 +
 +	* erc.el 1.281:
 +	* results of /COUNTRY now formatted as notice; errors are ignored, 
 +	  fixing
 +	  bug which made prompt disappear
 +
 +	* added undefined-ctcp error message to english catalog
 +
 +	* changed some (when (not erc-disable-ctcp-replies) to use unless instead
 +	  and some if's without else statments to use when or use
 +
 +	* CTCP replies now use erc-display-message, formatted as notices
 +
 +	* added following to english catalog:
 +	  - undefined-ctcp
 +	  - CTCP-CLIENTINFO, CTCP-ECHO, CTCP-FINGER, CTCP-PAGE, CTCP-PING,
 +	    CTCP-SOUND, CTCP-TIME, CTCP-UNKNOWN, CTCP-VERSION
 +	  - s303, s305, s306, s353
 +
 +	* split erc-server-305-or-306 into erc-server-305 and erc-server-306
 +
 +	* KICK already had buffer set, using it
 +
 +	* erc.el 1.280:
 +	* erc-format-timestamp now only called from erc-display-message and
 +	  erc-send-current-line
 +
 +	* all instances of erc-display-line with erc-highlight-error
 +	  changed to use erc-display-message
 +
 +	* added following error messages to english catalog:
 +	  bad-ping-response, bad-syntax, cannot-find-file, cannot-read-file,
 +	  ctcp-request, flood-ctcp-off, flood-strict-mode, no-default-channel,
 +	  no-target, variable-not-bound
 +
 +	* added following server related messages to english catalog:
 +	  s324, s329, s331, s332, s333, s341, s406, KICK, KICK-you, KICK-by-you, MODE-nick
 +
 +	* ignoring server codes 315, 369
 +
 +	* added erc-server-341, erc-server-406
 +
 +	* channel topic and mode notices displayed in respective channel buffers if they
 +	  exist
 +
 +	* erc-server-KICK: display the message before removing this channel so that we
 +	  can track the kick
 +
 +	* send parsed to erc-ctcp-query-ACTION-hook so that actions can be checked
 +	  by erc-match
 +
 +	* fixed bug where nil was shown if no reason was given by users on /PART
 +
 +2002-06-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.7:
 +	* fixed bug where erc-log-matches produced an error when the value of
 +	  (erc-default-target) was not a channel
 +	* use erc-format-timestamp, if it's non-nil, for %t in erc-log-match-format
 +
 +2002-06-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el 1.18:
 +	* made action case insensitive in erc-nick-popup and added a more descriptive
 +	  error message
 +
 +2002-05-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.279:
 +	Removed multiple calls of `erc-prompt' in `erc-display-prompt'
 +
 +2002-05-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.278:
 +	First step timestampkiller cleanup. I'm tired, do the rest tomorrow.
 +
 +	* erc.el 1.277:
 +	New functionality: Catch channel/server buffer kills through kill-buffer-hook.
 +	Currently, it only does a PART if you kill a channel buffer.
 +
 +2002-05-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.276:
 +	defvar'ed some buffer-local variables to make elint at least a bit more happy.
 +	  Moved comments into docstrings.
 +	Changed some instances of member to memq.
 +
 +	* erc-track.el 1.13, erc.el 1.275:
 +	erc.el: (erc-message-type-member): New function, used to test
 +	for message type. Require erc-parsed text-property.
 +	erc-track.el: erc-track-exclude-types: New variable. Defaults to ("JOIN" "PART") right now for testing, it should eventually set to nil soon again.
 +	(erc-track-modified-channels): Use above fun and var to optionally exclude certain message types from channel tracking.
 +
 +2002-05-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* CREDITS 1.5: added myself, vain as it sounds ;)
 +
 +2002-05-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.274: * Some small docstring fixes
 +	* (erc-display-line): Now takes also a process object in the buffer argument.
 +	  Used for easy sending to the server buffer.
 +	* Several places: Just pass proc, not (process-buffer proc)
 +
 +2002-05-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.273: Mostly docstring fixes/additions
 +
 +	* erc-netsplit.el 1.4: Doc fixes, and a new netjoin-done message.
 +
 +	* erc-fill.el 1.11: Doc fixes, erc-fill custom group, autoloads.
 +
 +	* erc-netsplit.el 1.3: Fix to erc-netsplit-timer.
 +
 +	* erc-netsplit.el 1.2: Fixed a silly typo
 +
 +	* erc-maint.el 1.1: is this really necessary?
 +
 +	* erc.el 1.272: Added new variable erc-hide-list.
 +	It affects erc globally right now, and is used to hide certain IRC type messages like JOIN and PART.
 +
 +	* Makefile 1.3: Doh, I should really test this before checkin :)
 +
 +	* Makefile 1.2: Silly cut&paste bug fixed
 +
 +	* erc-list.el 1.6: Added autoload cookie
 +
 +	* erc-match.el 1.6: Added missing require erc.
 +
 +	* erc-notify.el 1.2: Autoload cookies and a -initialize function.
 +
 +	* erc-chess.el 1.18: Added autoload cookies
 +
 +	* Makefile 1.1: Finally, we have a Makefile.
 +	Primarily used for autoload definition generation right now.
 +
 +	* erc-auto.in 1.1: First version.
 +
 +	* erc-track.el 1.12: Added autoload cookie
 +
 +	* erc-netsplit.el 1.1:
 +	New module, used to autodetect and hide netsplits.
 +	(Untested, no netsplit happened yet :) )
 +
 +	* erc-nets.el 1.3: Added some old code I once worked on.
 +	Added autoload cookie
 +
 +2002-05-24  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.10:
 +	removed reference in documentation to old variable, changed it to the new one
 +
 +	* erc.el 1.271:
 +	* added new function erc-connection-established which is called after receiving
 +	  end of MOTD (does nothing if it's been called before)
 +
 +	* added new hook erc-after-connect which is called from
 +	  erc-connection-established with the arguments server (the announced server)
 +	  and nick - which other arguments should be sent??
 +
 +	* added buffer variable erc-connected which is set to t the first time
 +	  erc-connection-established is called, set to nil again if we've been
 +	  disconnected
 +
 +	* set initial user mode
 +	  - added custom variable erc-user-mode which can be a string or a function
 +	    which returns a string
 +	  - new function erc-set-initial-user-mode gets called from
 +	    erc-connection-established
 +
 +2002-05-22  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.270: fixed bug where prompt was missing after reconnect
 +
 +2002-05-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.269:
 +	in erc-nickserv-identify: if network is unknown, just use "Nickserv"
 +
 +	* erc.el 1.268: * fixed some typos
 +
 +	* timestamping
 +	  - ctcp request messages and replies now have timestamp
 +	  - timestamps in front of error messages now in timestamp face
 +	  - added timestamp to more error messages
 +
 +	* ctcp reply messages, server ping message updated
 +
 +	* added variable erc-verbose-server-ping - check this instead of erc-paranoid
 +
 +	* added whowas on no such nick:
 +	  - added variable erc-whowas-on-nosuchnick
 +	  - in erc-server-401 do WHOWAS if erc-whowas-on-nosuchnick is non-nil
 +
 +	* erc.el 1.267: forgot documentaion for erc-nickserv-alist
 +
 +	* erc.el 1.266: NickServ identification changed and enhanced:
 +	- erc-nickserv-identify-autodetect now called from erc-server-NOTICE-hook
 +	- now possible to identify automatically without prompt:
 +	  - added custom variables erc-prompt-for-nickserv-password and
 +	    erc-nickserv-passwords
 +	- added erc-nickserv-alist containing the different networks' nickserv details
 +	- added function erc-current-network to determine the network symbol
 +	- fixed bug where identification on dalnet didn't work, because they now
 +	  require NickServ@services.dal.net
 +	  now sends to all NickServ with nick@server where possible
 +
 +2002-05-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.9:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +	* erc.el 1.265: erc.el:
 +	* fixed bug where topic wasn't being set when chanel name was provided
 +
 +	erc-fill.el:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +2002-05-16  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.264: whitespace fix
 +
 +2002-05-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.263:
 +	* added explanation of empty string working in erc-quit-reason-various-alist
 +	* removed the text property from erc-send-message, it caused problems
 +	  with /SV (as noticed by gbvb on IRC) and is obviously not needed
 +	* when receiving a ctcp query, convert type to uppercase to allow for
 +	  "/ctcp nick time" and not just "/ctcp nick TIME"
 +	* timestamp in front of server notices now shown in the timestamp face
 +
 +2002-05-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.262:
 +	- in erc-format-privmessage: `erc-format-timestamp' added to message after
 +	  message's text properties are applied so that it doesn't lose its face
 +
 +	- /quit without reason now works when `erc-quit-reason' is set to
 +	  `erc-quit-reason-various' and the empty string "" is defined in
 +	  `erc-quit-reason-various-alist'
 +
 +2002-05-13  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.16:
 +	* Applied Drewies patch to pop-up on nick changes when -popup-type is 'visible
 +
 +2002-05-12  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.15, erc.el 1.261:
 +	* erc-bbdb.el: pop up the buffer on /whois when erc-bbdb-popup-type is 'visible
 +	* erc.el: fix for empty quit reason problem by drewie.
 +
 +2002-05-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.260: disumu nick patch
 +	- added erc-show-my-nick (default t)
 +	  if t, show nickname like <nickname>
 +	  if nil, only show a > character before the message
 +	- added faces erc-nick-default-face and erc-nick-msg-face
 +	  - nicknames (channel, msgs, notices) are now in bold face by default
 +	  - the msg face matches the erc-direct-msg-face color
 +
 +2002-05-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.259 (erc-send-pre-hook): Doc change.
 +
 +	* CREDITS 1.4: Alexander L. Belikoff is confirmed original author.
 +
 +2002-05-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.258:
 +	timestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumu
 +
 +2002-05-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.257: *** empty log message ***
 +
 +2002-05-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.256:
 +	New var: erc-echo-notices-in-minibuffer-flag. defaults to t.
 +
 +2002-05-04  John Wiegley  <johnw@gnu.org>
 +
 +	* TODO 1.3: *** empty log message ***
 +
 +2002-05-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.255: Copyright notice, version string updates.
 +
 +2002-05-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.254: Comment: dme is David Edmondson
 +
 +2002-05-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.253 (erc-warn-about-blank-lines): New option.
 +	(erc-send-current-line): Use it.
 +	(erc-quit-reason-various-alist): New option.
 +	(erc-quit-reason): New option.
 +	(erc-quit-reason-normal): New function.
 +	(erc-quit-reason-zippy): New function.
 +	(erc-quit-reason-various): New function.
 +	(erc-cmd-QUIT): Use them.
 +
 +2002-04-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.252: Version 2.92
 +
 +	* erc.el 1.251 (erc-send-modify-hook): Default value is nil.
 +
 +2002-04-27  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.250:
 +	Don't redisplay the prompt if the ERC buffer is no longer alive.
 +
 +2002-04-26  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.249:
 +	Don't call `set-buffer' on old-buf unless the buffer is valid.  It's
 +	often not when separate frames are being used.
 +
 +2002-04-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.17: fixed up erc-nick-regexp
 +
 +2002-04-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.248:
 +	`erc-prompt' may now be a function that returns a string (which is
 +	used as the prompt). I don't use Customize but I think customization
 +	of it may be broken if it's not a string.
 +
 +	There is a new `erc-prompt' function that returns the prompt as a
 +	string (e.g., returning either the result of `(funcall erc-prompt)' or
 +	`erc-prompt').
 +
 +	This allows for dynamic prompts, such as a LispWorks-like prompt, or
 +	one containing simply the current channel name. It was requested by
 +	Mojo Nichols (nick michols) in #emacs today, 21-Apr-2002; cf. the
 +	#emacs logs at <URL:http://www.tunes.org/~nef/logs/emacs/02.04.21.
 +
 +2002-04-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.247:
 +	fix erc-send-current-line to work on empty lines again (without sending the prompt)
 +	Fix C-c C-t to not include the nick/time info
 +	(both from antifuchs)
 +
 +	* erc-complete.el 1.9: Fix for xemacs elt behaviour
 +
 +2002-04-17  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.17:
 +	Added a missing arg in a call to erc-chess-handler.
 +
 +2002-04-15  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.16: *** empty log message ***
 +
 +2002-04-14  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.15: *** empty log message ***
 +
 +2002-04-12  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.14: *** empty log message ***
 +
 +	* erc-chess.el 1.12: bug fixes
 +
 +	* erc-chess.el 1.11: *** empty log message ***
 +
 +2002-04-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.6: change order.
 +
 +	* erc-chess.el 1.5: more fixing.
 +
 +	Now, the 'match question works. It sends an accept back.
 +	But display popup doesnt work..
 +
 +	* erc-chess.el 1.4: fixup (still far from working)
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.246:
 +	* Added :options entry for erc-mode-hook (erc-add-scroll-to-bottom)
 +
 +2002-04-11  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.245: remove trailing \n from any sent text
 +
 +	* servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, 
 +	  erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, 
 +	  erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, 
 +	  erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 1.244:
 +	clean whitespace
 +
 +	* erc.el 1.243: Replaced erc-scroll-to-bottom.
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.10:
 +	try to fix behaviour when used with different frames.
 +
 +2002-04-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.2:
 +	fixup release, far from ready for real usage, but it appears to work.
 +
 +	* erc.el 1.242:
 +	speed improvments based on elp-instrument-package RET erc- RET results
 +
 +	* erc-chess.el 1.1: initial version.
 +	please test it
 +	Get chess.el from johnw's cvs:
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot login
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot co chess
 +
 +	(as usual, blank password)
 +
 +	Add the resulting dir to your load-path and reqire erc-chess.
 +
 +	Usage: Just do /chess nickname
 +	The remote end much use erc, as no other irc client I know of supports this ...
 +
 +	See erc-chess-default-display and maybe set it to chess-images or chess-ics1 if you prefer those over chess-plain.
 +	Also, see erc-chess-user-full-name to set the name you use in chess games.
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.241: New hackery latenightwise
 +
 +	* erc.el 1.240: upupadowndowncase
 +
 +2002-04-04  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.15: Updated for the new snapshot
 +
 +	* debian/rules 1.9: Install README.Debian into the package
 +
 +	* debian/README.Debian 1.1: Initial check-in
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.239:
 +	Fixed that /me in query buffers ended up in server buffer
 +
 +	* erc.el 1.238: * Implemented joining +k channels
 +
 +2002-03-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.237: New utility function: erc-channel-list
 +	minor fix to erc-get-buffer. hopefully that helps shapr
 +
 +2002-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.236:
 +	New /command: /QUOTE for sending directly to the IRC server
 +	Removed erc-fill from erc-insert-modify-hook. To activate filling, simply customize that var.
 +
 +2002-03-09  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.3: *** empty log message ***
 +
 +2002-03-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.7:
 +	New variable: erc-nick-completion-ignore-case. Defaults to t.
 +
 +	* erc-track.el 1.9:
 +	* erc-track-shorten-name-function can now be set to nil to avoid treating of channel names at all.
 +
 +2002-03-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.14, debian/rules 1.8: update to new snapshot
 +
 +2002-03-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.235:
 +	Fixed nasty bug which prevented channel limit from correctly display/handling
 +
 +	* erc-track.el 1.8: Made shortening code highly customizable.
 +	Now, there is the variable erc-track-shorten-function which holds
 +	a function which gets called with one argument, CHANNEL-NAMES, which is a list
 +	of strings of the channel names.
 +	It needs to return a list of strings of the same length with the modified values...
 +
 +	* erc-track.el 1.7:
 +	Added erc-track-shorten-aggressively, default to nil
 +	if it is set to t, erc will shorten a bit more.
 +	if nil, erc will shorten the name only if it would get shorter than just
 +	one char...
 +
 +	* erc-speak.el 1.21: added iirc to the abbreviation expansion list.
 +
 +	* erc-track.el 1.6:
 +	Added customization variable: erc-track-use-faces. defaults to t.
 +
 +	* erc-track.el 1.5: *** empty log message ***
 +
 +	* erc-track.el 1.4:
 +	experimental: Added face support to mode-line channel activity tracker.
 +	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal acitivity...)
 +
 +2002-03-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.6: * added docfixes (thanks ore)
 +
 +	* erc-track.el 1.3: Fixed channel-name reduction.
 +	thanks again alex.
 +	Renamed the vars to erc-track-opt-start and erc-track-opt-cutoff.
 +
 +	* erc.el 1.234: fixed another silly error
 +
 +	* erc-track.el 1.2: Implemented channel name shortening.
 +	Vars erc-track-cutoff says: all channel names longer than this will be shortened.
 +	Var erc-track-minimum-channel-length says: dont make names shorten than this.
 +	(Thanks go out to kensanata for the nice unique-substrings utility function).
 +
 +	* erc.el 1.233: silly typo corrected
 +
 +	* erc.el 1.232:	* erc.el 1.232: * New varialbe: erc-common-server-name-suffixes
 +	  This alist can be used to change the server names displayed in mode-line
 +	  to a shorter version..
 +	* New function: erc-shorten-server-name (uses var above)
 +	* Changed erc-prepare-mode-line to use erc-shorten-server-name.
 +
 +2002-02-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.231:
 +	CTCP handling rewritten. Seems to work. please test and report probs.
 +
 +2002-02-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.230:
 +	Fixed emacs20 backward compatibility (new defun/alias: erc-propertize)
 +
 +2002-02-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.15: *** empty log message ***
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.14, erc.el 1.229:
 +	minor fixup related to read-only prompts and command renaming.
 +
 +2002-02-21  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.228: * modify `erc-remove-text-properties-region' to work.
 +	  Could even be a little faster now. (-:
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ring.el 1.3:
 +	fixed erc-replace-command to behave right when text is read-only.
 +	Also, use erc-insert-marker and (point-max) now.
 +
 +	* erc.el 1.227: * Made erc-prompt read-only
 +	* new function: erc-make-read-only. Can be used on erc-insert-post-hook and erc-send-post-hook to ensure read-only buffer text too
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.4: added comment to docstring
 +
 +	* erc-speak.el 1.20: minor updates, use erc-nick-regexp now
 +
 +	* erc.el 1.226:
 +	ensure that erc-timer-hook is called inside the server-buffer.
 +
 +2002-02-19  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.4:
 +	* Probably fixed the "number-char-or-marker-p: nil" bug.
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.1: Initial release.
 +
 +	* erc.el 1.225: added #303 handling
 +	moved timer and added an arg (erc-current-time)
 +
 +	* erc-list.el 1.3, erc.el 1.224:
 +	slightly changed the erc-once-with-server-event macro
 +
 +	* erc-button.el 1.13: erc-button-alist: doc fix and custom type fix
 +
 +2002-02-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.2, erc.el 1.223: new macro: erc-once-with-server-event
 +	erc-list.el: use it
 +
 +	* erc-match.el 1.3:
 +	Minor fix related to hook call method change (-until-seccess now)
 +
 +	* erc.el 1.222: fixed ctcp behaviour abit (with auto-query on)
 +
 +	* erc-list.el 1.1: ChanList mode.
 +	Load it, and type M-x erc-chanlist RET
 +	Demonstrates how the new hook system can be nicely used.
 +
 +	* erc.el 1.221:
 +	new hook: erc-default-server-hook. This one gets called if we dont have anything defined for a certain IRC server message.
 +	New function: erc-default-server-handler. (used by above hook).
 +	New function: erc-debug-missing-hooks: Used by above hook to save a list of unimplemented server messages.
 +	New function: erc-server-buffer, erc-server-buffer-p.
 +	Various places: use it.
 +	Minor fixup.
 +
 +	* erc-button.el 1.12: fix regexp to not buttonize ~user@host hostnames
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.5, erc.el 1.220: Eliminated erc-command-table
 +	Upcased the command defuns (erc-cmd-join is now erc-cmd-JOIN)
 +	Fixed erc-complete to not require erc-command-table.
 +	Implemented erc-cmd-HELP
 +	  (You have to try that, its tooo coool!)
 +	  e.g. /help auto-q
 +	fixed autoloads for erc-add-pal and so on to be interactive.
 +
 +2002-02-17  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.2:
 +	* Fix unfunctional code in `erc-get-parsed-vector-type'.
 +
 +	* erc-bbdb.el 1.13, erc-button.el 1.11, erc-match.el 1.1, erc.el 1.219:
 +	* Be careful: MANY changes ahead. I won't go into too much details.
 +
 +	* erc.el, new file erc-match.el: split out all pattern-matching code.
 +	* erc.el: removed all defcusts for erc-{...}-highlight-props. They are
 +	  quite useless, anyway.
 +	* moved erc-add-entry-to-list and -remove- over to erc-match. changed
 +	  their arg list.
 +	* erc.el: add autoloads for erc-{add,delete}-{keyword,pal,fool,dangerous-host}
 +	* erc.el: erc-server-PRIVMSG-or-NOTICE:
 +	  - remove all the highlighting crap
 +	  - add a (when (eq s nil) ...) so that untreated CTCP messages don't
 +	    get misdisplayed.
 +	* erc.el: erc-mark-message: removed this function, it's useless
 +	* erc.el: minor bugfixes.
 +
 +	* erc-match.el: first checkin. This file now contains all the pattern
 +	  matching stuff. there is now another defcust group, erc-match,
 +	  containing all match related stuff (erc-keywords, ...)
 +	* erc-match.el: added functionality to log matching lines. Quite
 +	  customizable, check out the docstring of defun erc-log-matches
 +	* erc-match.el: added functionality to make foolish messages
 +	  invisible/intangible. This could replace erc-ignore-list
 +	  sometime. it's more powerful right now, anyway.
 +	* erc-match.el erc-text-matched-hook: new hook. run when Text matches
 +	  anything (pal, fool, etc.).
 +
 +	* erc-button.el: Make nick buttonization customizable.
 +	* erc-button.el: Give nick buttonization a lower priority so that it
 +	  does not break url buttons.
 +
 +	* erc-bbdb.el: Add \n to the separators by which we split nicknames.
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* TODO 1.2: Added item
 +
 +2002-02-17  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.2, erc.el 1.218: Added invisible timestamp support.
 +
 +2002-02-16  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.13, debian/rules 1.7, debian/scripts/install 1.5:
 +	updated to new snapshot
 +
 +2002-02-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.217:
 +	Fixed channel limit format overflow in mode-line display.
 +	(Having to use floats if integers are to large is quite strange, isn't it?)
 +
 +	* TODO 1.1: TODO list created.
 +	Add comments and expand it.
 +
 +	* erc.el 1.216:
 +	Fixed bug in query buffer handling (only happend in mixed-case situations)
 +
 +	* erc.el 1.215: shapr checkdoc patch #1
 +	massive docfixes! yay, keep going!
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.214: various other fixes
 +	make s301 a catalog entry
 +
 +2002-02-15  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.213: * erc-server-NICK and erc-server-INVITE: fixed to use
 +	  `erc-display-message'. These I missed in the first checkin.  I
 +	  didn't say it in the last log message, but please test these.
 +
 +	* erc-fill.el 1.7, erc.el 1.212:
 +	* erc.el: updated many functions to use `erc-display-message'. Now, we
 +	  should go for getting highlighting out of
 +	  erc-server-PRIVMSG-or-NOTICE. The part I want to attack has been
 +	  marked.
 +	* erc-fill.el: updated static filling to leave the erc-parsed property alone.
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.211:
 +	first step, new function: erc-display-message
 +
 +	* erc.el 1.210: added numreply 379 and 405.
 +
 +	* erc.el 1.209: stupid typo fixed
 +
 +	* erc.el 1.208:
 +	Finally renamed erc-frame-dedicated-p to erc-frame-dedicated-flag
 +	Removed usage of erc-interpret-controls from info buffer drawing (major speedup)
 +	Other speedups based on the results from elp.
 +	ERC is now about 300%-500% faster in some situations with very full channels!!!!!
 +
 +2002-02-14  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.207:
 +	* erc-downcase now downcases {}|^ with []\~ -- 'stolen' from zenirc.
 +	* various checkdoc fixes. Just the upper third of the file, but that
 +	  should help a little, too. (-: Again, if you have any writing
 +	  skills, take out that dusty keyboard and tap it to the beat of M-x
 +	  checkdoc!
 +
 +2002-02-14  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.206 (erc-format-privmessage):
 +	fix it, so timestamp-coloring works again (patch from antifuchs)
 +
 +2002-02-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.205: Many fixes based on M-x checkdoc RET.
 +	If you have write access, and some english knowledge, help document erc too!
 +	M-x checkdoc RET, and follow the instructions.
 +
 +	* erc-button.el 1.10, erc-ibuffer.el 1.13: minor fixes
 +
 +	* erc.el 1.204: Use nreverse instead of reverse.
 +	Use eq instead of equal where possible.
 +	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isnt good ina  defun which is called so often)
 +
 +2002-02-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.9, erc.el 1.203:
 +	In erc.el, new hook: erc-channel-members-changed-hook.
 +	erc-button.el: Now highlight all nicknames. uses regexp-opt.
 +
 +2002-02-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nets.el 1.1:
 +	Database of irc networks. Use erc-server-select to interactively select one.
 +
 +	* erc.el 1.202: * erc-format-nick-function: New variable.
 +	* (erc-format-nick): The default for above var. Just return the nick.
 +	* (erc-format-@nick): Prefix NICK with @ or + if OP or VOICE.
 +	* Removed erc-track-modified-channels related code and moved into erc-tracke.l
 +	   Its auto-loaded now
 +
 +	* erc-track.el 1.1: Split code from erc.el
 +
 +2002-02-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.12:
 +	* erc-target now uses erc-port-to-string
 +
 +	* servers.pl 1.1:
 +	Script to convert mircs servers.ini to a elisp salist kind of thing.
 +	(development tool, it doesnt help you much as a user)
 +
 +	* erc.el 1.201:
 +	* erc-display-line-buffer: renamed to erc-display-line-1
 +	* erc-port-equal: New function.
 +	* erc-normalize-port: Used by erc-port-equal
 +	* minor docstring fixes
 +
 +2002-02-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.200:
 +	* erc-already-logged-in-p: compare ports is more robust now.
 +
 +	* erc-button.el 1.8: * Add buttonization to erc-send-modify-hook, too
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.199:
 +	Use insert-before-markers instead of insert in erc-display-line-buffer
 +	This fixed point@column 0 problem and gives us some speedup! yay
 +
 +	* erc-ibuffer.el 1.11, erc.el 1.198: minor fixes
 +
 +	* erc.el 1.197:
 +	* (erc-line-beginning-position): Renamed to erc-beg-of-input-line.
 +	* (erc-line-end-position): Renamed to erc-end-of-input-line.
 +	* erc-multiline-input-p: Variable removed.
 +
 +	* erc.el 1.196:
 +	Minor docstring fixes (using M-x checkdoc-current-buffer)
 +	  If you find time, and you are native english speaker, do that too!!
 +
 +	* erc.el 1.195: fixed macro-invokation
 +
 +2002-01-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.194: * erc-with-all-buffers-of-server: use erc-list-buffers
 +	* erc-process-away, erc-{save,kill}-query-buffers: use it.
 +	* erc-cmd-away-all: new command. Set away/back on all servers.
 +
 +	* erc.el 1.193:
 +	* Fix last multiline bug in erc-send-distinguish-noncommands.
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.10, erc.el 1.192: minor fixes
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.9, erc-menu.el 1.3, erc-speak.el 1.19, erc.el 1.191:
 +	Renamed erc-track-modified-channels-minor-mode to erc-track-modified-channels-mode (at least, its a bit shorter)
 +	Added docstring to erc-server-hooks (through the macro)
 +	Minor docfix in obsolete hook
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.190:
 +	* erc-send-current-line: fix behaviour where buffer changes.
 +	* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
 +
 +	* erc-ring.el 1.2, erc.el 1.189:
 +	* new hooks: erc-send-pre-hook, erc-send-modify-hook, erc-send-post-hook
 +	* erc-send-this: new variable
 +	* erc-noncommands-list: new constant.
 +	* erc-send-distinguish-noncommands: use it. (First filter function for sending! yay!)
 +	* erc-send-current-line: nearly completely rewritten.
 +	  - now handles multiline input. (yay!)
 +	  - now uses the three hooks from above.
 +	* erc-process-line: new arg, no-command: don't process this line as a command.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.12, erc-button.el 1.7, erc-speak.el 1.18, erc.el 1.188:
 +	hook handling rewrite phase 1.
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.187: * Rework erc-server-PRIVMSG-or-NOTICE
 +	* New function: erc-is-message-ctcp-p
 +	* New function: erc-format-privmessage
 +	* New function: erc-mark-message
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* CREDITS 1.1, HISTORY 1.1:
 +	Initial checkin.
 +
 +2002-01-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.186: * erc-put-text-properties: make OBJECT optional
 +	* erc-put-text-property: same
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +	* Make erc-display-line-buffer: add the "\n" even when the string would be invisible.
 +	* same: make the \n invisible, too (:
 +
 +2002-01-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.8, erc.el 1.185:
 +	Rewrote channel tracking using window-configuration-change-hook instead of defadvices.
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.6, erc.el 1.184:
 +	* Macro define-erc-highlight-customization: Ease up defining
 +	  erc-{fool,pal,..}-highlight-props defcusts.
 +	* defcusts:
 +	  - erc-fool-highlight-props
 +	  - erc-pal-highlight-props
 +	  - erc-dangerous-host-highlight-props
 +	  - erc-keyword-highlight-props
 +
 +	  Customizable to either nil or "Hide message".
 +	* erc-string-invisible-p: check for invisible chars in string
 +	* erc-display-line-buffer: use it.
 +	* erc-put-text-properties: put a list of props into a piece of text.
 +	* erc-server-PRIVMSG-or-NOTICE: use it; set appropriate
 +	  highlight-props for entire incoming message. This set of changes
 +	  allows you to e.g. auto-ignore fools.
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.7:
 +	Added highlight detection support to the Mark column.
 +	Now p, k, f, and d indicate pal, keyword, fool and dangerous-host related activity.
 +
 +	* erc.el 1.183:
 +	Highlight tracking finished. All necessary info should now be in erc-modified-channels.
 +
 +	* erc.el 1.182, erc-ibuffer.el 1.6, erc-speedbar.el 1.7:
 +	Added highlight tracking to track-modified-channels
 +	   no display code yet, the info is just kept in erc-modified-channels
 +	Added erc-modified column to ibuffer
 +	speedbar update
 +
 +	* erc-ibuffer.el 1.5: Added erc-members column
 +
 +	* erc-ibuffer.el 1.4: *** empty log message ***
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.11:
 +	* Fix a slight typo. The hook function should be called in
 +	  erc-server-376-hook (-:
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.3: *** empty log message ***
 +
 +2002-01-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.2: Fixup, it sort of works now. Try it
 +
 +	* erc-ibuffer.el 1.1: Initial version
 +
 +2002-01-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.181: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.10: * fix two bad things:
 +	  - fix the "proc trick": pass proc as an arg through
 +	    ...-insinuate-... to ...-show-entry
 +	  - hook highlighting into the 376 hook. This one is bound to get
 +	    called (-:
 +	* We now only append to hooks only.
 +	* Highlighting of changing records gets updated automatically.
 +
 +2002-01-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.180: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.9: * nearly complete rewrite of erc-bbdb:
 +	  -  Removed code duplication in erc-bbdb-NICK and -JOIN.
 +	  -  Made erc-bbdb-show-entry more general and intelligent.
 +	  -  erc-bbdb-insinuate-entry is now erc-bbdb-insinuate-and-show-entry
 +	     (note the different arglist!):
 +	  -  erc-search-name-and-create now creates "John Doe" users if name
 +	     is not specified.
 +	  -  No sign of "mail" anywhere anymore. It's all finger-host. (-:
 +	  -  erc-bbdb-popup-p is now called erc-bbdb-popup-type.
 +	  -  New customize values:
 +	     . erc-bbdb-irc-channel-field     channel field name
 +	     . erc-bbdb-irc-highlight-field   (see below)
 +	     . erc-bbdb-auto-create-on-nick-p auto-create record on join
 +
 +	* Highlighting based on BBDB is now here! Specify which type of
 +	  highlighting a person in the BBDB (whose nick you know) and have
 +	  fun! Read help to erc-bbdb-init-highlighting for details. Changes:
 +	  -  new function erc-bbdb-init-highlighting: gets called on server
 +	     connect.
 +	  -  new function erc-bbdb-highlight-record: highlights a person's
 +	     nick names.
 +
 +2002-01-24  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-button.el 1.6:
 +	* Fix the erc-button-alist regexp for EmacsWiki stuff. delYsid's version
 +	  is better (-:
 +
 +	* erc-button.el 1.5: * Added an Ewiki: specifier to the url-regexp.
 +	  <nickname> EmacsWiki: EmacsIRCClient tells you <bla>
 +	  should highlight "EmacsWiki: EmacsIRCClient" and allow you to
 +	  browse to the wiki when the button is activated.
 +	* new custom: erc-emacswiki-url.
 +	* new function: erc-browse-emacswiki: use it.
 +
 +2002-01-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.8:
 +	erc-bbdb-NICK: Added regexp-quote around fingerhost search.
 +
 +2002-01-10  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.179:
 +	* Channel saving/killing on quit from server implemented:
 +	 - defcust erc-save-queries-on-quit: Save server's channel buffers on quitting from server
 +	 - defcust erc-kill-queries-on-quit: Kill server's channel buffers on quitting from server
 +	 - Macro erc-with-all-buffers-of-server: Run a form inside all the server's query buffers
 +	 - Functions erc-{kill,save}-query-buffers: use it.
 +	* Added indent-tabs-mode: t to Local Variables section.
 +
 +2002-01-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-replace.el 1.2: * fix stupid documentation errors.
 +
 +2002-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.178:
 +	* (toplevel): Revert previous change. This resulted ina  recursive load...
 +	   You have to put (require 'erc-button) into your .emacs for now
 +
 +2002-01-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.177:
 +	* Added require for erc-button. This is devel. so I need testers :)
 +
 +	* erc-button.el 1.4: * Added proper file headers (GPL).
 +
 +2002-01-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.3: * erc-button-alist: Added entry for finger
 +
 +	* erc-button.el 1.2: * Removed bogus usage of :button-keymap.
 +	P
 +	   Does anyone know what this was supposed to do anyway?
 +
 +	* erc-button.el 1.1: * Initial version.
 +	* This module allows a way of buttonizing text in IRC buffers.
 +	  Default it is used for URLs, but other things could be added.
 +	  see if you can find another use, erc-button-alist
 +
 +See ChangeLog.01 for earlier changes.
 +
-     Copyright (C) 2002 Free Software Foundation, Inc.
++    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
diff --cc ChangeLog.03
index 707ceb3,0000000..3606668
mode 100644,000000..100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@@ -1,2151 -1,0 +1,2151 @@@
 +2003-12-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.595 (erc-cmd-HELP):
 +	Changed to prefer giving help for erc-cmd-* functions over
 +	   similarly-named Elisp functions (e.g., erc-cmd-LIST vs. list).
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.594 (erc-query-buffer-p): Added this function.
 +
 +2003-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.593 (erc-cmd-SV): Use erc-emacs-build-time.
 +
 +	* erc-compat.el 1.15: erc-emacs-build-time: New variable.
 +
 +	* erc.el 1.592 (erc-cmd-SAY):
 +	Reintroduced the feature where the spaces between
 +	"/SAY" and the rest of the line were being sent with the message.
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.591 (erc-server-buffer-p):
 +	Fixed a bug where this function sometimes would return
 +	    nil when it should return t.
 +
 +2003-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.590 (erc-generate-new-buffer-name):
 +	Really fixed a bug where ERC would reuse
 +	    a connected server buffer when erc-reuse-buffers is non-nil.
 +	(erc-cmd-JOIN): Now we tell the user when he attempts to join the same
 +	    channel twice on the same server.
 +
 +	* erc.el 1.589 (erc-generate-new-buffer-name):
 +	Fixed a bug where ERC would reuse a connected server buffer when erc-reuse-buffers is non-nil.
 +
 +	* erc.el 1.588 (erc-cmd-SAY):
 +	Fixed a bug where the spaces between "/SAY" and the rest of the
 +	    line were being sent with the message.
 +
 +	* erc-list.el 1.15: Fixed another typo.
 +
 +	* erc-list.el 1.14: Fixed a typo.
 +
 +	* erc-list.el 1.13:
 +	Added text to the top of the channel list buffer describing the keybinding for
 +	function erc-chanlist-join-channel.
 +
 +	* erc-list.el 1.12: Minor appearance changes.  No functional change.
 +
 +	* erc-list.el 1.11:
 +	Implemented function erc-chanlist-join-channel.  Added variable
 +	erc-chanlist-channel-line-regexp.  Got rid of function
 +	erc-chanlist-pre-command-hook.  Changed the logic for how channel lines are
 +	highlighted.
 +
 +2003-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-list.el 1.10:
 +	Removed a bunch of unused code.  No semantic change.
 +
 +	* erc-list.el 1.9: Added lots of functionality.
 +
 +2003-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.58, erc.el 1.587:
 +	New custom type erc-message-type, use it in erc-hide-list and erc-track-exclude-types
 +
 +2003-12-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.57 (track-when-inactive): New module.
 +	(erc-track-visibility): New option.
 +	(erc-buffer-activity): New variable.
 +	(erc-buffer-activity-timeout): New variable.
 +	(erc-user-is-active): New function.
 +	(erc-buffer-visible): New function.
 +	(erc-modified-channels-update): Replace get-buffer-window call
 +	with call to erc-buffer-visible.
 +	(erc-track-modified-channels): Ditto.
 +
 +2003-12-14  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-track.el 1.56 (erc-modified-channels-update):
 +	Force update of modeline.  Makes sure
 +	that the tracked channels disappear in other buffers too.
 +
 +2003-12-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.586 (define-erc-module):
 +	New optional argument LOCAL-P.  If non-nil, then
 +	mode will be created as buffer-local rather than a global mode.
 +	(erc-cmd-CTCP): Fix indentation from last commit.
 +
 +	* erc-compat.el 1.14 (erc-define-minor-mode):
 +	Deal with :global and :group keywords.
 +
 +	* erc-nickserv.el 1.13 (erc-current-network):
 +	Make server regex more permissive.
 +
 +	* erc.el 1.585 (erc-cmd-CTCP):
 +	Don't add a space to end of command when ARGS are
 +	empty.  This fixes a bug whereby requests of the form "VERSION " were
 +	being sent, and ignored.
 +
 +2003-11-27  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.9: From Adrian Aichner <adrian@xemacs.org>
 +	* erc-log.el (erc-log-file-coding-system): Use 'binary
 +	coding-system under XEmacs (instead of 'emacs-mule).
 +	* erc-log.el (erc-w32-invalid-file-characters): Removed as no
 +	longer needed.
 +	* erc-log.el (erc-generate-log-file-name-long): Use
 +	`convert-standard-filename', which exists in XEmacs too.
 +
 +2003-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-identd.el 1.1: Code provided by johnw, thanks!
 +
 +2003-11-09  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.584 (erc-latest-version): Clean up docstring.
 +	Remove requirement for w3, wrap REQUIRE statement in IGNORE-ERRORS.
 +	Update viewcvs url to correct location.
 +	(erc-ediff-latest-version): Make sure that we find the uncompiled
 +	erc.el, error if not.
 +
 +2003-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.583: Add more info to /sv
 +
 +2003-11-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.582: Added optional argument BUFFER to erc-server-buffer-p.
 +
 +2003-11-04  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.6: Add sachac
 +
 +2003-11-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.581 (erc-server-366):
 +	chnl is 4th element of parsed, not fifth.
 +	(erc-channel-end-receiving-names): Pass correct number of arguments
 +	to delete-if-not.
 +
 +	* erc.el 1.580 (erc-update-current-channel-member):
 +	 Use erc-downcase when comparing
 +	nick entries.  Cleanup indentation.
 +
 +2003-11-01  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-sound.el 1.4: Added a (provide 'erc-sound) line.
 +
 +	* erc.el 1.579 (erc-cmd-NAMES): send to TGT, not CHANNEL.
 +
 +2003-10-29  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.21, erc.el 1.578, CREDITS 1.6:
 +	Merged Jeremy Maitin-Shepard's patch for time-sensitive nick completion.
 +
 +2003-10-27  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.19, debian/changelog 1.24:
 +	New Debian package 4.0.cvs.20031027
 +
 +2003-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.577: Fix typo tuncate->rruncate
 +
 +2003-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.80: From Stephan Stahl <stl@isogmbh.de>:
 +	 * (erc-dcc-send-block): Kill buffer if transfer completed correctly.
 +
 +2003-10-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.55 (erc-track-disable):
 +	Do not deactivate all advices for `switch-to-buffer',
 +	just disable the erc specific one. (Bug#217022).
 +
 +2003-10-18  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.8 (erc-log-file-coding-system): New variable.
 +	(erc-save-buffer-in-logs): Use it.
 +
 +2003-10-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.576 (erc-interpret-mirc-color): New boolean defcustom
 +
 +	* erc.el 1.575: Do not use -nowait on darwin (thanks johnw)
 +
 +2003-10-15  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.574 (define-erc-module):
 +	Set erc-FOO-mode appropriately in erc-FOO-enable
 +	and erc-FOO-disable.
 +
 +2003-10-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.12 (erc-mode):
 +	Reset idletime on connect. Fixes an annoying bug which
 +	flooded the server with aways on reconnect.
 +	(erc-autoway-reset-idletime): Accept optional args so we can hook it
 +	onto erc-server-001-hook.
 +
 +2003-10-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.573 (erc-hide-list): Add a nice defcustom type
 +
 +2003-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.18, debian/changelog 1.23, debian/control 1.8:
 +	Debian snapshot 20031008
 +
 +	* erc-speedbar.el 1.11:
 +	Patch from Eric M. Ludlam <eric@siege-engine.com>:
 +	 - (erc-install-speedbar-variables): Add functions list (needs new speedbar?)
 +	 - (erc-speedbar-buttons): Add doc.  Clear the buffer
 +	 - (erc-speedbar-sort-channel-members): New function.
 +	 - (erc-speedbar-expand-channel): Call new sort function.  Change some visuals.
 +	 - (erc-speedbar-insert-user): Change some visuals based on channel data.
 +	 - (erc-speedbar-line-text, erc-speedbar-item-info): New functions
 +	Add proper elisp file header.
 +
 +2003-10-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.22 (erc-match-syntax-table): New variable.
 +	(erc-match-current-nick-p): Use it.
 +
 +	* erc.el 1.572 (erc-quit-reason-zippy, erc-part-reason-zippy): Use
 +	`erc-replace-regexp-in-string' rather than
 +	`replace-regexp-in-string'.
 +	(erc-command-indicator-face): New face, used to show commands if
 +	`erc-hide-prompt' is nil and `erc-command-indicator' is non-nil.
 +	(erc-command-indicator): Clean up doc-string.
 +	(erc-display-prompt): New optional argument FACE, use this rather
 +	than `erc-prompt-face' to fontify the prompt if non-nil.
 +	(erc-send-current-line): Pass in `erc-command-indicator-face' to
 +	`erc-display-prompt'.
 +
 +	* erc-compat.el 1.13 (erc-replace-regexp-in-string): New function.
 +	Alias for `replace-regexp-in-string' on Emacs 21.
 +	Argument massaging for `replace-in-string' for XEmacs.
 +
 +2003-09-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.571 (erc-keywords): Removed. Wasn't used by anything.
 +
 +2003-09-25  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.570: ERC-HIDE-PROMPT: add custom group
 +	ERC-COMMAND-INDICATOR: new variable.
 +	ERC-COMMAND-INDICATOR: new function.
 +	ERC-DISPLAY-PROMPT: new argument, PROMPT, used to override default
 +	prompt.
 +	ERC-SEND-CURRENT-LINE: pass ERC-COMMAND-INDICATOR to ERC-DISPLAY-PROMPT.
 +
 +2003-09-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.569 (erc-parse-line-from-server):
 +	Ignore empty lines as required by RFC.
 +
 +2003-09-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.568: Add lag time calculation
 +
 +2003-09-13  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.17, debian/README.Debian 1.7, debian/changelog 1.22:
 +	New debian release
 +
 +	* erc-notify.el 1.22:
 +	Call erc-notify-install-message-catalogs on load, not on module init
 +
 +	* erc.el 1.567 (erc-update-modules):
 +	Use `load' instead of `require'.  XEmacs appears
 +	to have the NOERROR arg only sometimes... Strange
 +
 +	* erc.el 1.566: No fboundp if we have a defvar
 +
 +	* erc.el 1.565: Properly defvar erc-ping-handler
 +
 +2003-09-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.564 (erc-setup-periodical-server-ping):
 +	check if erc-ping-handler is
 +	    bound before referencing it
 +
 +2003-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.563 (erc-cmd-NICK):
 +	Warn about exceeded NICKLEN if we know it.
 +
 +	* erc.el 1.562: Make erc-server-PONG obey erc-verbose-server-ping.
 +	Cancel old `erc-ping-handler' timer when restablishing connection in the same
 +	buffer.
 +
 +	* debian/changelog 1.21, Makefile 1.16: New debian snapshot
 +
 +	* erc-dcc.el 1.79, erc-xdcc.el 1.6:
 +	Use new function erc-dcc-file-to-name to convert spaces to underscores
 +
 +	* erc-xdcc.el 1.5: Add autoload for erc-xdcc-add-file
 +
 +2003-09-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.78: indent fixes and copyright update
 +
 +	* erc.el 1.561:
 +	erc-send-ping-interval: New defcustom which defaults to 60.
 +	Every 60 seconds, we send PING now.
 +	This should fix the "connection silently lost" bug.
 +	Please test this change extensively, and report problems.
 +
 +2003-09-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.560 (erc-default-coding-system):
 +	Test for undecided and utf-8
 +	before setting.
 +
 +2003-09-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.559 (erc-modules): Add some more symbols to the set
 +
 +	* erc.el 1.558 (erc-modules):	* erc.el 1.558 (erc-modules): Add :greedy t to the set in 
 +
 +	* erc-dcc.el 1.77:
 +	More autoloads which make dcc autoload upon ctcp dcc query received.
 +
 +	* erc-dcc.el 1.76 (erc-cmd-DCC): Add Autoload.
 +	(pcomplete/erc-mode/DCC): Ditto, makes DCC autoloadable just by using
 +	completion.
 +	Also only offer "send" if fboundp make-network-process.
 +
 +	* erc-autojoin.el 1.6: Update copyright
 +
 +	* erc-autojoin.el 1.5 (erc-autojoin-add):
 +	Only add the channel if it is not already there.
 +
 +	* erc-notify.el 1.21:
 +	Use `define-erc-module' instead of old `erc-notify-initialize'.
 +	Now defines the global minor mode erc-notify-mode, and should also
 +	be controllable via `erc-modules' with symbol `notify'.
 +
 +	* erc.el 1.557 (erc-modules):
 +	Fix paren-in-column-zero bug in docstring.
 +	Add a sort of bogus, but still better :type.
 +	Add autojoin and netsplit by default.
 +	(erc-update-modules): Dont barf with an error if `require' fails.
 +	We can still error out if the mode is not defined.
 +
 +2003-08-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.556:
 +	* make 353 (NAMES reply) output go into the appropriate channel buffer
 +	  (if it exists) or into the active erc buffer (if not).
 +
 +2003-08-29  mtoledo  <mtoledo@confusibombus>
 +
 +	* erc.el 1.555:
 +	Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today.
 +
 +2003-08-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.554: Fix typo in varname which led to a compiler warning
 +
 +	* AUTHORS 1.5: Added lawrence
 +
 +2003-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.75:
 +	Set process and file-coding system to 'binary (for Windows)
 +
 +	* erc-stamp.el 1.30: Rename custom group erc-timestamp to erc-stamp.
 +
 +2003-08-07  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-fill.el 1.23 (erc-fill-disable):
 +	Remove erc-fill, not erc-fill-static from
 +	erc-insert-modify-hook.
 +
 +2003-08-05  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.553 (erc-send-current-line):
 +	Now we display the prompt for previously entered commands
 +	    based on the value of customization variable erc-hide-prompt.  This change is
 +	    closely related to revision 1.552 by wencem.
 +
 +2003-08-04  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.552 (erc-send-current-line):
 +	If we're sending a command, don't display
 +	the prompt.
 +
 +2003-08-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.54: patch from David Edmondson (dme AT dme DOT org)
 +
 +	This patch makes button 3 on the erc-track buffer names in the
 +	modeline show the selected buffer in another window. It's analogous to
 +	button 2 which shows the buffer in the current window.
 +
 +2003-07-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.551 (erc-display-line-1):
 +	Fixed bad indentation on one line.  No semantic change.
 +
 +2003-07-29  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.21:
 +	Quote open paren in docstring of erc-text-matched-hook
 +
 +	* erc.el 1.550: Anchor match only at beginning in erc-ignored-user-p.
 +
 +	* erc-button.el 1.47: New variable erc-button-wrap-long-urls.
 +	Modified erc-button-add-buttons:
 +	  New optional argument REGEXP.
 +	  If we're buttonising a URL and erc-button-wrap-long-urls is
 +	  non-nil, try and wrap them
 +
 +	Modified erc-button-add-buttons-1:
 +	  Pass regexp to erc-button-add-buttons.
 +
 +2003-07-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.549 (erc-network-name):
 +	Improved docstring.  Removed an unnecessary call to erc-server-buffer.
 +
 +2003-07-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.548: By lawrence:
 +	(erc-ignored-user-p): Use anchored regexp.
 +	(smiley): Fix missing quote in `remove-hook' call.
 +
 +2003-07-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-nets.el 1.4, erc-nickserv.el 1.12, erc.el 1.547:
 +	Changed all references to Openprojects into references to Freenode.
 +
 +2003-07-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.546:
 +	Now variable erc-debug-irc-protocol is defvar'ed instead of defcustom'ed.
 +	Made the docstring clearer too.
 +
 +	* erc.el 1.545: Fixed a wrong-type-argument error from window-live-p.
 +
 +2003-07-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.7 (erc-log-setup-logging):
 +	set buffer-file-name to "", as (basic-save-buffer)
 +	    will prompt for a buffer name before invoking hooks. the buffer-file-name
 +	    will be overridden by (erc-save-buffer-in-logs) anyway - the main danger
 +	    of doing this is write-file-contents hooks. Let's see if anyone complains.
 +	(erc-save-buffer-in-logs): return t, so that further write hooks are not run
 +
 +2003-07-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.74 (erc-dcc-open-network-stream):
 +	-nowait still crashes emacs cvs - disable for now
 +
 +2003-07-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.544 (erc): Minor docstring modification.
 +
 +2003-07-01  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-match.el 1.20 (erc-match-current-nick-p):
 +	match only on word boundaries
 +
 +	* erc-log.el 1.6 (erc-log-setup-logging):
 +	not sure how this crept in again - make sure we set
 +	    buffer-file-name to nil, since otherwise it is not possible to open
 +	    previous correspondence in another buffer while a conversation is open
 +
 +2003-06-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.543 (erc-network-name):
 +	Now makes some intelligent guesses if the server didn't tell
 +	    us the network name.
 +
 +2003-06-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.542 (erc-default-coding-system): Use utf-8 as the default
 +	encoding for outgoing stuff and undecided as the default for
 +	incoming stuff.
 +	(erc-coding-sytem-for-target): New.
 +	(erc-encode-string-for-target): Use it.
 +	(erc-decode-string-from-target): Use it.  Removed the flet
 +	erc-default-target hack and documented the dynamically bound
 +	variable `target' instead.
 +
 +2003-06-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.541 (erc-log-irc-protocol):
 +	Now we keep point on the bottom line of the window
 +	    displaying the *erc-protocol* buffer if it is at the end of the
 +	    *erc-protocol* buffer.
 +
 +	* erc.el 1.540:
 +	Added some text to the docstring for variable erc-debug-irc-protocol.
 +
 +2003-06-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.73 (erc-dcc-auto-mask-p):
 +	Fixed a docstring typo that caused a load-time error.
 +
 +	* erc-dcc.el 1.72 (erc-dcc-auto-mask-p):
 +	Changed reference to undefined variable erc-dcc-auto-mask-list
 +	    to erc-dcc-auto-masks.
 +	Changed default value of variable erc-dcc-auto-masks to nil and added text to its
 +	    docstring.
 +
 +	* erc-notify.el 1.20 (erc-notify-timer and erc-notify-QUIT):
 +	Added network name to notify_off message.
 +
 +	* erc.el 1.539 (erc-network-name):
 +	Now returns the name of the IRC server if the network name
 +	    cannot be determined.
 +
 +	* erc-notify.el 1.19 (erc-notify-JOIN and erc-notify-NICK):
 +	Added argument ?m to call to erc-display-message.
 +
 +	* erc-dcc.el 1.71 (erc-dcc-do-LIST-command):
 +	Fixed a bug where I assumed (plist-get elt :type)
 +	    returns a string -- it really returns a symbol.
 +
 +	* erc-notify.el 1.18 (erc-notify-timer):
 +	Now we include the network name in the notify_on message.
 +
 +	* erc.el 1.538:
 +	New function: erc-network-name.  Returns the name of the network that the
 +	    current buffer is associate with.  Not every server sends the 005 messages
 +	    that enable the network name to be known.  If the network name is
 +	    not known, the string "UNKNOWN" is returned.
 +
 +	* erc-dcc.el 1.70 (erc-dcc-chat-setup):
 +	Added a comment.  Fixed a bug where a DCC CHAT buffer has no
 +	    prompt when it first appears.
 +
 +	* erc-dcc.el 1.69 (erc-dcc-chat-parse-output):
 +	Now a DCC chat buffer displays the nick using
 +	    erc-nick-default-face just like in a channel buffer.
 +
 +2003-06-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.537 (erc-display-prompt):
 +	Fixed incorrect indentation.  No semantic change.
 +
 +	* erc.el 1.536 (erc-strip-controls):
 +	Minor change to regexp that matches IRC color control
 +	    codes.  I was seeing usage as follows: ^C07colored text^C^C04other color.
 +	    Now we strip a ^C followed by zero, one, or two digits.  Before this change,
 +	    we stripped a ^C followed by one or two digits.
 +
 +	* erc-dcc.el 1.68 (erc-dcc-do-LIST-command):
 +	Improved format of output of /DCC LIST.  Now the
 +	    "Size" column for a DCC GET includes the percentage of the file that has
 +	    been retrieved.
 +	(erc-dcc-do-GET-command): Now it works if erc-dcc-default-directory is set.
 +
 +2003-06-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.5:
 +	* added quickstart information to the comments up the top
 +
 +2003-06-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.535:
 +	Default to open-network-stream on MS Windows. (thanks lawrence)
 +
 +2003-06-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.534 (erc-process-input-line):
 +	refactor so that wrong-number-of-arguments is
 +	    caught when using do-not-parse-args - this lets do-not-parse-args
 +	    commands display help messages on incorrect syntax in a uniform manner.
 +	    This no longer raises a bad-syntax error - was this a catch-all to stop a
 +	    backtrace? Does it belong?
 +	(erc-cmd-APPENDTOPIC): the correct way to display help when you want to
 +	    accept an abitrary string is to (signal 'wrong-number-of-arguments nil).
 +	    This fixes a bug where people could not /at topics with a space in them.
 +
 +2003-06-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.533:
 +	Re-add the last few changes which weren't merged for some reason.
 +
 +	* erc.el 1.532 (erc-cmd-APPENDTOPIC): show help when given no arguments
 +
 +	Patch from MrBump. Fixes problem with erc-set-topic inserting ^C characters
 +	into the topic. Also removes dependency on CL.
 +
 +2003-06-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.531:
 +	Added comment to explain (eval-after-load "erc" '(erc-update-modules)).
 +
 +2003-06-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.20: Add completion for /unignore
 +
 +2003-05-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.12 (erc-encode-coding-string): The default binding,
 +	if encode-coding-string was not available, must be a defun that
 +	takes multiple arguments.  Did that.
 +
 +2003-05-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.530:
 +	Add handlers for 313 and 330 (by arne@rfc2549.org, thanks)
 +
 +2003-05-30  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.529:
 +	patch from MrBump to make /mode #foo +b work again (erc-cmd-BANLIST only
 +	temporarily changes them now)
 +
 +2003-05-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.528 (erc-select):
 +	server is now defaulted with erc-compute-server.
 +	A few cosmetic fixes.
 +	(erc-default-coding-system): Renamed from erc-encoding-default.
 +	(erc-encoding-default): Renamed to erc-default-coding-system.
 +	(erc-encoding-coding-alist): Documentation updated to cover regexps.
 +	(erc-encode-string-for-target): Now considers keys of
 +	erc-encoding-coding-alist to be regexps.  Rely on erc-compat
 +	wrt. MULE support.
 +	(erc-decode-string-from-target): New function.
 +	(erc-send-current-line): eq -> char-equal fix.
 +	(erc-server-TOPIC): topic is now decoded with
 +	erc-decode-string-from-target.
 +	(erc-parse-line-from-server): Line from server is no longer decoded
 +	here.
 +	(erc-server-PRIVMSG-or-NOTICE): Message from a user is decoded here,
 +	sspec -> sender-spec for clarity.  Cosmetic if -> when fix.
 +	(erc-server-TOPIC): sspec -> sender-spec
 +	(erc-server-WALLOPS): Ditto.
 +
 +	* erc-compat.el 1.11 (erc-decode-coding-string):
 +	Now requires coding-system as an argument.
 +
 +2003-05-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.527:
 +	erc-part|quit-hook is only run on a part|quit directed to our nick, reflect that in the docstring to avoid confusion
 +
 +2003-05-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-truncate.el 1.3:
 +	* erc-truncate-buffer-to-size: use fboundp. Scheme takes its toll...
 +
 +2003-05-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el 1.2: remove require of erc-log
 +	(erc-truncate-buffer-to-size): use erc-save-buffer-in-logs when it's
 +	there, else, dont.
 +
 +2003-04-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.4, erc-truncate.el 1.1, erc.el 1.526: erc.el:
 +		* erc-cmd-QUIT: Remove references to code in erc-log.el, to
 +		  not force autoloading of erc-log.el
 +		* erc-server-PART: ditto.
 +		* erc-quit-hook: new hook, run when /quit command is
 +		  processed.
 +		* erc-cmd-QUIT: use it.
 +		* erc-part-hook: new hook, run then PART message is
 +		  processed.
 +		* erc-cmd-PART: use it.
 +		* erc-connect-pre-hook: new hook, run before connection to IRC
 +		  server is started.
 +		* erc: use it.
 +		* erc-max-buffer-size: Move truncation variables and functions
 +		  to erc-truncate.el
 +		* erc-truncate-buffer-on-save: moved to erc-log.el
 +		* erc-initialize-log-marker: new function.
 +	erc-log.el:
 +		* erc-truncate-buffer-on-save: New defcust here; from erc.el
 +		* erc-truncate-buffer-on-save: Put it in group `erc-log'
 +		* erc-log-channels-directory: Remove trailing slash from
 +		  default value.
 +		* Add functions to erc-connect-pre-hook, erc-part-hook and
 +		  erc-quit-hook to avoid getting autoloaded.
 +
 +	erc-truncate.el:
 +		* Contains the truncation functions and defcusts from erc.el.
 +		* define-erc-module clause added; new erc-truncate-mode.
 +
 +2003-04-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.525 (erc):
 +	Check wether erc-save-buffer-in-logs is bound, too
 +
 +	* erc.el 1.524 (erc):
 +	Check wether erc-logging-enabled is bound before using it - not
 +	everyone is using erc-log.el!
 +
 +2003-04-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.3:
 +	* while we're at it, remove the (declare (ignore ignore)) statements.
 +
 +	* erc-log.el 1.2:
 +	* add autoload statement for erc-log-mode/etc. Sorry for the delay.
 +
 +	* erc-log.el 1.1, erc.el 1.523: * erc.el:
 +		- move variables and functions to erc-log.el:
 +			 defgroup `erc-log'
 +	                 defcustom `erc-log-channels-directory'
 +			 defcustom `erc-log-insert-log-on-open'
 +			 defcustom `erc-generate-log-file-name-function'
 +			 defun `erc-save-buffer-in-logs' (autoloads from erc-log.el)
 +	 		 defuns `erc-generate-log-file-name-*'
 +			 defun `erc-current-logfile'
 +			 defun `erc-logging-enabled' (autoloads from erc-log.el)
 +		- erc-truncate-buffer-to-size: fix for double-saving bug when
 +		  writing out truncated buffer contents. Thanks, lawrence mitchell <wence@gmx.li>!
 +		- erc-remove-text-properties-region: Fix case for read-only text.
 +		- erc-send-current-line: update insert-marker before calling the hooks.
 +		                         also, wrap (erc-display-prompt) so that it doesn't toggle
 +					 buffer-modified-p.
 +		- erc-interpret-controls: remove /very/ old commented-out function
 +		- erc-last-saved-position: make it a marker
 +		- erc: use it.
 +
 +	* erc-log.el: (thanks, lawrence mitchell <wence@gmx.li>!)
 +		- Move logging code from erc.el here
 +		- define-erc-module log: add; minor mode erc-log-mode is the
 +		  same as adding the `erc-save-buffer-in-logs' to
 +		  erc-send-post-hook and `erc-insert-post-hook'.
 +		- erc-w32-invalid-file-characters: add.
 +		- erc-enable-logging: add.
 +		- erc-logging-enabled: use it.
 +		- erc-logging-enabled: autoload.
 +		- erc-save-buffer-in-logs: fix for truncating saved buffer with read-only text.
 +		- erc-save-buffer-in-logs: use erc-last-saved-position.
 +		- erc-save-buffer-in-logs: fix saving half-written messages on
 +		  the prompt when saving the log file. (simply uses
 +		  erc-insert-marker as an upper bound for saving).
 +
 +2003-04-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.522:	* erc.el 1.522: erc-modules: added 
 +
 +2003-04-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* Makefile 1.15 (UNCOMPILED): Added erc-compat.el.
 +	(clean): Remove .elc files, too.
 +	Patch by Hynek Schlawack <hynek+erc@hys.in-berlin.de>
 +
 +2003-04-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.46:
 +	erc-button-keymap: set the parent keymap to erc-mode-map
 +
 +2003-04-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.521:
 +	erc-official-location: shouldn't the official location be the base URL of erc?
 +
 +	* erc.el 1.520:
 +	erc-modules: updated the docstring to make the semantics clearer
 +
 +2003-04-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.519:
 +	Fix problem where % in NOTICE produced errors (from mmc)
 +
 +2003-04-18  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.518 (erc-toggle-debug-irc-protocol):
 +	moved a reference to 'buf' inside the let
 +	    statement which defines it. it's difficult to tell what the original
 +	    intentions were here - at the moment the debug window is displayed when
 +	    toggling either way.
 +
 +	* README 1.3, erc.el 1.517:
 +	(erc-update-modules: added a condition in for erc-nickserv -> erc-services
 +
 +	* erc-pcomplete.el 1.19:
 +	- that change to erc-update-modules making it require the modules first means
 +	  we don't need any special case handling here, so i reverted the previous
 +	  change
 +
 +	* erc.el 1.516:
 +	- don't require 'erc-auto, since windows users don't have access to make.
 +	  instead, we handle it in (erc-update-modules)
 +
 +2003-04-17  Damien Elmes  <erc@repose.cx>
 +
 +	* README 1.2, Makefile 1.14:
 +	Updated Makefile and documentation to reflect the new release
 +
 +	* erc.el 1.515:
 +	- note the previous change also updated the release number to erc 4.0!
 +	(erc-connect): fix a bug introduced by the previous release
 +
 +	* erc.el 1.514:
 +	fixed about 20 instances of (message (format ...)) which will break if the
 +	format returns a string with %s in it
 +
 +	* erc.el 1.513: erc-error-face: make it red, not pink
 +
 +	* erc-pcomplete.el 1.18:
 +	since pcomplete is autoloaded via erc-completion-mode, and completion is in
 +	erc-modules by default, we remove completion when pcomplete is added
 +
 +	* erc.el 1.512 (define-erc-module): no need for delete, use delq
 +
 +	* erc-members.el 1.5 (erc-nick-channels):
 +	(erc-person-channels) takes one arg
 +	(erc-format-user): again, they all take an arg
 +
 +	* erc.el 1.511:
 +	- require erc-auto when loading, so the default `erc-modules' can be loaded.
 +	  this makes erc-auto no longer a convenience but a necessity - all the name
 +	  of user friendliness.
 +	(define-erc-module): the enable and disable routines now update erc-modules
 +	    accordingly
 +	erc-modules: new variable controllig the modules which erc has loaded/will
 +	    load. when customising, it will automatically enable modules. it won't
 +	    automatically disable modules which are removed, yet.
 +	(erc-update-modules): enable all modules in `erc-modules'
 +
 +	* erc-dcc.el 1.67 (erc-dcc-open-network-stream):
 +	use the -nowait equiv if available
 +	erc-dcc-server-port: removed
 +	erc-dcc-port-range: allows a range of values, so you can have more than one
 +	    dcc
 +	(erc-dcc-server): support erc-dcc-port-range
 +	(erc-dcc-chat): use OCHAT for outgoing chat for now. we need to fix the
 +	    issues with allowing more than one chat with the same person
 +
 +	* erc.el 1.510:
 +	erc-log-channels: removed; set the directory to start logging
 +	(erc-directory-writeable-p): create directory if it doesn't exist, check if
 +	    it's writeable
 +	(erc-logging-enabled): don't reference erc-log-channels
 +
 +2003-04-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.509 (erc):
 +	but when inserting the contents of a previous logfile, use the logfile
 +	    name, not ""!
 +
 +	* erc.el 1.508 (erc):
 +	set buffer-file-name to "", since we have a custom saving function and
 +	    it's not needed. this enables one to open a log file with previous
 +	    correspondence, while talking to the person at the same time
 +
 +2003-03-29  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.507 (erc-prepare-mode-line-format):
 +	Now strips all text properties from the target before
 +	    putting it in the mode line.  Keeps the mode line looking consistent.
 +	(erc-channel-p): Improved docstring.
 +
 +2003-03-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.506 (erc-generate-log-file-name-with-date): New function.
 +	(erc-generate-log-file-name-function): Make it available.
 +
 +2003-03-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.505:
 +	Fix erc-prompt and erc-user-mode custom :type (Closes: #185794)
 +
 +2003-03-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.504:
 +	erc-server-hook-list: correct documentation of ordering of (proc parsed)
 +
 +2003-03-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.53 (erc-modified-channels-string):
 +	Make it a risky-local-variable.
 +
 +2003-03-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.52 (erc-track-modified-channels):
 +	Use (point-min) if we don't find a
 +	parsed-property, so it won't error out with nil...
 +
 +2003-03-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.51 (erc-track-switch-buffer):
 +	removed call to erc-modified-channels-update, as
 +	    this is done correctly on buffer switching in both emacs and xemacs now
 +
 +2003-03-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.50 (erc-find-parsed-property):
 +	simplified a little, so it shouldn't return nil anymore
 +
 +	* erc.el 1.503: erc-send-post-hook: document narrowing which occurs
 +
 +2003-03-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.49 (erc-find-parsed-property): New function.
 +	(erc-track-modified-channels): Use it instead of relying on
 +	point-min.
 +
 +2003-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.502:
 +	Fix erc-set-topic to accept a channel name as first word
 +
 +2003-03-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.66:
 +	Small patch (<10 lines, also slightly modified by Jorgen Schäfer) from
 +	David Spreen <netzwurm@debian.org> to add hostmask-authentication to
 +	DCC auto-accept.
 +
 +	erc-dcc-auto-mask-list: New variable
 +	(erc-dcc-handle-ctcp-send): Check erc-dcc-auto-mask-list
 +	(erc-dcc-auto-mask-p): New function
 +	erc-dcc-send-request: Docstring now mentions erc-dcc-auto-mask-list
 +
 +2003-03-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.11 (erc-clear-input-ring):
 +	New function.  Erases the contents of the input ring for
 +	   the current ERC buffer.
 +
 +2003-03-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.501:
 +	(erc-display-line-1) and (erc-send-current-line): Now these functions reset erc-insert-this
 +	    to t as soon as possible after consuming the value of that variable.  See the comments in
 +	    the code for the strange symptom this fixes.
 +	(erc-bol): Changed to call point-at-eol instead of line-end-position.  This increases XEmacs
 +	    portability, since XEmacs doesn't have line-end-position.  Patch suggested by Scott Evans
 +	    on the ERC mailing list.
 +
 +2003-03-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.500: banlist*: patch from mrbump to avoid using cl packages
 +
 +2003-03-04  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.499:
 +	Changed erc-noncommands-list from a constant to variable, so that users can
 +	    add their own erc-cmd-* functions to the list.  Improved the docstring too.
 +
 +2003-03-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.498 (erc-server-353):
 +	Now the output of "/NAMES #channel" appears in the currently
 +	    active ERC buffer, even if the user is not a member of #channel.
 +
 +	* erc.el 1.497 (erc-cmd-DEOP):
 +	Fixed a syntax error: invalid read syntax ")" caused by my last change.
 +
 +2003-03-01  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.496 (erc-cmd-DEOP):
 +	Fixed a wrong-type-argument error caused by calling split-string
 +	    on a list instead of on a string.  Removed the call to split-string entirely,
 +	    because it wasn't needed.
 +
 +	* erc.el 1.495 (erc-cmd-HELP):
 +	Changed to use intern-soft instead of intern.  Now "/HELP floob"
 +	    doesn't create a void function symbol erc-cmd-FLOOB.
 +
 +2003-02-25  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.494 (erc-cmd-SERVER):
 +	remove erroneous references to line, use server instead
 +
 +2003-02-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.493 (erc-toggle-debug-irc-protocol):
 +	Fixed a bug where the global value of
 +	    kill-buffer-hook was being modified instead of the buffer-local value.
 +
 +2003-02-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.492 (erc-cmd-KICK):
 +	Now supports any number of words in the REASON string.  Examples
 +	    of the /KICK command are:
 +	      /KICK franl You don't belong here
 +	      /KICK franl Bye
 +	      /KICK franl
 +	      /KICK #channel franl Go away now
 +	      /KICK #channel franl Bye
 +	      /KICK #channel franl
 +
 +2003-02-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.29 (erc-insert-timestamp-right):
 +	Make the timestamp rear-nonsticky, so
 +	C-e works at the beginning of the next line.
 +
 +2003-02-16  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.28:
 +	* s/choose/choice/ in customize options, as kensanata requested.
 +
 +2003-02-15  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.491 (erc-toggle-debug-irc-protocol):
 +	Now if the *erc-protocol* buffer is killed,
 +	    logging is turned off.  Prior to this change, the buffer would come back
 +	    into existence (generally unbeknownst to the user) after being killed.
 +
 +2003-02-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.490 (erc-send-current-line):
 +	we can't inhibit everything here when not connected,
 +	    as the user will expect commands like /server still to work. the
 +	    erc-cmd-handler should recover from errors instead
 +
 +2003-02-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.489:
 +	* we now run erc-after-connect on 422 (no motd) messages as well as the motd
 +	  messages
 +	(erc-login): revert the previous change
 +
 +	* erc.el 1.488 (erc-login): register that we're connected
 +
 +2003-02-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-members.el 1.4: * Provide erc-members
 +	* Fix excessive )
 +	* Comment out broken self-tests
 +
 +2003-02-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.487 (erc-connect):
 +	notify the user we're trying to connect when using asych
 +	    connections
 +
 +	* erc.el 1.486 (erc-connect): support an asyncronous connection
 +	(erc-process-sentinel): ditto
 +
 +	* erc-track.el 1.48:
 +	* advise switch-to-buffer in the case of xemacs, since it doesn't have
 +	  window-configuration-change-hook
 +
 +	* erc.el 1.485 (erc-send-current-line):
 +	if not connected, refuse to send either a message or
 +	    a command
 +
 +	* erc.el 1.484: (erc-save-buffer-in-logs):
 +	    - check for a sensibile region before saving the buffer. if the
 +	      connection process is killed early on, there is not a sensible region
 +	      to save
 +	    - don't set buffer-file-name on save. we don't need it, and it means we
 +	      can now find-file a log while an existing query is open with that
 +	      user
 +
 +	* erc.el 1.483 (erc-process-input-line):
 +	when displaying the help for a function, if no
 +	    documentation exists, don't fall over
 +	(erc-cmd-SAY): new function for quoting lines begining with /
 +	(erc-server-NICK):
 +	    - fix a bug where the "is now known as" message doesn't appear on newly
 +	      created /query buffers
 +	    - when a user changes their nick, update the query to point to the new
 +	      nick
 +
 +	* erc.el 1.482 (erc-send-current-command):
 +	don't reject multi-line commands. since
 +	    multiline-p is used as the no-command arg to erc-process-current-line,
 +	    multi-line text is never interpreted as a command. i believe this is the
 +	    correct behavior - it allows people to post the output of things like df
 +	    (sans header). if you want to change this, please provide a rationale
 +	    in the changelog
 +
 +	* erc.el 1.481 (erc-send-current-line):
 +	only match the first line when determining if a
 +	    multi-line command is allowed
 +
 +2003-02-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-bbdb.el 1.21 (erc-bbdb-highlight-record):
 +	Use alternate strings, not character
 +	classes to split the nick-field.
 +
 +2003-02-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.479 (erc-process-sentinel):
 +	Now we set erc-connected to nil every time we disconnect
 +	    from a server, not just when an unexpected disconnect happens.
 +
 +	* erc.el 1.478 (erc-connected):
 +	Removed redundant defvar of this variable.  Improved the
 +	    docstring.
 +	(erc-login): Changed to send a correct RFC2812 USER message (see section
 +	    3.1.3 of RFC2812 for the documentation of the semantics of each argument
 +	    of the USER message.
 +
 +2003-02-02  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.477 (erc-cmd-NOTICE): fix from mrbump
 +
 +2003-01-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.476 (erc-cmd-JOIN):
 +	Now we only send one JOIN command to the server when a channel
 +	    key is provided.
 +
 +2003-01-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.475 (erc-remove-channel-member):
 +	Fixed so that it runs erc-channel-members-changed-hook
 +	    with the channel buffer current, as is documented in the docstring for variable
 +	    erc-channel-members-changed-hook: "The buffer where the change happened is
 +	    current while this hook is called."
 +
 +2003-01-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.474:
 +	(erc-ignored-user-p),(erc-cmd-IGNORE),(erc-cmd-UNIGNORE): Now nicks are ignored
 +	    on a per-server basis.  Now, erc-ignore-list is only valid in server
 +	    buffers!  Do not reference it in channel buffers.
 +
 +	* erc.el 1.473 (erc-cmd-IGNORE):
 +	Now says "Ignore list is empty" if it erc-ignore-list is empty
 +	    instead of showing an empty list.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.11 (services): Defined a module
 +
 +2003-01-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.472 (erc-process-ctcp-query):
 +	Display recipient of CTCP query if it's not
 +	our current nick.
 +
 +	* erc.el 1.471 (erc-cmd-WHOIS):
 +	Accept an optional second argument SERVER.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.27 (stamp): erc-add-timestamp must always be added
 +	with the APPEND parameter -- not only when adding it on the right.
 +
 +2003-01-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-members.el 1.3 (erc-channel-members-changed-hook): Obsolete, use
 +	erc-members-changed-hook instead.  When it is set, add its content
 +	to erc-members-changed-hook.
 +	(erc-update-channel-member): Obsolete, use erc-update-member
 +	instead.  Defalias to that effect.
 +	(erc-remove-channel-member): New and already obsolete.  Use
 +	erc-remove-nick-from-channel instead.
 +	(erc-update-channel-info-buffer): Obsolete, use ignore instead.
 +	Yes, these have to go.
 +	(erc-channel-member-to-user-spec): Obsolete, use erc-format-user
 +	instead.
 +	(erc-format-user): New.
 +	(erc-ignored-reply-p): New, use it.
 +
 +	* erc-members.el 1.2:
 +	Further along the way.  Any function from erc.el that uses
 +	channel-members should end up in this file, rewritten to use
 +	erc-members.
 +
 +	(erc-person): Call erc-downcase before getting
 +	something from the hash.
 +	(erc-nick-in-channel): Checking wether erc-process must be used is
 +	unnecessary -- this will be done in erc-person.
 +	(erc-nick-channels): New.
 +	(erc-add-nick-to-channel, erc-update-member): Call erc-downcase
 +	before putting something into the hash.
 +	(erc-buffer-list-with-nick): New.
 +	(erc-format-nick, erc-format-@nick): New, backwards incompatible.
 +	Must check for other places that call these!
 +	(erc-server-PRIVMSG-or-NOTICE): Use the new version.
 +
 +	* erc-compat.el 1.10 (view-mode-enter): defalias to view-mode, if
 +	view-mode-enter is not fboundp and view-mode is -- as is the case
 +	in XEmacs.  We need view-mode-enter in erc-match.el.
 +
 +2003-01-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.470 (erc-default-server-handler):
 +	Minor performance improvement: allow the lambda
 +	    expression to be byte-compiled.
 +
 +2003-01-23  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.469 (erc-cmd-BANLIST):
 +	in the absence of a fill-column, use the screen width
 +
 +2003-01-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.468:
 +	patch from MrBump to delay fetching the banlist until /bl is run, so we don't
 +	fetch it when joining a channel anymore
 +
 +	* erc-ring.el 1.10:
 +	* instead of adjusting hooks when loaded, provide (erc-ring-mode). you'll
 +	  need to run (erc-ring-mode 1) now to get the ring
 +	* (erc-previous-command), (erc-next-command):
 +	    - check if the ring exists and create it if necessary
 +	    - don't do anything if the ring is empty
 +
 +	* erc-pcomplete.el 1.17:
 +	Put "how to use" documentation in the comments up the top
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.4 (erc-autojoin-version): New.
 +
 +	* erc-autojoin.el 1.3 (erc-autojoin-add): Added body.
 +	(erc-autojoin-remove): Added body.
 +	(erc-autojoin): Provide it.
 +
 +2003-01-21  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.467: erc-cmd-*: removed a bunch of references to force
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.2 (erc-autojoin-channels-alist): More doc.
 +
 +2003-01-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.1:
 +	new, based on resolve's mail, and the stuff on the wiki
 +
 +	* erc-members.el 1.1: new
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.6, debian/changelog 1.20, debian/scripts/install 1.11, 
 +	  debian/scripts/startup.erc 1.4, Makefile 1.13:
 +	Prepare for 20030119 debian package
 +
 +	* erc-dcc.el 1.65: <rant>
 +	* (erc-decimal-to-ip): Since XEmacs decides that return a completely
 +	and utterly wrong number from string-to-number if it is larger than
 +	the integer boundary, instead of sanely converting the thing to
 +	a float, we now (concat dec ".0").
 +	</rant>
 +
 +	* erc.el 1.466:
 +	* (erc-log-irc-protocol): Use erc-propertize, not propertize
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.45 (erc-button-add-buttons): Added regexp-quote for
 +	the list case, too.
 +
 +2003-01-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.64 (erc-dcc-member): fix for case where a prop is nil
 +
 +	* erc-dcc.el 1.63 (erc-dcc-member):
 +	fix for xemacs's version of plist-member
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.17: Delete empty strings from the ison-list
 +
 +	* erc-track.el 1.47:
 +	* (erc-track-switch-buffer): Call erc-modified-channels-update here.
 +
 +	* erc-track.el 1.46: * toplevel: require 'erc-match
 +
 +	* erc-track.el 1.45: * (erc-track-mode): Make autoload interactive
 +
 +	* erc-button.el 1.44: * (button): Make the autoload interactive
 +
 +	* erc.el 1.465:
 +	* (erc-mode): Comment out the case-table stuff, breaks xemacs
 +	* (erc-downcase): Revert.
 +
 +	* erc-dcc.el 1.62:
 +	* (erc-dcc-handle-ctcp-send): Use erc-decimal-to-ip on the ip we get...
 +
 +	* erc-speak.el 1.25:
 +	Eliminate reference to erc-nick-regexp, which no longer exists
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.26 (erc-timestamp-right-column): New, default nil.
 +	(erc-insert-timestamp-right): Use it, if non-nil.  Verbose
 +	doc string.
 +
 +2003-01-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.464 (erc-downcase): Use the old behavior in non-CVS Emacs.
 +
 +	* erc.el 1.463 (erc-cmd-QUIT): Remove &rest. The correct fix follows.
 +	(erc-cmd-GQUIT): Pass "" to erc-cmd-QUIT.
 +	(erc-mode): Use the case-table only in CVS Emacs. See comment.
 +
 +	* erc.el 1.462 (erc-cmd-QUIT): make reason optional.
 +
 +	* erc.el 1.461 (erc-cmd-GQUIT): Fixed typo.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.460:
 +	* (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
 +
 +	* erc.el 1.459: * (erc-mode): Define a proper case-table.
 +	* (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
 +
 +	* erc-button.el 1.43: * (erc-button-add-buttons): regex-quote the nick
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.42 (button): erc-channel-members-changed-hook no
 +	longer has erc-recompute-nick-regexp.
 +	(erc-button-alist): Use channel-members instead of
 +	erc-nick-regexp.
 +	(erc-button-add-buttons): Split some code into
 +	erc-button-add-buttons-1, and now handle strings, lists, and
 +	alists.  Regular expressions in lists and alists are enclosed in
 +	< and >.
 +	(erc-button-add-buttons-1): New.
 +	(erc-nick-regexp): Deleted.
 +	(erc-recompute-nick-regexp): Deleted.
 +
 +	* erc-button.el 1.41: Remove require cl again.
 +	(erc-mode-map): No longer bind widget-backward and widget-forward.
 +	(erc-button-alist): Explain why byte-compiling makes no sense, and
 +	remove all calls to byte-compile.
 +	(erc-button-keymap): Define it the standard way, without exposing
 +	the list nature of the keymap.
 +	(erc-button-marker-list): Deleted.
 +	(erc-button-add-buttons): Simplify.  In particular, create the
 +	button using the real callback, instead of using the intermediate
 +	erc-button-push, and only store the data as described for
 +	erc-button-alist.
 +	(erc-button-remove-old-buttons): Simplify.  No more list munging.
 +	Instead, just remove all the properties that we add in
 +	erc-button-add-button.
 +	(erc-widget-press-button): Deleted.
 +	(erc-button-click-button): New, for mouse clicks.  Moves point to
 +	where the mouse is, and calls erc-button-push.
 +	(erc-button-push): Instead of matching again, just use the
 +	erc-callback and erc-data properties at point to do the right
 +	thing.
 +	(erc-button-entry): Deleted.
 +	(erc-button-next): Use error instead of the beep plus message
 +	combo.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.11 (erc-autoaway-set-back):
 +	Don't pass a force argument to erc-cmd-GAWAY.
 +
 +	* erc.el 1.458 (erc-cmd-AWAY): Removed usage of the force variable.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.40 (button):
 +	erc-recompute-nick-regexp is no longer added to
 +	erc-channel-members-changed-hook unconditionally, but only if
 +	erc-button-mode is enabled, and if it is disabled, it is removed
 +	again.
 +	(erc): Require cl for delete-if.
 +	(erc-button-remove-old-buttons): Rewrote using delete-if to
 +	prevent exceesive consing.  Having the marker list is still ugly,
 +	so another solution needs to be found.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.457 (erc-banlist-store):
 +	Don't assume there's always a setter in the banlist reply.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.39 (erc-button-url-regexp): Changed regexp according
 +	to a suggestion by Max Froumentin <mf@w3.org>.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.456:
 +	fix erc-remove-channel-member again to not error out on nil as first arg...
 +
 +	* erc.el 1.455: * (erc-occur): New function
 +
 +2003-01-17  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.454: erc-banlist-*: return nil so further hooks are called
 +
 +	* erc.el 1.453 (erc-server-368):
 +	supress "end of ban list" messages - use /listbans now
 +
 +	* erc.el 1.452 (erc-send-current-line):
 +	removed the check for leading whitespace again - the
 +	    only time we want to prohibit multi-line commands is if / is the first
 +	    thing on the line
 +	(erc-get-arglist): new defun for reading a function's arglist which should
 +	    work with older copies of emacs. we use help-function-arglist if it's
 +	    available, though, since that has support for reading subrs, etc
 +
 +	* erc.el 1.451 (erc-cmd-JOIN): fixed (again)
 +
 +	* erc.el 1.450: * fixed call to erc-cmd-NICK when connecting
 +	* support for listing bans and mass unbanning, again thanks to MrBump
 +
 +	* erc.el 1.449 (erc-set-topic):
 +	patch from MrBump (Mark Triggs, mst@dishvelled.net) to strip
 +	    control chars and topic attribution in C-c C-t
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.448:
 +	* (erc-remove-channel-member): Do not use delq, modify the list using setcdr like delq does.
 +	In theory, this should be way faster since the list doesnt get traverse two times.
 +	Measurement didn't show any real difference though :(, this system is flawed for channels with >300 users it seems...
 +	Also moved some defcustoms up.
 +
 +2003-01-16  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.447: moved misplaced paren
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.446 (erc-cmd-UNIGNORE):
 +	reference argument directly - no string matching
 +
 +	* erc.el 1.445 (erc-extract-command-from-line):
 +	hmm, thinko in the canonicalisation. should
 +	    be fixed
 +
 +2003-01-16  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.444 (erc-send-current-line):
 +	Changed the regexp used to match /COMMANDs so that leading
 +	    whitespace is taken into account.
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.61: * (erc-dcc-do-SEND-command): Fix it
 +
 +	* erc-ezbounce.el 1.4, erc-lang.el 1.2: Arglist changes...
 +
 +	* erc.el 1.443: Various docstring fixes and additions.
 +
 +	* erc-notify.el 1.16:
 +	* (erc-cmd-NOTIFY): Change the function arglist to (&rest args)
 +
 +	* erc-netsplit.el 1.8: * (erc-cmd-WHOLEFT): Has no args...
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-fill.el 1.22:
 +	erc-fill-column: default to 78, so things like docstrings don't get wrapped
 +	    in an ugly manner
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.442:
 +	* (erc-cmd-default): Take a substring, now /mode works again.
 +	* (erc-cmd-AWAY): Put do-not-parse-args t
 +	* (erc-cmd-GAWAY): Ditto, and fix it.
 +	* (erc-cmd-CTCP): Switch to argument system.
 +	* (erc-cmd-KICK): Do the same.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.60:
 +	* (erc-cmd-DCC): Fixed for the new scheme, simplified.
 +	* (erc-dcc-do-CHAT-command): Ditto.
 +	* (erc-dcc-do-CLOSE-command): Ditto.
 +	* (erc-dcc-do-LIST-command): Ditto.
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.441:
 +	erc-error-face: setting a background doesn't work so well with multi-line
 +	    messages, so we don't. fg colour is negotiable ;-)
 +	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
 +	(erc-send-current-line): allow multi-line messages provided they don't start
 +	    with a slash - there's no need to prohibit them if the slash isn't the
 +	    first character
 +
 +	* erc.el 1.440: * bad-syntax now reports like incorrect-args
 +	* bunch of extra cmds fixed, nick, sv etc.
 +
 +	* erc.el 1.439 (erc-cmd-HELP): fixed
 +	(erc-extract-command-from-line): when deterimining canon-defun, make sure we
 +	    have a valid symbol
 +	(erc-cmd-KICK): fixed
 +
 +	* erc.el 1.438:
 +	* removed duplicate do-no-parse-args properties for the defaliased defuns
 +	(erc-process-input-line): show function signature when incorrect args
 +	(erc-extract-command-from-line): canonicalise defaliases before extracting
 +	    plist
 +	(erc-cmd-CLEAR): fixed
 +	(erc-cmd-UNIGNORE): fixed again
 +
 +	* erc.el 1.437 (erc-cmd-SET): fixed
 +	(erc-cmd-UNIGNORE): fixed
 +	(erc-process-input-line): report when incorrect arguments are provided to a
 +	    command, and show the command's docstring
 +
 +	* erc.el 1.436 (erc-cmd-APPENDTOPIC): fixed
 +	(erc-process-input-line): more informative error message than 'bad syntax'
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.435: * (erc-cmd-IGNORE): fixed
 +
 +	* erc.el 1.434: * (erc-cmd-NAMES): fixed
 +
 +	* erc.el 1.433:
 +	* (erc-cmd-CLEARTOPIC): Simplify, fix doc, make interactive
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.432 (erc-cmd-JOIN):
 +	correct invite behavior, and document it.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.431: * (erc-cmd-PART): Put 'do-not-parse-args t
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.430 (erc-cmd-JOIN): new cmd argument syntax
 +	(erc-process-input-line): check if (erc-extract-command-from-line) returned a
 +	    list, and apply if that's the case
 +
 +	* erc.el 1.429:
 +	erc-cmd-*: remove optional force and references to `force' in the code
 +	(erc-cmd-AMSG): call erc-trim-string, not trim-string
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.428:
 +	* (erc-cmd-CLEARTOPIC): LINE is now ARGS and already parsed.
 +	Set erc-cmd-TOPIC to 'do-not-parse-args for now.
 +	(comment: I think we should have 'first, so that only first word is parsed...
 +	 Or we could autodetect erc-channel-p in the parser before that somehow...)
 +
 +	* erc.el 1.427: * (erc-cmd-OP): LINE is PEOPLE now, and already parsed.
 +
 +	* erc-notify.el 1.15:
 +	* (erc-cmd-NOTIFY): Arg LINE is now ARGS, and already parsed.
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.25 (erc-insert-timestamp-right):
 +	Prefer erc-fill-column to window-width,
 +	because on wide screens the timestamp could wander off too far to the
 +	right.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.426: This is the "everything is suddenly broken!" release
 +	You know, this is CVS, you can still go back, and wait until the transition
 +	is finished, but here is patch one, which basicly breaks every command
 +	which is typed on the prompt.
 +	Hit me, we can still revert, but something needs to be done about this.
 +	* (erc-extract-command-from-line): intern-soft the function here.
 +	If the function symbol has a property 'do-not-parse-args, operate as before,
 +	otherwise, split the arguments prior to calling the command handler.
 +	* (erc-process-input-line): Updated to accomodate the change above.
 +	* (erc-send-distinguish-noncommands): Ditto.
 +	* (erc-cmd-NAMES): Ditto.
 +	* (erc-cmd-ME): Put 'do-not-parse-args property.
 +
 +	* erc-dcc.el 1.59:nick:	* erc-dcc.el 1.59: * erc-dcc-list: Renamed 
 +	* (erc-dcc-member). Treat :nick as either a nick!user@host or nick,
 +	do appropriate comparisons, simplified.
 +	* (erc-dcc-list-add): New functions
 +	various callers of (cons (list ...) erc-dcc-list) updated.
 +	Other stuff I'm to bored to document now
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.24 (erc-insert-timestamp-right):
 +	Removed redundant code that overrid the
 +	window-width. Now substracts (length string) from every found
 +	indentation positions.
 +
 +2003-01-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.425:
 +	* (erc-cmd-AMSG): Remove useless call to erc-display-message.
 +
 +	* erc-dcc.el 1.58:
 +	* erc-dcc-chat/send-request: New variables, control how to treat
 +	incoming dcc chat or send requests. Can be set to 'ask, which behaves
 +	like it did before, 'auto, which accepts automatically, and
 +	'ignore, which ignores those type of requests completely.
 +	* (erc-cmd-CREQ): New user-level command.
 +	* (erc-cmd-SREQ): Ditto.
 +
 +	* erc.el 1.424: * (erc-cmd-AMSG). New command.
 +
 +	* erc-xdcc.el 1.4: * (erc-xdcc): delete empty strings from ARGS
 +
 +	* erc-dcc.el 1.57: * erc-dcc-ipv4-regexp: New constant
 +	* (erc-ip-to-decimal): Use it.
 +	* erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:	* erc-dcc-host: :type
 +	* (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
 +	* Some docstring/comment fixes.
 +
 +	* erc-stamp.el 1.23:
 +	* (erc-insert-timestamp-right): Subtract (length string) from
 +	POS in any case, otherwise, linewrap occurs.
 +
 +	* erc-dcc.el 1.56:
 +	* Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
 +	  and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
 +	* Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
 +	* Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
 +
 +2003-01-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-xdcc.el 1.3:
 +	* erc-xdcc-help-text: New variable which makes replies to the originator
 +	much more flexible.
 +	* erc-xdcc-help-format: Removed.
 +	* (erc-xdcc-help): Handle the new variable.
 +	* (erc-xdcc): Simplified
 +
 +	* erc-xdcc.el 1.2: * erc-xdcc-handler-alist: New variable.
 +	* (erc-xdcc): Move code for list and send sub-commands into
 +	* (erc-xdcc-help): New function.
 +	* (erc-xdcc-list): New function.
 +	* (erc-xdcc-send): New function.
 +
 +2003-01-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.423 (erc-server-JOIN):
 +	Oops, send MODE command only when *we* joined a channel.
 +
 +	* erc.el 1.422:
 +	Fixing ERCs behavior wrt IRCnet's !channels have a different name for
 +	JOIN than in reality (e.g. you can join !forcertest or !!forcertest
 +	and really get to !ABCDEforcertest)
 +
 +	(erc-cmd-JOIN): Removed erc-send-command MODE.
 +	(erc-server-JOIN): Ask for MODE now.
 +
 +2003-01-12  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.55:
 +	(erc-dcc-get-filter), (erc-dcc-get-file): store size as a string, not an
 +	    integer. check size > 0 for the case where a size wasn't provided, since
 +	    string-to-int will return 0 on an empty string
 +
 +2003-01-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.54: * Use RAWFILE arg with find-file-noselect
 +	* Fix alist/plist conversion left-over
 +	* Add verbose-info about sending blocks.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.53: * (pcomplete-erc-mode/DCC): Fixes
 +
 +	* erc-xdcc.el 1.1: Initial version.
 +
 +	* erc-pcomplete.el 1.16:
 +	* (erc-pcomplete): Fix so that cycle-completion works again.
 +	* (pcomplete-parse-erc-arguments): If there is a space after the last word
 +	before point, we need to return a "" arg, and it's position.
 +
 +	* erc-dcc.el 1.52: Fix to pcomplete/erc-mode/DCC
 +
 +	* erc-dcc.el 1.51: * (pcomplete/erc-mode/DCC): New function
 +
 +	* erc-dcc.el 1.50: *** empty log message ***
 +
 +	* erc-dcc.el 1.49: Move code around, just basic changes
 +
 +2003-01-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.22 (erc-insert-timestamp-right):
 +	Check wether erc-fill-column is
 +	available before using it. Else default to fill-column or if
 +	everything else fails, the window width of the current window. For the
 +	fill-columns, use them directly as the starting position for the
 +	timestamp.
 +
 +2003-01-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.21:
 +	erc-insert-timestamp-right: use correct window's window-width. If
 +	                  buffer is not in a window, use erc-fill-column.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.48:	* erc-dcc.el 1.48: * (erc-dcc-do-LIST-command): Fix 
 +
 +	* erc-dcc.el 1.47:
 +	* buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
 +	  Keep This info in erc-dcc-member :sent and :confirmed plist values
 +	* :	* :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
 +	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-conntected, which now prints a msg...
 +
 +	* erc-dcc.el 1.46:
 +	* (erc-dcc-chat-accept): Renamed from erc-dcc-chat. Callers updated.
 +	* (erc-dcc-chat): Renamed from erc-dcc-chat-request.
 +	Callers updated, and interactive form added.
 +	* (erc-dcc-server-accept): No longer do any type-specific stuff.
 +	* (erc-dcc-chat-sentinel): Call erc-dcc-chat-setup if event is "open from "
 +	from here, otherwise call erc-dcc-chat-close.
 +
 +	* (
 +
 +	* erc-dcc.el 1.45: *** empty log message ***
 +
 +	* erc-dcc.el 1.43: Moved some functions around.
 +	Doc string fixes.
 +	"/dcc send nick filename" works now
 +
 +2003-01-11  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.421 (erc-send-command): Fixed flood protect message.
 +
 +	* erc-button.el 1.38 (erc-button-syntax-table): Make `-' a legal nick
 +	constituent.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.42: Some more steps toward dcc send.
 +
 +2003-01-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.14 (erc-notify-timer):
 +	Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-JOIN): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-NICK): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-QUIT): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-cmd-NOTIFY): Now "/notify -l" lists the nicks on your notify list.  Now
 +	    when you remove a nick from your notify list, you no longer recieve a spurious
 +	    signoff notification for that nick.  Changed to make it IRC-case-insensitive when
 +	    comparing nicks.
 +
 +	* erc.el 1.420 (erc-ison-p):
 +	Fixed so it calls erc-member-ignore-case instead of member.
 +
 +	* erc.el 1.419 (erc-member-ignore-case):
 +	New function.  Just like member-ignore-case, but obeys
 +	    the IRC protocol case matching rules.
 +
 +2003-01-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.41:
 +	(erc-dcc-do-GET-command), (erc-dcc-get-file): use the plist syntax, this
 +	    fixes dcc get again
 +
 +2003-01-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.418: erc-complete-functions: New variable.
 +	erc-mode-map: Bind \t to 'erc-complete-word
 +	erc-complete-word: New function.
 +
 +	* erc-pcomplete.el 1.15 (erc-pcomplete-mode):
 +	Use new erc-complete-functions
 +	(erc-pcomplete): Check that we're in the input line, else return nil.
 +
 +	* erc-button.el 1.37 (erc-button-mode): Use new erc-complete-functions
 +	erc-button-old-tab-command: Removed.
 +	(erc-button-next-or-old): Removed
 +	(erc-button-next): check that we're not in the input line, else just return nil.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.40: cleanup
 +
 +	* erc-dcc.el 1.39:
 +	* (erc-dcc-chat-request): No longer use erc-send-ctcp-message.
 +
 +	* erc-dcc.el 1.38:
 +	* (erc-dcc-no-such-nick): Also call delete-process if we have a peer already
 +
 +	* erc-dcc.el 1.37:
 +	* (erc-dcc-no-such-nick): New function, server event handler for event 401.
 +	If we send a CTCP message requesting something dcc related, we set up an
 +	entry in erc-dcc-list before sending the request (for the server proc object
 +	for listening conns for example).  But if that nick does not exist
 +	on that server, we now nicely cleanup erc-dcc-list again.
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.36: Moved code around a bit, and doc fixes
 +
 +	* erc-dcc.el 1.35: *** empty log message ***
 +
 +	* erc-dcc.el 1.34: Rename erc-dcc-plist to erc-dcc-list
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.33 (erc-dcc-server (erc-dcc-chat-setup):
 +	use erc's (erc-setup-buffer) to determine how to
 +	    display new DCC windows
 +	(erc-dcc-chat-buffer-killed): buffer-local hook for DCC buffers to close the
 +	    process
 +	(erc-dcc-chat-close): code common to a killed buffer or a disconnection from
 +	    the other side
 +	(erc-dcc-chat-sentinel): use (erc-dcc-chat-close)
 +	(erc-dcc-server-accept): use (erc-log) instead of (message)
 +
 +	* erc.el 1.417:
 +	(erc), (erc-setup-buffer): factor out window generation code so DCC can use
 +	    it too
 +
 +	* erc-dcc.el 1.32:
 +	(erc-dcc-do-CLOSE-command), (erc-dcc-do-LIST-command): work with erc-dcc-plist
 +
 +	* erc-dcc.el 1.31:
 +	erc-dcc-alist: became erc-dcc-plist, so we can more easily grab particular
 +	    properties
 +	dcc catalog: unify use of DCC: and [dcc] (either's fine, but let's be
 +	    consistent)
 +	(erc-dcc-member): takes an arbitrary list of constraints now
 +	(erc-dcc-proc-member): removed, as (erc-dcc-member) can be used for this
 +	(erc-dcc-do-CHAT-command): use the catalog to show the user what's going on
 +	(erc-dcc-chat-server): removed
 +	(erc-dcc-server): takes name sentinel and filter arguments, can be used for
 +	    both send and chat now
 +
 +	.. this release means all send/get support is broken until we fix up the
 +	things that still expect to be using an alist. this include /dcc list, /dcc
 +	close
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.9 (erc-previous-command):
 +	If you have a partially typed input line and press M-p,
 +	    you lose what you typed.  Now we save it so you can come back to it.
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-ring.el 1.8 (erc-add-to-input-ring): s/nullp/null/
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-ring.el 1.7 (erc-add-to-input-ring):
 +	set up the ring if it's not already setup
 +
 +	* erc-dcc.el 1.30 (erc-dcc-member): case insensitive match of nicknames
 +	(erc-dcc-do-CHAT-command): echo what we're doing (at least for now)
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.29: (temporarily) fix erc-process setting...
 +
 +	* erc-dcc.el 1.28: * (erc-dcc-chat-send-line): Removed
 +
 +	* erc.el 1.416:
 +	Check if target is stringp (we can now also have 'dcc as value...)
 +
 +	* erc-dcc.el 1.27 (erc-dcc-chat-send-input-line):
 +	New function, used for
 +	erc-send-input-line-function.
 +	Use erc-send-current-line now.
 +
 +	* erc-dcc.el 1.26: evt to elt...
 +
 +	* erc-dcc.el 1.25: Remove () from a var (how silly!)
 +
 +	* erc-dcc.el 1.24: * (erc-dcc-get-host): Use format-network-address.
 +	* (erc-dcc-host): Change semantic.  If erc-dcc-host is set, use it.
 +	Otherwise, try to figure out the host by calling erc-dcc-get-host.
 +	* (erc-dcc-server-port): New variable.
 +	* erc-dcc-chat-log: Renamed to erc-dcc-server-accept
 +
 +	* erc-dcc.el 1.23 (erc-dcc-do-CHAT-command):
 +	Change arg of call to erc-dcc-chat-request from elt to nick
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.415 (erc-send-current-line):
 +	Now rejects multi-line commands (i.e., lines that
 +	    start with "/" and contain newlines).
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-button.el 1.36:
 +	Functionality to use TAB to jump to the next button:
 +
 +	(erc-button-next-or-old): New function.
 +	(erc-button-next): New function.
 +	erc-button-keymap: added erc-button-next
 +	erc-button-old-tab-command: New variable.
 +	define-erc-module button: Add and remove 'erc-button-next-or-old as
 +	appropriate.
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.414:
 +	New variable: erc-auto-reconnect (defaults to t).  If non-nil, ERC will
 +	    automatically reconnect to a server after an unexpected disconnection.
 +	(erc-process-sentinel): Changed to refer to variable erc-auto-reconnect.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.413:
 +	* erc-send-input-line-function: New variable, used for dispatch...
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.22 (erc-dcc-chat-sentinel):
 +	check event type before killing process
 +	(erc-dcc-chat-log): new, handles the setup of dcc chats for incoming
 +	    connections
 +	(erc-dcc-chat): use (erc-dcc-chat-setup)
 +	(erc-dcc-chat-setup): code common to incoming and outgoing DCC chats
 +	(erc-dcc-chat-request): request a DCC chat with another user
 +	(erc-dcc-proc-member): locate a member in erc-dcc-alist by process
 +
 +	The very first ERC to ERC DCC chat was held between delysid and resolve today!
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.44 (erc-all-buffer-names):
 +	Check for erc-dcc-chat-mode too
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.6, erc.el 1.412 (erc-kill-input):
 +	Resets erc-input-ring-index to nil, so that invoking this
 +	    command conceptually puts you after your most recent input in the input
 +	    history.
 +	(erc-previous-command and erc-next-command): Changed so that history movement
 +	    is more intuitive.  Also preserves the blank input line that marks the
 +	    place after the newest command in the history ring (i.e., you'll see a
 +	    blank command once every trip around the ring in either direction).
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.21 (erc-dcc-chat): Add docstring
 +	Add self-test.
 +	Fix error if /dcc chat nick doesnt find the nick
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.12:
 +	Changed so that "make" works correctly under Cygwin.  Before this change, the
 +	pathname passed to Emacs on the command line under Cygwin had the form
 +	"/cygwin/c/...", which prevented emacs from finding the file.  Now the pathname
 +	has the form "c:/...".  This works for any drive letter.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.35: reindent some code, and add TODO to comments
 +
 +	* erc-dcc.el 1.20: *** empty log message ***
 +
 +	* erc-dcc.el 1.19: Make dcc-chat-ended a notice
 +	Remove now bogus comment
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.18 (erc-pack-int): from erc-packed-int
 +	(erc-unpack-int): new
 +
 +	* erc-dcc.el 1.17 (erc-unpack-str): added
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.411 (erc-server-482):
 +	New handler, handles KICK reply if you're not channel-op
 +
 +	* erc-dcc.el 1.16: Document SEND in erc-dcc-alist.
 +	Move sproc, parent-proc and file into erc-dcc-alist
 +
 +	* erc-dcc.el 1.15: stubs
 +
 +	* erc-dcc.el 1.14 (erc-dcc-get-host):
 +	Change :iface to :local since Kim committed it now to CVS emacs
 +
 +	* erc-dcc.el 1.13 (erc-dcc-get-host):
 +	New function, requires the not-yet-in-CVS-emacs local-address.patch to process.c.
 +	Some other minor additions
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.410 (erc-cmd-IGNORE):
 +	Now returns t to prevent "Bad syntax" error.
 +	(erc-cmd-UNIGNORE): Now returns t to prevent "Bad syntax" error.
 +	(erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
 +
 +	* erc.el 1.409 (erc-scroll-to-bottom):
 +	Temporarilly bind resize-mini-windows to nil so that
 +	    users who have it set to a non-nil value will not suffer from premature
 +	    minibuffer shrinkage due to the below recenter call.  I have no idea why
 +	    this works, but it solves the problem, and has no negative side effects.
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.12:
 +	erc-dcc-ctcp-query-chat-regexp: The IP is not really an IP, but a
 +	number (no . allowed there).
 +	(erc-dcc-send-ctcp-string): use let* here to avoid cluttering up the
 +	match data.
 +	Also, use erc-decimal-to-ip to get the IP.
 +	(erc-ip-to-decimal): Removed some pasted ERC timestamps
 +	(erc-decimal-to-ip): New function.
 +	erc-dcc-chat-mode-map: Return map in the initialization.
 +
 +2003-01-07  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-match.el 1.19 (erc-match-fool-p):
 +	Changed to call erc-match-directed-at-fool-p instead of
 +	     erc-directed-at-fool-p.
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.11 (erc-cmd-DCC):
 +	Change (cond ... (t nil)) to (when ...)
 +
 +	* erc-dcc.el 1.10: Use erc-current-nick-p
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.408:
 +	erc-join-buffer: Added 'window-noselect to docstring and :type.
 +	erc-auto-query: Added 'window-noselect to :type.
 +	(erc): Treat erc-join-buffer being 'window-noselect appropriately.
 +
 +	* erc.el 1.407 (erc-current-nick-p): New function.
 +	(erc-nick-equal-p): New function.
 +	(erc-already-logged-in), (erc-server-JOIN), (erc-auto-query),
 +	(erc-server-PRIVMSG-or-NOTICE): Use erc-current-nick-p.
 +	(erc-update-channel-member): Use erc-nick-equal-p.
 +
 +	* erc-match.el 1.18 (erc-match-current-nick-p):
 +	Renamed from erc-current-nick-p
 +	(erc-match-pal-p): Renamed from erc-pal-p
 +	(erc-match-fool-p): Renamed from erc-fool-p
 +	(erc-match-keyword-p): Renamed from erc-keyword-p
 +	(erc-match-dangerous-host-p): Renamed from erc-dangerous-host-p
 +	(erc-match-directed-at-fool-p): Renamed from erc-directed-at-fool-p
 +	(erc-match-message): Use erc-match-TYPE-p instead of erc-TYPE-p
 +
 +	* erc.el 1.406:
 +	Support for IRCnets' "nick/channel temporarily unavailable"
 +
 +	(erc-nickname-in-use): New function (mostly copied from erc-server-433).
 +	(erc-server-433): Use erc-nickname-in-use
 +	(erc-server-437): New function.
 +	erc-server-hook-list: Added (437 erc-server-437).
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.21: Add autoload cookie
 +
 +	* erc-notify.el 1.13:
 +	Now also pass SERVER argument to signon/off hooks, and provide a erc-notify-signon/off function for echo-area printing
 +
 +	* erc-notify.el 1.12 (erc-notiy-QUIT):
 +	Change use of delq to delete, delq does not work with strings
 +
 +2003-01-06  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.405 (erc-ctcp-query-VERSION):
 +	v%s -> %s, so we are no longer vVersion...
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.404: Small change to erc-ison-p, and fixme tag
 +
 +2003-01-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.403 (erc):
 +	Fixed bug where variable "away" would be nil in new channel buffers
 +	       even if the user is away when joining the channel.
 +	(erc-strip-controls): Fixed a bug where erc-strip-controls accidentally
 +	       removed all text properties from the string.
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.9:
 +	Some stub functions, some code, nothing really works yet
 +
 +	* erc.el 1.402 (erc-ison-p): New function
 +
 +	* erc-dcc.el 1.8: Some functions which will be needed for dcc send
 +
 +	* erc-dcc.el 1.7 (erc-ip-address-to-decimal):
 +	New function, thanks lawrence
 +
 +	* erc-dcc.el 1.6: Again, simplify code, fix stuff, DCC CHAT works now
 +
 +	* erc-dcc.el 1.5: Many fixes, chat nearly works now
 +
 +	* erc-netsplit.el 1.7: Also detect fast netsplit/joins
 +
 +	* erc-dcc.el 1.4: some more fixes
 +
 +	* erc-dcc.el 1.3: Fixup stage 1, now dcc get works
 +
 +	* erc-dcc.el 1.2: make /dcc LIST work
 +
 +	* erc-dcc.el 1.1:
 +	Initial checkin, dont use it!  its really far from complete.  Hackers: help!
 +
 +	* erc-notify.el 1.11:
 +	New function erc-notify-NICK, and added signon/off hooks which were missing
 +
 +2003-01-05  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.401 (erc-truncate-buffer-to-size):
 +	set inhibit-read-only to t for the
 +	deletion. This is usually done by the function calling the hook, but
 +	not if it's called interactively. Also, rewrote some weird if/if
 +	combination.
 +
 +	* erc-track.el 1.43 (erc-track-shortennames):
 +	Documentation fix (erc-all-buffers is really
 +	erc-all-buffer-names)
 +
 +	These changes make server buffers be tracked as well, as there are
 +	quite a few interesting things going on there (e.g. CTCP etc.)
 +	(erc-all-buffer-names): Check for (eq major-mode 'erc-mode) instead of
 +	erc-default-recipients.
 +	(erc-track-modified-channels): Don't require a default target (e.g.,
 +	this-channel being non-nil)
 +
 +2003-01-03  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.400:
 +	erc-auto-query: can now be set to a symbol to control how new messages should
 +	    be popped up (or not popped up, as the case may be)
 +	(erc-query): new function which handles the bulk of what (erc-cmd-QUERY) did
 +	    previously
 +	(erc-cmd-QUERY): use (erc-query)
 +	(erc-auto-query): use (erc-query)
 +
 +	* erc.el 1.399 (erc-current-logfile):
 +	Downcase result of log generation function, as IRC is
 +	case insensitive. Fixes problems where "/query user" results in a different
 +	log file to a query from "User". Avoided adding an extra flag to control this
 +	behavior - if you think this was the wrong decision, please correct it and
 +	I'll remember it for next time.
 +
 +See ChangeLog.02 for earlier changes.
 +
-     Copyright (C) 2003 Free Software Foundation, Inc.
++    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
diff --cc ChangeLog.04
index 77cf045,0000000..71a0272
mode 100644,000000..100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@@ -1,2080 -1,0 +1,2080 @@@
 +2004-12-29  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-interpret-controls-p): Changed docstring to
 +	reflect the new meaning if this is set to 'remove.
 +	(erc-controls-interpret): Rephrased docstring to be more accurate.
 +	(erc-controls-strip): New function that behaves like the
 +	recently-removed erc-strip-controls -- it removes all IRC color
 +	and highlighting control characters.
 +	(erc-controls-highlight): Changed to support the new 'remove value
 +	that variable erc-interpret-controls-p might have.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-ibuffer.el, erc-list.el, erc-page.el, erc-speedbar.el:
 +	Changed all calls to erc-interpret-controls (which no longer
 +	exists) to call erc-controls-interpret (the new name of the same
 +	function).
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-interpret): Added this function to
 +	replace the recently-removed erc-interpret-controls.  Also added
 +	a (require 'erc) to solve a byte-compile problem.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-controls-interpret): Added this function to replace
 +	the recently-removed erc-interpret-controls.
 +
 +2004-12-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Check for
 +	logging even better (via lawrence).
 +
 +2004-12-26  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Much saner
 +	logging detection (via lawrence).
 +
 +2004-12-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-highlight): Treat single C-c
 +	correctly.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: Deleted IRC control character processing
 +	and implemented a sane version in erc-goodies.el as a module.
 +
 +	* erc.el (erc-merge-controls, erc-interpret-controls,
 +	erc-decode-controls, erc-strip-controls, erc-make-property-list,
 +	erc-prepend-properties): Removed.
 +
 +	(erc-interpret-controls-p, erc-interpret-mirc-color, erc-bold-face
 +	erc-inverse-face, erc-underline-face, fg:erc-color-face0,
 +	fg:erc-color-face1, fg:erc-color-face2, fg:erc-color-face3,
 +	fg:erc-color-face4, fg:erc-color-face5, fg:erc-color-face6,
 +	fg:erc-color-face7, fg:erc-color-face8, fg:erc-color-face9,
 +	fg:erc-color-face10, fg:erc-color-face11, fg:erc-color-face2,
 +	fg:erc-color-face13, fg:erc-color-face14, fg:erc-color-face15,
 +	bg:erc-color-face1, bg:erc-color-face2, bg:erc-color-face3,
 +	bg:erc-color-face4, bg:erc-color-face5, bg:erc-color-face6,
 +	bg:erc-color-face7, bg:erc-color-face8, bg:erc-color-face9,
 +	bg:erc-color-face10, bg:erc-color-face11, bg:erc-color-face2,
 +	bg:erc-color-face13, bg:erc-color-face14, bg:erc-color-face15,
 +	erc-get-bg-color-face, erc-get-fg-color-face,
 +	erc-toggle-interpret-controls): Moved.
 +
 +	* erc-goodies.el (erc-beep-p, irccontrols, erc-controls-highlight,
 +	erc-controls-propertize): New.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit.
 +	 Moved some functions from erc.el to erc-goodies.el, and
 +	transformed them to erc modules in the process.
 +	- imenu autoload stuff moved. I don't know why it is here at all.
 +	- Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
 +	smiley,   unmorse, erc-occur (the last isn't a module, but still
 +	moved)
 +	(erc-input-line-position, erc-add-scroll-to-bottom,
 +	erc-scroll-to-bottom, erc-make-read-only, erc-noncommands-list,
 +	erc-send-distinguish-noncommands, erc-smiley, erc-unmorse,
 +	erc-occur): Moved from erc.el to erc-goodies.el.
 +	(smiley): Module moved from erc.el to erc-goodies.el.
 +	(scrolltobottom, readonly, noncommands, unmorse): New modules.
 +
 +2004-12-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-away-status): Use `a', not `away' - that's
 +	why it's there.
 +	(erc-update-mode-line-buffer): The values of `mode-line-process'
 +	and `mode-line-buffer-identification' are normally lists.
 +	Conform.
 +
 +2004-12-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-ctcp-query, erc-process-ctcp-reply): Display
 +	message in the active window, not the server window.
 +
 +2004-12-16  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Check for
 +	'erc-track-mode variable with boundp. From Adrian Aichner
 +	<adrian@xemacs.org>.
 +
 +2004-12-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-upcase-first-word): New function. The old way used
 +	in erc-send-ctcp-message would eat consecutive whitespace etc.
 +	(erc-send-ctcp-message, erc-send-ctcp-notice): Use it.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Fix braino with my previous
 +	patch. It always helps to C-x C-s before `cvs commit'.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Only upcase the ctcp command,
 +	and not the entire message. Revision 1.707 had broken /me.
 +	Shouting is bad! :)
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-networks-alist): Change undernet to Undernet as
 +	is used in `erc-server-alist', so that completion works when using
 +	`erc-server-select'.  This should fix Debian bug #282003 (erc:
 +	cannot connect to Undernet).
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el: (def-edebug-spec): Only run this if 'edebug is
 +	available.
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: The last change to `erc-mode-line-format' introduced a
 +	bug in Xemacs - it can't handle the #(" "...) strings at all.  The
 +	following changes fix the bug and simplify the mode-line handling
 +	considerably.  (erc-mode-line-format): Now defined as a string
 +	which will be formatted using `format-spec' and take the place of
 +	`mode-line-buffer-identification' in the mode line.
 +	(erc-header-line-format): Now defined as a string to be formatted
 +	using `format-spec'.
 +	(erc-prepare-mode-line-format): Removed.
 +	(erc-format-target, erc-format-target-and/or-server,
 +	erc-format-away-status, erc-format-channel-modes): New functions.
 +	Basically the old `erc-prepare-mode-line-format' split apart.
 +	(erc-update-mode-line-buffer): Set
 +	`mode-line-buffer-identification' to the formatted
 +	`erc-mode-line-format', set `mode-line-process' to ": CLOSED" if
 +	the connection has been terminated, and set `header-line-format'
 +	(if it is bound) to the formatted `erc-header-line-format', then
 +	do a `force-mode-line-update'.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Disable modules removed with `customize'.
 +	(erc-update-modules): Try to give a more descriptive error
 +	message.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-complete.el, erc.el, erc-list.el, erc-nets.el,
 +	erc-nicklist.el, erc-pcomplete.el, erc-replace.el, erc-speak.el,
 +	erc-truncate.el: (erc-buffers, erc-coding-systems, erc-display,
 +	erc-mode-line-and-header, erc-ignore, erc-query,
 +	erc-quit-and-part, erc-paranoia, erc-scripts, erc-old-complete,
 +	erc-list, erc-networks, erc-nicklist, erc-pcomplete, erc-replace,
 +	erc-truncate): New customization groups.  (erc-join-buffer,
 +	erc-frame-alist, erc-frame-dedicated-flag, erc-reuse-buffers): Use
 +	'erc-buffers as `:group'.  (erc-default-coding-system,
 +	erc-encoding-coding-alist): Use 'erc-coding-systems as `:group'.
 +	(erc-hide-prompt, erc-show-my-nick, erc-prompt,
 +	erc-input-line-position, erc-command-indicator, erc-notice-prefix,
 +	erc-notice-highlight-type, erc-interpret-controls-p,
 +	erc-interpret-mirc-color, erc-minibuffer-notice,
 +	erc-format-nick-function): Use 'erc-display as `:group'.
 +	(erc-mode-line-format, erc-header-line-format,
 +	erc-header-line-uses-help-echo-p, erc-common-server-suffixes,
 +	erc-mode-line-away-status-format): Use 'erc-mode-line-and-header
 +	as `:group'.
 +	(erc-hide-list, erc-ignore-list, erc-ignore-reply-list,
 +	erc-minibuffer-ignored): Use 'erc-ignore as `:group'.
 +	(erc-auto-query, erc-query-on-unjoined-chan-privmsg,
 +	erc-format-query-as-channel-p): Use 'erc-query as `:group'.
 +	(erc-kill-buffer-on-part, erc-kill-queries-on-quit,
 +	erc-kill-server-buffer-on-quit, erc-quit-reason-various-alist,
 +	erc-part-reason-various-alist, erc-quit-reason, erc-part-reason):
 +	Use 'erc-quit-and-part as `:group'.
 +	(erc-verbose-server-ping, erc-paranoid, erc-disable-ctcp-replies,
 +	erc-anonymous-login, erc-show-channel-key-p): Use 'erc-paranoia as
 +	`:group'.
 +	(erc-startup-file-list, erc-script-path, erc-script-echo): Use
 +	'erc-scripts as `:group'.
 +	(erc-nick-completion, erc-nick-completion-ignore-case,
 +	erc-nick-completion-postfix): Use 'erc-old-complete as `:group'.
 +	(erc-chanlist-progress-message, erc-no-list-networks,
 +	erc-chanlist-frame-parameters, erc-chanlist-hide-modeline,
 +	erc-chanlist-mode-hook): Use 'erc-list as `:group'.
 +	(erc-server-alist, erc-networks-alist): Use 'erc-networks as
 +	`:group'.
 +	(erc-settings): Use `defvar' instead of `defcustom' since this is
 +	only a draft which doesn't work.
 +	(erc-nicklist-window-size): Use 'erc-nicklist as `:group'.
 +	(erc-pcomplete-nick-postfix,
 +	erc-pcomplete-order-nickname-completions): Use 'erc-pcomplete as
 +	`:group'.
 +	(erc-replace-alist): Use 'erc-replace as `:group'.
 +	(erc-speak-filter-timestamp): Use 'erc-speak as `:group'.
 +	(erc-max-buffer-size): Use 'erc-truncate as `:group'.
 +
 +2004-12-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Go to the end of the buffer
 +	before recentering. This allows editing multiple lines more
 +	conveniently in CVS Emacs. This also undos a change by antifuchs
 +	who said this goto-char would mess up redisplay. Extensive testing
 +	couldn't reproduce that problem.
 +
 +2004-12-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-send-ctcp-message): upcase the ctcp message (so that
 +	version becomes VERSION, for example).
 +	(erc-iswitchb): Make the argument optional in non-interactive
 +	invocation, so erc-iswitchb can be substituted directly for
 +	iswitchb in code.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Allow for the
 +	fact that `erc-track-mode' isn't bound when file is loaded.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): New customizable
 +	variable.  (erc-track-remove-from-mode-line): New function.
 +	Remove `erc-modified-channels-string' from the mode-line.
 +	(erc-track-add-to-mode-line): New function.  Add
 +	`erc-modified-channels-string' to the mode-line using the value of
 +	`erc-track-position-in-mode-line' to determine whether to add it
 +	to the beginning or the end of `mode-line-modes' (only available
 +	with GNU Emacs versions above 21.3) or to the end of
 +	`global-mode-string'.
 +	(erc-track-mode, erc-track-when-inactive-mode): Use the new
 +	functions.
 +
 +2004-12-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use (buffer-name) and not
 +	(erc-default-target) for the buffer name - buffer names are case
 +	sensitive.
 +
 +2004-12-11  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-message-type): Added the message "MODE" to the known
 +	erc-message-type widget, so that (for example) people can tell
 +	erc-track-exclude-types to ignore mode changes. The others tag
 +	also needed to be made an inline list, so that it's merged with
 +	the given constants, instead of being inserted as a list.
 +
 +2004-12-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el, erc.el: Update to get ERC look nicely in CVS Emacs.
 +
 +	* erc.el (erc-mode-line-format): When on CVS emacs, use the new
 +	format.
 +
 +	* erc-track.el (track module): When on CVS emacs, modify
 +	mode-line-modes instead of global-mode-string. The latter is way
 +	to far too the right.
 +
 +2004-11-18  Mario Lang <mlang@delysid.org>
 +
 +	* Makefile, debian/changelog: debian release 20041118-1
 +
 +2004-11-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-buttonize-nicks): Set default value to
 +	`t'.  Updated documentation and customization `:type' to reflect
 +	usage.
 +
 +2004-10-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* AUTHORS: Added self.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Added local variables for this file.
 +	(erc-list-version): New.
 +	(erc-cmd-LIST): Take &rest rather than &optional arguments, as was
 +	done in revision 1.21.  Allow for input when called interactively.
 +	(erc-prettify-channel-list, erc-chanlist-toggle-sort-state): Use
 +	`unless' instead of when not.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): Fixed so
 +	that the contents are only shown once. (MOTD): Display lines in
 +	the server buffer if it's the first MOTD sent upon connection.
 +	This is to avoid the problem of having the MOTD of one server
 +	showing up in another server's buffer if it took a while to get
 +	connected.
 +	(004): Fixed to show the user modes and channel modes correctly.
 +	(303): Now displays the nicknames returned by ISON instead of the
 +	user's nickname.
 +	(367, 368): Moved up into 300's section of the code.  Added
 +	documentation.  Use `multiple-value-bind' to set variables in 367.
 +	(391): Fixed so that the server name is shown correctly.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Use CPROC instead of
 +	`erc-process' in debug message.  Should fix a bug where an error
 +	saying "Buffer *scratch* has no process" would occur when
 +	disconnected.
 +	(erc-cmd-SV): Check for X toolkit after checking for more specific
 +	features.  (erc--kill-server): Set `quitting' to non-nil so that
 +	we don't automatically reconnect.
 +
 +2004-10-05  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-ignored-user-p): Don't require regexes to match the
 +	beginning.
 +
 +2004-09-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: group erc: Moved to 'applications (patch by bojohan)
 +
 +2004-09-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: (erc-button-remove-old-buttons): Remove 'keymap
 +	not 'local-map.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Typo fix of the last
 +	commit.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Run `erc-join-hook'
 +	without arguments as specified in the docstring.
 +
 +2004-08-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-current-line): Removed unused variable SENTP.
 +
 +2004-08-19  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: ERC-SEND-COMPLETED-HOOK used to be run when the prompt
 +	was already displayed. We restore this behavior (thanks to bojohan
 +	and TerryP for noticing). We also fix the docstring of
 +	ERC-SEND-COMPLETED-HOOK, since the hook is (and used to be) called
 +	even if nothing was sent to the server.
 +	(erc-send-completed-hook): Fixed docstring.
 +	(erc-send-current-line): Add incantation for
 +	erc-send-completed-hook.
 +	(erc-send-input): Remove incantation for erc-send-completed-hook.
 +
 +2004-08-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: response-handler 368: Use s368, not s367.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Don't scroll when we're not
 +	connected anymore.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: Handle /mode #emacs b output without
 +	errors and such. First, handle unknown format specs gracefully
 +	(that is, give a useful error). Then, provide handlers for the
 +	banlist replies.
 +
 +	* erc-backend.el: New handler for 367 and 368. Removed from default
 +	handler.
 +
 +	* erc.el: Provide english catalog for s367 and s368.
 +	(erc-format-message): Give an error message when we don't find an
 +	entry.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: erc-fill-variable could be confused about really
 +	long nicks. We put an upper limit on the length of the fill prefix.
 +	(erc-fill-variable): Adjust fill-prefix.
 +	erc-fill-variable-maximum-indentation: New variable.
 +
 +2004-08-17  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-send-input): Fixed a bug where this function
 +	referenced variable "input" instead of variable "str".
 +
 +2004-08-16  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-highlight-line): Fixed a bug where
 +	this function failed to set the correct face for highlighting the
 +	current line.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el (erc-fill-variable): Don't fuck up when the
 +	looking-at didn't work.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-single-line): Call the hooks to change the
 +	appearance for something only if we actually inserted something,
 +	doh.
 +	(erc-display-command): Display the prompt outside of the area that
 +	set the text properties on.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: Refactored erc-send-current-line. This should fix some
 +	dormant bugs, and make the whole thing actually readable. Yay.
 +	Some changes in behavior were made. Whitespace at the end of lines
 +	sent is not removed anymore, but that shouldn't bother anyone.
 +	Additionally, errors in commands or hooks shouldn't prevent the
 +	prompt from showing up again now.
 +	(erc-parse-current-line): Removed.
 +	(erc-send-current-line): Refactored.
 +	(erc-send-input): New function.
 +	(erc-send-single-line): New function.
 +	(erc-display-command): New function.
 +	(erc-display-msg): New function.
 +	(erc-user-input): New function.
 +
 +2004-08-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SERVER): Use newer keyword call interface to
 +	erc-select, and handle the error if it can't resolve the host.
 +
 +2004-08-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: erc-backend.el (404 response handler):
 +	New function. We now support "cannot send to channel".
 +
 +	* erc.el (erc-define-catalog call): Added s404. erc.el
 +	(erc-ctcp-ECHO-reply, erc-ctcp-CLIENTINFO-reply,
 +	erc-ctcp-FINGER-reply, erc-ctcp-PING-reply, erc-ctcp-TIME-reply,
 +	erc-ctcp-VERSION-reply): Display reply in the active window, not
 +	the server window.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Actually make it left
 +	to right, doh.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Evaluate left-to-right
 +	so we don't surprise a user.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Parentophobia! Another
 +	paren-fix.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: PRIVMSG NOTICE response handler: Killed one paren
 +	too much. Poor paren. Got resurrected.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el: Make server buffers showing up in the mode line
 +	optional. Thanks to Daniel Knapp on the EmacsWiki for this patch.
 +
 +	erc-track-exclude-server-buffer: New variable.
 +	(erc-track-modified-channels): Return a server buffer only if
 +	erc-track-exclude-server-buffer is nil.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-DESCRIBE): Don't parse arguments.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el: (erc-truncate-buffer-to-size): Use
 +	erc-insert-marker, not (point-max), to decide the length of the
 +	buffer. A long input line shouldn't make the buffer smaller.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-macs.el, erc-members.el: The change to hashes for channel
 +	members has been made some time ago.  Clean up the various tries to
 +	do this in the past.
 +
 +	erc-macs.el: Removed.  erc-members.el: Removed.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc-ibuffer.el, erc-members.el, erc.el: Nothing
 +	big changed here. Really. Uhm, maybe the info-buffers are gone or
 +	so.  Can't really remember. Don't worry, nothing important is
 +	missing.
 +
 +	erc-speedbar.el looks nice btw, did you know?
 +
 +	Adjusted various places in erc.el, erc-backend.el, erc-ibuffer.el
 +	and erc-members.el - too numerous to list here, sorry.
 +
 +	* erc.el: erc-use-info-buffers: Removed.  erc-info-mode-map:
 +	Removed.
 +	(erc-info-mode): Removed.
 +	(erc-find-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffers): Removed.
 +
 +	* erc-members.el: erc-update-member renamed to
 +	erc-update-channel-member for better clarity.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: This change improves the help output on a bogus command
 +	invocation. We display the command as it would be typed by the
 +	user, not as it is seen by Emacs.
 +
 +	(erc-get-arglist): Is now called erc-function-arglist, and returns
 +	now an arglist without the enclosing parens.
 +	(erc-command-name): New function.
 +	(erc-process-input-line): Pass the command name, not the function
 +	name.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-input-line): Fix bug when the command
 +	doesn't have an arglist or no documentation. Thanks bojohan again
 +	:)
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list),
 +	(erc-remove-entry-from-list): Update docstring, a TEST argument is
 +	not given.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Really fix this docstring.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Fix double evaluation in macro, and
 +	fix docstring.
 +
 +2004-08-10  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-cmd-JOIN): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-backend.el: Define an "Edebug specification" for the
 +	`define-erc-response-handler' macro. This means that one can step
 +	through response handlers defined by this macro with edebug. Maybe
 +	more macros would benefit from this?
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/CTCP): New function.
 +	Completion for the /CTCP command.  (erc-pcomplete-ctcp-commands):
 +	New variable. List of ctcp commands.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-list.el: Clean up docstrings.
 +	(erc-prettify-channel-list): Extend properties to cover the entire
 +	line, including the newline, to make it look
 +	better.
 +	(erc-chanlist-highlight-line): Ditto.
 +	(erc-chanlist-mode-hook): Make it a defcustom.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-compute-full-name): Typo fix, should be full-name,
 +	not name.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc): Setup the buffer to be shown in a window at the
 +	end of this function. This enables 'window-noselect to work
 +	properly.
 +	(erc, erc-send-current-line): Fix some
 +	goto-char/open-line/goto-char to goto-char/insert.
 +
 +2004-08-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-parse-user): Live with bogus info from bouncers.
 +
 +2004-07-31  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select): Change the docstring to reflect the new
 +	arguments; include the arguments in the docstring for non-cvs
 +	emacs. Change the parameters to call erc-compute-* instead of
 +	using the erc-* variables directly.
 +	(erc-compute-server): Made argument optional.
 +	(erc-compute-nick): ditto.
 +	(erc-compute-full-name): ditto.  (erc-compute-port): ditto.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where channel-banlist was
 +	not reset to nil before fetching an updated banlist from the
 +	server.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where the
 +	'received-from-server property on variable channel-banlist was not
 +	being reset to nil.  This fixes the symptom where one types
 +	/BANLIST and sees "No bans for channel: #whatever" when you know
 +	there are bans.
 +
 +2004-07-23  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-select-read-args): Use erc-compute-nick to
 +	calculate the default nickname
 +
 +2004-07-20  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-process-sentinel-1): New function. This is an
 +	auxiliary function refactored out of erc-process-sentinel to
 +	decide a server buffer's fate (whether it should be killed, and
 +	whether erc should attempt to auto-reconnect).  Michael Olson
 +	<mwolson@gnu.org> helped with this.
 +	(erc-kill-server-buffer-on-quit): New variable. Used in
 +	erc-process-sentinel-1 to decide whether to kill a server buffer
 +	when the user quit normally.
 +	(erc-process-sentinel): Auxiliary function erc-process-sentinel-1
 +	split out.  The function body has `with-current-buffer' wrapped
 +	around it, to ensure separation of messages if multiple
 +	connections were being made.  Use `if' instead of `cond' in places
 +	where the decision is binary.  The last (useless, since the server
 +	connection is closed) prompt in the server buffer is removed.
 +	Color "erc terminated" and "erc finished" messages with
 +	erc-error-face.  Mark the buffer unmodified so that, if not killed
 +	automatically, the user is not prompted to save it.
 +
 +2004-07-16  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select-read-args): New function. Prompts the user
 +	for arguments to pass to erc-select and erc-select-ssl.
 +	(erc-select): Use (erc-select-read-args) when called interactively
 +	to get its arguments.  When non-interactively, use keyword
 +	arguments.
 +	(erc-select-ssl): Ditto.
 +	(erc-compute-port): New function. Parallel to erc-compute-server,
 +	but comes up with a default value for an IRC server's port.
 +
 +2004-07-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Quote the current nickname.
 +
 +2004-07-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-mode): Remove explicit invocation of
 +	erc-chanlist-mode-hook, since it's automatically invoked by
 +	define-derived-mode
 +
 +2004-07-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-current-nick-p): Quote current nick for
 +	regexp parsing.
 +
 +2004-06-27  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-nickserv.el (erc-nickserv-identify-mode): Fix erroneous
 +	parentheses in call to `completing-read'.
 +
 +2004-06-23  Alex Schroeder <alex@gnu.org>
 +
 +	* Makefile (release): Depend on autoloads, and copy erc-auto.el
 +	into the tarball.
 +
 +2004-06-14  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed minor bug where each line
 +	received from a server was logged as two lines (one with text and
 +	one blank).
 +
 +2004-06-08  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-frame-parameters): Made customizable.
 +	(erc-chanlist-header-face): Changed to use defface with some
 +	reasonable defaults instead of make-face, and removed the
 +	associated -face variable.
 +	(erc-chanlist-odd-line-face): Ditto.
 +	(erc-chanlist-even-line-face): Ditto.
 +	(erc-chanlist-highlight-face): New variable. Holds a face used for
 +	highlighting the current line.
 +	(erc-cmd-LIST): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +	(erc-chanlist-post-command-hook): Change to move the highlight
 +	overlay instead of refontifying the entire buffer.
 +	(erc-chanlist-dehighlight-line): Added to detach the highlight
 +	overlay from the buffer.
 +
 +2004-05-31  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-mode-line-format: Add column numbers.
 +
 +2004-05-31  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-autojoin.el: Typo fix.
 +
 +	* erc-dcc.el (erc-dcc-do-GET-command): Use expand-file-name.
 +	(erc-dcc-get-file): XEmacs set-buffer-multibyte compatibility.
 +
 +	* erc-log.el: Append `erc-log-setup-logging' to
 +	`erc-connect-pre-hook' so that `erc-initialize-log-marker' is run
 +	first (markers are needed by `erc-log-setup-logging').
 +	(erc-enable-logging): Docstring fix.
 +	(erc-log-setup-logging): Move `erc-log-insert-log-on-open' to (1-
 +	(point-max)) when doing `erc-log-insert-log-on-open'.  Modified
 +	version of a patch by Lawrence Mitchell.
 +	(erc-log-all-but-server-buffers): Do `save-excursion' as well.
 +	(erc-current-logfile): Pass buffer name as target
 +	argument to `erc-generate-log-file-name-function' if
 +	`erc-default-target' is nil.
 +	(erc-generate-log-file-name-with-date): Use expand-file-name.
 +	(erc-generate-log-file-name-short): Ditto.
 +	(erc-save-buffer-in-logs): Do `save-excursion' and test whether
 +	erc-last-saved-position is a marker.
 +
 +	* erc-members.el: Avoid miscompiling macro `erc-log' and
 +	`with-erc-channel-buffer' by requiring 'erc at compile time.
 +
 +	* erc-sound.el: Use expand-file-name.
 +
 +	* erc.el (erc-debug-log-file): Ditto.
 +	(erc-find-file): Ditto.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-BANLIST): Added a missing "'"
 +	that was preventing /BANLIST from working.  In erc-backend.el,
 +	added server repsonse handler for 367 and 368 reponses to get
 +	/BANLIST working.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Removed an eval-when-compile that was preventing the
 +	byte-compiled version of this file from loading.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Undid part of my last change.  I suspect it was wrong.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Silenced several byte-compiler warnings.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed problem where this function
 +	misformatted IRC protocol text if multiple lines were received from
 +	the server at one time.
 +
 +2004-05-25  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Cosmetic changes to the
 +	informational text in the *erc-protocol* buffer.
 +
 +2004-05-24  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol, erc-process-filter): Now the lines
 +	inserted in the *erc-protocol* buffer are prefixed with the name
 +	of the network to/from which the data is going/coming.  This makes
 +	reading the *erc-protocol* buffer much easier when connected to
 +	multiple networks.
 +
 +2004-05-23  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-backend.el: Fixes server message parsing so that command
 +	arguments specified after the colon are not treated specially. All
 +	arguments are added to the `command-args' field, and the
 +	`contents' points to the last element in the `command-args' list.
 +	This allows ERC to connect to networks such as Undernet.  Although
 +	keeping `contents' allows many of the response handlers to
 +	continue to work as-is, many other are probably broken by this
 +	patch.
 +
 +2004-05-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Add comment that C-c C-a can be useful if you write
 +	ChangeLog entries using Emacs' standard functions.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Ignore errors when attempting to require dframe
 +	(there are a couple implementations of speedbar, one of which uses
 +	of dframe).
 +	(erc-speedbar-version): New.
 +	(erc-speedbar-goto-buffer): Use dframe functions if dframe is
 +	available.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autojoin.el: Added local variables for this file.
 +	(erc-autojoin-add): The channel name is in `erc-response.contents'.
 +
 +2004-05-17  Mario Lang <mlang@delysid.org>
 +
 +	* erc-log.el: Dont autoload a define-key statement, erc-mode-map
 +	might not be known yet
 +
 +2004-05-16  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-parse-server-response): Revert to original
 +	`erc-parse-line-from-server' version, since new version breaks for
 +	a number of edge cases.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): New
 +	function.  Added to `erc-default-server-functions'.  Display
 +	unknown responses to the user.
 +	(221): Don't show nickname in modes list.
 +	(254): Fixed to use 's254.
 +	(303): Added docstring.
 +	(315, 318, 323, 369): Ignored responses grouped together.
 +	(391): New.
 +	(406, 432): Use ?n, not ?c in `erc-display-message'.
 +	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
 +	502): All error responsess with no arguments grouped together.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-message-type-member): Use `erc-response.command'.
 +	`erc-track-exclude-types' should be respected again.
 +	(erc-cmd-TIME): Fixed to work with and without server given as
 +	argument.
 +	(erc-define-catalog): Added, s391, s431, s445, s446, s451, s462,
 +	s463, s464, s465, s483, s484, s485, s491, s501, s502.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Typo fix.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* Makefile (erc-auto.el): Pass -f flag to rm so that we don't fail
 +	if erc-auto.elc doesn't exist.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-with-buffer): Autoload.
 +	(erc-parse-server-response): XEmacs' `replace-match' only replaces
 +	subexpressions when operating on buffers, not strings, work around
 +	it.
 +	(461): Command with invalid arguments is `second', not `third'.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-notify.el (erc-notify-NICK): Use `erc-response.contents' to
 +	get nickname.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-track.el: Indentation fixes.
 +	(track-when-inactive): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-notify.el (notify): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-notify-timer, erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (services, erc-nickserv-identify-mode): Use
 +	`erc-server-FOO-functions', not `erc-server-FOO-hook.
 +	(erc-nickserv-identify-autodetect): Use new accessors for PARSED
 +	argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-netsplit.el (netsplit): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-netsplit-JOIN, erc-netsplit-MODE, erc-netsplit-QUIT): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-menu.el (erc-menu-definition): Only allow listing of
 +	channels if `erc-cmd-LIST' is fboundp.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-match.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-get-parsed-vector-nick, erc-get-parsed-vector-type): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-chanlist, erc-chanlist-322): Use new accessors
 +	for PARSED argument.  Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-ezbounce.el (erc-ezb-notice-autodetect): Use new accessors
 +	for PARSED argument.
 +	(erc-ezb-initialize): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-dcc-no-such-nick): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-bbdb.el (erc-bbdb-whois, erc-bbdb-JOIN, erc-bbdb-NICK): Use
 +	new accessors for PARSED argument.
 +	(BBDB): Use `erc-server-FOO-functions', not `erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autojoin.el (autojoin): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-autojoin-add, erc-autojoin-remove): Use new accessors for
 +	PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autoaway.el (autoaway): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-backend): Require.
 +	(erc-disconnected-hook, erc-join-hook, erc-quit-hook)
 +	(erc-part-hook, erc-kick-hook): Docstring fix, we now use
 +	`erc-server-FOO-functions', rather than `erc-server-FOO-hook'.
 +	(erc-event-to-hook-name, erc-event-to-hook): Remove.
 +	(erc-once-with-server-event)
 +	(erc-once-with-server-event-global): Use `erc-get-hook'
 +	(erc-process-filter): Use `erc-parse-server-response'.
 +	(erc-cmd-IDLE, erc-cmd-BANLIST, erc-cmd-MASSUNBAN): New accessors
 +	for PARSED argument.  Rename all `erc-server-FOO-hook' to
 +	`erc-server-FOO-functions'.
 +	(erc-server-364-hook, erc-server-365-hook, erc-server-367-hook)
 +	(erc-server-368-hook, erc-server-KILL-hook)
 +	(erc-server-PONG-hook, erc-server-200-hook, erc-server-201-hook)
 +	(erc-server-202-hook, erc-server-203-hook, erc-server-204-hook)
 +	(erc-server-205-hook, erc-server-206-hook, erc-server-208-hook)
 +	(erc-server-209-hook, erc-server-211-hook, erc-server-212-hook)
 +	(erc-server-213-hook, erc-server-214-hook, erc-server-215-hook)
 +	(erc-server-216-hook, erc-server-217-hook, erc-server-218-hook)
 +	(erc-server-219-hook, erc-server-241-hook, erc-server-242-hook)
 +	(erc-server-243-hook, erc-server-244-hook, erc-server-249-hook)
 +	(erc-server-261-hook, erc-server-262-hook, erc-server-302-hook)
 +	(erc-server-323-hook, erc-server-342-hook, erc-server-351-hook)
 +	(erc-server-381-hook, erc-server-382-hook, erc-server-391-hook)
 +	(erc-server-392-hook, erc-server-393-hook, erc-server-394-hook)
 +	(erc-server-395-hook, erc-server-402-hook, erc-server-404-hook)
 +	(erc-server-407-hook, erc-server-409-hook, erc-server-411-hook)
 +	(erc-server-413-hook, erc-server-414-hook, erc-server-415-hook)
 +	(erc-server-422-hook, erc-server-423-hook, erc-server-424-hook)
 +	(erc-server-431-hook, erc-server-436-hook, erc-server-437-hook)
 +	(erc-server-441-hook, erc-server-443-hook, erc-server-444-hook)
 +	(erc-server-445-hook, erc-server-446-hook, erc-server-451-hook)
 +	(erc-server-462-hook, erc-server-463-hook, erc-server-464-hook)
 +	(erc-server-465-hook, erc-server-467-hook, erc-server-471-hook)
 +	(erc-server-472-hook, erc-server-473-hook, erc-server-483-hook)
 +	(erc-server-491-hook, erc-server-502-hook): Remove.
 +	(erc-call-hooks, erc-parse-line-from-server): Remove
 +	(erc-server-hook-list): Remove.  Remove top-level call too.
 +	(erc-server-ERROR, erc-server-INVITE, erc-server-JOIN)
 +	(erc-server-KICK, erc-server-MODE, erc-server-NICK)
 +	(erc-server-PART, erc-server-PING, erc-server-PONG)
 +	(erc-server-PRIVMSG-or-NOTICE, erc-server-QUIT)
 +	(erc-server-TOPIC, erc-server-WALLOPS, erc-server-001)
 +	(erc-server-004, erc-server-005, erc-server-221, erc-server-252)
 +	(erc-server-253, erc-server-254, erc-server-301, erc-server-303)
 +	(erc-server-305, erc-server-306, erc-server-311-or-314)
 +	(erc-server-312, erc-server-313, erc-server-317, erc-server-319)
 +	(erc-server-320, erc-server-321, erc-server-322, erc-server-324)
 +	(erc-server-329, erc-server-330, erc-server-331, erc-server-332)
 +	(erc-server-333, erc-server-341, erc-server-352, erc-server-353)
 +	(erc-server-366, erc-server-MOTD, erc-server-379)
 +	(erc-server-401, erc-server-403, erc-server-405, erc-server-406)
 +	(erc-server-412, erc-server-421, erc-server-432, erc-server-433)
 +	(erc-server-437, erc-server-442, erc-server-461, erc-server-474)
 +	(erc-server-475, erc-server-477, erc-server-481, erc-server-482)
 +	(erc-server-501): Move to erc-backend.el
 +	(erc-auto-query, erc-banlist-store, erc-banlist-finished)
 +	(erc-banlist-update, erc-connection-established)
 +	(erc-process-ctcp-query, erc-display-server-message): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el: (erc-parse-server-response)
 +	(erc-handle-parsed-server-response, erc-get-hook)
 +	(define-erc-response-handler): New functions.
 +	(erc-response): New struct for server responses.
 +	(erc-server-responses): New variable.
 +	(erc-call-hooks): Move from erc.el and rework.
 +	(ERROR, INVITE, JOIN, KICK, MODE, NICK, PART, PING, PONG)
 +	(PRIVMSG, NOTICE, QUIT, TOPIC, WALLOPS, 001, MOTD, 376, 004)
 +	(252, 253, 254, 250, 301, 303, 305, 306, 311, 312, 313, 315)
 +	(317, 318, 319, 320, 321, 322, 324, 329, 330, 331, 332, 333)
 +	(341, 352, 353, 366, 369, 379, 401, 403, 405, 406, 412, 421)
 +	(432, 433, 437, 442, 461, 474, 477, 481, 482, 501, 323, 221)
 +	(002, 003, 371, 372, 374, 375, 422, 251, 255, 256, 257, 258)
 +	(259, 265, 266, 377, 378, 314, 475, 364, 365, 367, 368, 381)
 +	(382, 391, 392, 393, 394, 395, 200, 201, 202, 203, 204, 205)
 +	(206, 208, 209, 211, 212, 213, 214, 215, 216, 217, 218, 219)
 +	(241, 242, 243, 244, 249, 261, 262, 302, 342, 351, 402, 404)
 +	(407, 409, 411, 413, 414, 415, 423, 424, 431, 436, 441, 443)
 +	(444, 445, 446, 451, 462, 463, 464, 465, 467, 471, 472, 473)
 +	(483, 491, 502, 005, KILL): Move from erc.el and rework using
 +	`define-erc-response-handler' and erc-response struct.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: A few bug fixes to avoid errors after disconnect,
 +	including the "Selecting deleted buffer" bug.
 +	(erc-channel-user-op-p, erc-channel-user-voice-p): Make sure NICK
 +	is non-nil (`erc-current-nick' can return nil).
 +	(erc-server-buffer): Make sure the buffer isn't a #<killed
 +	buffer>.
 +	(erc-server-buffer-live-p): New function.
 +	(erc-display-line, erc-join-channel, erc-prepare-mode-line-format,
 +	erc-away-p): Use `erc-server-buffer-live-p' to make sure process
 +	buffer exists.
 +	(erc-send-current-line): If there is no server buffer, let the
 +	user know.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-log.el: C-c C-l keybinding now defined in
 +	erc-log.el.
 +	(erc-log-version): New.
 +	(erc-cmd-JOIN): Fix applied for bug where /join -invite causes
 +	errors when there's no `invitation'.
 +
 +2004-05-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-JOIN): Make sure `chnl' is non-nil before trying
 +	to join anything (chnl is not set if /join -invite is used but
 +	there's no `invitation').
 +
 +2004-05-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Define C-c C-l keybinding outside of `erc-log-mode',
 +	making it available all the time; autoload definition.
 +	(erc-log-version): New.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, Makefile, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-chess.el, erc-dcc.el, erc-ezbounce.el,
 +	erc-fill.el, erc-ibuffer.el, erc-imenu.el, erc-lang.el,
 +	erc-list.el, erc-log.el, erc-macs.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-nets.el, erc-netsplit.el, erc-nickserv.el,
 +	erc-notify.el, erc-page.el, erc-ring.el, erc-speak.el,
 +	erc-speedbar.el, erc-stamp.el, erc-track.el, erc-truncate.el,
 +	erc-xdcc.el, erc.el: Applied all relevant bug fixes and code
 +	cleanup made between the time of the ERC_4_0_RELEASE tag until now.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-info-buffer): Correct bug in sorting
 +	of channel users.  Tiny change from Andreas Schwab
 +	<schwab@suse.de>.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-fill.el (erc-fill-variable): Fix docstring.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-button.el (erc-button-add-button): Use 'keymap
 +	text-property, rather than 'local-map, since it's cross-emacs
 +	compatible.  Pass :mouse-down-action into `widget-convert-button'
 +	as 'erc-button-click-button, to make XEmacs happy.  Replace bogus
 +	reference to erc-widget-press-button with erc-button-press-button.
 +	(erc-button-click-button): New (ignored) first argument, to make
 +	XEmacs behave when pressing buttons.
 +	(erc-button-press-button): New (ignored) &rest argument.
 +
 +2004-05-09  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-log.el (erc-conditional-save-buffer): Fix docstring
 +	reference to erc-save-queries-on-quit.
 +	(erc-conditional-save-queries): Ditto.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Updated copyright years.  Added local variables
 +	for this file; fixed indenting.
 +	(erc-speedbar): New group.
 +	(erc-speedbar-sort-users-type): New variable.
 +	(erc-speedbar-buttons): Handle query buffers (fixes a bug where an
 +	error would be thrown if the current buffer was a query).  Ignore
 +	unknown buffers.
 +	(erc-speedbar-expand-channel): Show limit and key with channel
 +	modes. Sort users according to `erc-speedbar-sort-users-type'.
 +	(erc-speedbar-insert-user): Fixed bug where only nicks with more
 +	info were being listed, and those were shown twice.
 +	(erc-speedbar-goto-buffer): Don't use dframe functions, as dframe
 +	isn't available with the default speedbar.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-sort-channel-users-alphabetically): New function.
 +	(erc-server-412, erc-server-432, erc-server-475): New functions.
 +	(erc-server-412-hook, erc-server-432-hook, erc-server-475-hook):
 +	Use them.
 +	(erc-server-401, erc-server-403, erc-server-405)
 +	(erc-server-421, erc-server-474, erc-server-481): Use catalog
 +	messages.
 +	(erc-define-catalog): Added s401, s403, s405, s412, s421, s432,
 +	s474, s475, and s481.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Added documentation to Commentary, Usage.
 +	Removed `outline-mode' from file local variables.
 +	(erc-services-mode): Use `erc-nickserv-identify-mode' to add
 +	hooks.
 +	(erc-nickserv-identify-mode): New function.
 +	(erc-nickserv-identify-mode): New variable.
 +	(erc-prompt-for-nickserv-password, erc-nickserv-passwords):
 +	Changed docstring.
 +	(erc-nickserv-identify-autodetect): Use
 +	`erc-nickserv-call-identify-function'. Docstring change.
 +	(erc-nickserv-identify-on-connect,
 +	erc-nickserv-identify-on-nick-change,
 +	erc-nickserv-call-identify-function): New functions.
 +	(erc-nickserv-identify): PASSWORD is not optional.  Autoload
 +	function.
 +
 +2004-05-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-hook, erc-quit-hook, erc-part-hook,
 +	erc-kick-hook, erc-connect-pre-hook): Now customizable.
 +	(erc-nick-changed-functions): New hook.
 +	(erc-server-NICK): Run `erc-nick-changed-functions' with the
 +	arguments NEW-NICK and OLD-NICK.
 +	(erc-channel-user-voice-p, erc-channel-user-voice-p): Shortened
 +	docstring.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: New section on function/variable naming and coding
 +	conventions.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-wash-quit-reason): Quote regexp special characters
 +	in NICK, LOGIN and HOST.
 +
 +2004-05-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-server-parameters): Typo fix in docstring.
 +	(erc-input-line-position): `:type' is now a choice between integer
 +	and nil.  (erc-mode-map): Bind `erc-get-channel-mode-from-keypress'
 +	to C-c C-o instead of C-c RET (C-c C-m).  (erc-cmd-GQUIT): Use
 +	REASON as argument when calling `erc-cmd-QUIT'.
 +
 +2004-05-03  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nicklist.el: Initial version.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Added local variables for file, fixed indenting.
 +	(erc-menu-version): New variable.
 +	(erc-menu-definition): "List channels": New.  "Join channel": Use
 +	`erc-connected' as test.  "Start a query": New.  "List channel
 +	operators": New.  "Input action": Moved up.  "Set topic": Fixed
 +	test so it's only active in channels.  "Leave this channel": Moved
 +	down.  "Track hidden channel buffers": Removed.  "Enable/Disable
 +	ERC Modules": New.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-mode-map): Removed binding for
 +	`erc-save-buffer-in-logs' (moved to erc-log.el).
 +	(erc-cmd-QUERY, erc-cmd-OPS): Now interactive.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Added local variables for this file.
 +	(erc-log-channels-directory): Added directory as a choice in
 +	`:type'.
 +	(define-erc-module): Define and undefine key binding (C-c
 +	C-l) for `erc-save-buffer-in-logs' here.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added local variables for this file.
 +	(erc-networks-alist): Fixed `:type' to work better in
 +	customization.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added local variables for file.  (erc-keywords):
 +	Use `list' instead of `cons' in `:type'.  Fixes bug where mismatch
 +	was shown in customization.  (erc-current-nick-highlight-type):
 +	Escape parentheses in docstring.  Added keyword, nick-or-keyword as
 +	options in `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Added local variables for file.
 +	(erc-away-timestamp-format): Allow nil as a choice in `:type'.
 +	(erc-timestamp-intangible): Changed `:type' to boolean.
 +	(erc-timestamp-right-column): Added `:group' and `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Added bbdb, log, match, sound, and stamp
 +	as `:type' options; changed documentation for autojoin, fill,
 +	pcomplete, track.  (erc-prompt-for-channel-key): New variable.
 +	(erc-join-channel): Only prompt for key if
 +	`erc-prompt-for-channel-key' is non-nil.  (erc-format-my-nick): New
 +	function.  (erc-send-message, erc-send-current-line): Use it.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-track.el: (erc-track-modified-channels): Fix indentation.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-hide-fools): Docstring fix.
 +	(erc-log-matches-types-alist): Added `current-nick' to valid
 +	choices.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-page.el, erc-ezbounce.el, erc-speak.el, erc-match.el,
 +	erc-track.el (erc-ezbounce, erc-page, erc-speak): Groups defined.
 +	(erc-match, erc-track): `erc' is parent group.
 +	(erc-ezb-regexp, erc-ezb-login-alist): Added `:group'.
 +
 +2004-04-20  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: Fixed erc-fill-static so it breaks the lines at the
 +	right column and respects timestamps. Patch by Simon Siegler
 +	<simon@trz-kril.de>
 +	(erc-fill-static): Major rewrite and split up into some functions.
 +	(erc-count-lines): Removed.
 +	(erc-fill-regarding-timestamp): New function.
 +	(erc-timestamp-offset): New function.
 +	(erc-restore-text-properties): New function.
 +	(erc-fill-variable): Respect leftbound timestamp.  This is still
 +	broken if someone has both erc-timestamp-only-if-changed-flag set
 +	and erc-insert-timestamp-function set to
 +	'erc-insert-timestamp-left, but otherwise it works now.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-SV): Show features gtk, mac-carbon, multi-tty.
 +	Fixed so that arguments fit the format (build date was not being
 +	shown).
 +
 +2004-04-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-channel-topic); Error if `channel-topic' is
 +	unbound.  Remove %-sign substitution.
 +	(erc-update-mode-line-buffer): Escape %-signs in `channel-topic'
 +	here.
 +
 +2004-04-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-send-action, erc-ctcp-query-ACTION,
 +	erc-ctcp-reply-ECHO-hook): Let `erc-display-message-highlight'
 +	propertize the message.
 +	(erc-display-message-highlight): Allow for any erc-TYPE-face.
 +	(erc-cmd-JOIN): Display error message instead of throwing an error
 +	if there's no `invitation'.
 +	(erc-cmd-PART): Allow for no reason if channel is provided.  Fixes
 +	bug where user would part the current channel with the other
 +	channel's name as reason when no reason was given.
 +	(erc-server-vectors, erc-debug-missing-hooks): Added docstring.
 +	(erc-server-JOIN): Moved `erc-join-hook' to JOIN-you section.
 +	`erc-join-hook' called by `run-hook-with-args', sending the ARGS
 +	`chnl' and the channel's buffer.  Changed an instance of if
 +	without else to when.
 +	(erc-server-477): New function.
 +	(erc-server-477-hook): Use `erc-server-477'.
 +	(erc-define-catalog): Added `no-invitation'.
 +
 +2004-04-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Local variables for file added.
 +	(erc-nickserv-passwords): Customization: Network symbols updated
 +	to reflect `erc-nickserv-alist'.  Allow user to type in network
 +	symbol.
 +	(erc-nickserv-alist): Now customizable variable.
 +
 +2004-04-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Make sure `line'
 +	is a string to avoid errors upon startup.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-version): New variable.
 +	(erc-auto-discard-away): Updated docstring.
 +	(erc-autoaway-no-auto-back-regexp): New variable.
 +	(erc-autoaway-reset-idletime): Use it.	Hopefully a better solution
 +	which allows for aliases to "/away" and any other text that the
 +	user wants to ignore when `erc-auto-discard-away' is non-nil.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Forgot /gaway in
 +	regexp.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): If the user sends
 +	an "/away" command, don't call `erc-autoaway-set-back', fixes bug
 +	where ERC would send "/away" when user was already away and sent an
 +	"/away reason".  Changed `l' to `line' for better understanding.
 +	(erc-autoaway-set-back): Changed `l' to `line' for better
 +	understanding.
 +
 +2004-04-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-set-channel-key): Now able to remove key.
 +	(erc-set-channel-limit): Now able to remove limit.
 +	(erc-get-channel-mode-from-keypress): Fixed docstring.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-channel): Allow for optional channel key.
 +	(erc-set-modes): Need to set `channel-key' to nil in case of mode
 +	changes during split.
 +	(erc-show-channel-key-p): New variable.
 +	(erc-prepare-mode-line-format): Only show key if
 +	`erc-show-channel-key-p' is non-nil.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 + 	* erc.el (channel-key): New variable.
 +	(erc-update-channel-key): New function.
 +	(erc-set-modes, erc-parse-modes, erc-update-modes, erc,
 +	erc-update-channel-info-buffer): Deal with channel keys.
 +	(erc-prepare-mode-line-format): Show channel key in header-line.
 +	(erc-server-NICK): Show nick change in server buffer as well.
 +	(erc, erc-send-command, erc-banlist-store, erc-banlist-update,
 +	erc-load-irc-script-lines,
 +	erc-arrange-session-in-multiple-windows, erc-handle-login,
 +	erc-find-channel-info-buffer): Changed when not to unless.
 +	(erc-server-MODE): Changed if without else to when.
 +
 +2004-03-27  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use `truncate-string-to-width'
 +	instead of `truncate-string' alias.
 +	(erc-nickname-in-use): Ditto.
 +
 +2004-03-27  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-list): Fixed error caused by erc-cmd-LIST
 +	passing a non-sequence to erc-chanlist.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Add new hook `erc-join-hook', which is run when we join a
 +	channel.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Replaced existing notice user notification system and
 +	the configuration options, which consisted of
 +	`erc-echo-notices-in-minibuffer-flag' and
 +	`erc-echo-notices-in-current-buffer' with two new hooks,
 +	`erc-echo-notice-hook' and `erc-echo-notice-always-hook'.
 +
 +	When user notification is needed, `erc-echo-notice-always-hook' is
 +	first run using `run-hook-with-args', then `erc-echo-notice-hook'
 +	is run using `run-hook-with-args-until-success'.
 +
 +	In addition to these hooks, a large number of functions, which are
 +	described in the documentation strings of those hooks, were added
 +	which can be used to achieve a large variety of different
 +	behaviors.
 +
 +	The current default behavior, which is identical to the existing
 +	default behavior, is for `erc-echo-notice-always-hook' to be set to
 +	`(erc-echo-notice-in-default-buffer).
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: (erc-modified-channels-display): Added a space
 +	before opening bracket.
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-query-as-channel-p): New variable.
 +	(erc-server-PRIVMSG-or-NOTICE): If `erc-format-query-as-channel-p'
 +	is nil, messages in the query buffer are formatted like private
 +	messages.
 +
 +	(erc-server-252-hook, erc-server-253-hook, erc-server-254-hook,
 +	erc-server-256-hook, erc-server-257-hook, erc-server-258-hook,
 +	erc-server-259-hook, erc-server-371-hook, erc-server-372-hook,
 +	erc-server-374-hook, erc-server-374-hook, erc-server-442-hook,
 +	erc-server-477-hook): Removed, now defined in
 +	`erc-server-hook-list'.
 +	(erc-display-server-message): New function.
 +	(erc-server-252, erc-server-253, erc-server-254, erc-server-442):
 +	New functions.
 +	(erc-server-hook-list): Added 250, 256, 257, 258, 259, 265, 266,
 +	377, 378, 477 - using `erc-display-server-message'.  251, 255 now
 +	use `erc-display-server-message'.  Added 252, 253, 254, 442 -
 +	using respective erc-server-* functions.  371, 372, 374, 375 now
 +	defined here.
 +	(erc-define-catalog): Added s252, s253, s254, s442.
 +	(erc-server-001, erc-server-004, erc-server-005): Fixed
 +	documentation.
 +
 +2004-03-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Commentary: Changed `erc-stamp-mode' to
 +	`erc-timestamp-mode'.
 +	(erc-insert-timestamp-left): Use `erc-timestamp-face' on filler
 +	spaces as well.
 +
 +2004-03-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-send-action): Use `erc-input-face'.
 +	(erc-display-message-highlight): If the requested highlighting
 +	type doesn't match, just display the string with no highlighting
 +	and warn about it with `erc-log'.. (erc-cmd-JOIN): If user is
 +	already on the requested channel, switch to that channel's buffer.
 +	(erc-ctcp-query-ACTION): Use `erc-action-face' for nick as well.
 +	(erc-header-line-use-help-echo-p): New variable.
 +	(erc-update-mode-line-buffer): Use `help-echo' for header-line if
 +	`erc-header-line-use-help-echo-p' is non-nil.
 +
 +2004-03-18  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-nets.el: Use two arguments version of `make-obsolete', if
 +	third argument is not supported (for XEmacs).
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* CREDITS: added CREDITS entry for Adrian Aichner
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* erc-xdcc.el, erc.el, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-dcc.el, erc-ezbounce.el, erc-imenu.el,
 +	erc-list.el, erc-log.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-netsplit.el, erc-notify.el, erc-speedbar.el,
 +	erc-stamp.el, erc-track.el, erc-truncate.el:
 +	(erc-coding-sytem-for-target): Removed.
 +	(erc-coding-system-for-target): New.
 +	(erc-autoaway-use-emacs-idle): Typo fix.
 +	(erc-auto-set-away): Ditto.
 +	(erc-auto-discard-away): Ditto.
 +	(autojoin): Ditto.
 +	(erc-button-alist): Ditto.
 +	(erc-dcc-auto-masks): Ditto.
 +	(erc-dcc-chat-send-input-line): Ditto.
 +	(erc-ezb-get-login): Ditto.
 +	(erc-unfill-notice): Ditto.
 +	(erc-save-buffer-in-logs): Ditto.
 +	(match): Ditto.
 +	(erc-log-matches-types-alist): Ditto.
 +	(erc-match-directed-at-fool-p): Ditto.
 +	(erc-match-message): Ditto.
 +	(erc-update-member): Ditto.
 +	(erc-ignored-reply-p): Ditto.
 +	(erc-menu-definition): Ditto.
 +	(erc-netsplit-QUIT): Ditto.
 +	(erc-notify-list): Ditto.
 +	(erc-speedbar-update-channel): Ditto.
 +	(erc-speedbar-item-info): Ditto.
 +	(erc-stamp): Ditto.
 +	(erc-timestamp-intangible): Ditto.
 +	(erc-add-timestamp): Ditto.
 +	(erc-timestamp-only-if-changed-flag): Ditto.
 +	(erc-show-timestamps): Ditto.
 +	(erc-track-priority-faces-only): Ditto.
 +	(erc-modified-channels-alist): Ditto.
 +	(erc-unique-substrings): Ditto.
 +	(erc-find-parsed-property): Ditto.
 +	(erc-track-switch-direction): Ditto.
 +	(erc-truncate-buffer-to-size): Ditto.
 +	(erc-xdcc): Ditto.
 +	(erc-auto-reconnect): Ditto.
 +	(erc-startup-file-list): Ditto.
 +	(erc-once-with-server-event): Ditto.
 +	(erc-once-with-server-event-global): Ditto.
 +	(erc-mode): Ditto.
 +	(erc-generate-new-buffer-name): Ditto.
 +	(erc): Ditto.
 +	(erc-open-ssl-stream): Ditto.
 +	(erc-default-coding-system): Ditto.
 +	(erc-encode-string-for-target): Ditto.
 +	(erc-decode-string-from-target): Ditto.
 +	(erc-scroll-to-bottom): Ditto.
 +	(erc-decode-controls): Ditto.
 +	(erc-channel-members-changed-hook): Ditto.
 +	(erc-put-text-property): Ditto.
 +	(erc-add-default-channel): Ditto.
 +
 +2004-03-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Cancel ping timer upon
 +	disconnect.
 +	(erc-cmd-PART): Use same regexp as `erc-cmd-QUIT' when no #channel
 +	is provided.
 +	(erc-nick-uniquifier, erc-manual-set-nick-on-bad-nick-p): `:group'
 +	was missing, added.
 +	(erc-part-reason-zippy, erc-part-reason-zippy): Removed FIXME
 +	comments.  I see no problem allowing typed in reasons.
 +
 +2004-03-16  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: (erc-insert-timestamp-left): Added support for
 +	`erc-timestamp-only-if-changed-flag' and added docstring.
 +	(erc-timestamp-only-if-changed-flag): Updated documentation.
 +
 +2004-03-13  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-network-name): No longer marked as obsolete.
 +	Why was this function made obsolete?  There is no other function
 +	that performs this task.  Some of us use these functions in our
 +	personal ERC configs.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-buffer-filter): Use `with-current-buffer'.
 +	(erc-process-input-line): Append newline to documentation.  Fixes a
 +	bug whereby the prompt would be put on the same line as the output.
 +	(erc-cmd-GQUIT): Only try and send QUIT if the process is alive.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-log.el: Only add top-level hooks if `erc-enable-logging' is
 +	non-nil.
 +
 +2004-03-10  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nets.el: From Adrian Aichner (adrian /at/ xemacs /dot/ org)
 +	* erc-nets.el: XEmacs make-obsolete only takes two arguments.
 +
 +2004-03-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-determine-network): Use `erc-session-server' if
 +	`erc-announced-server' is nil to avoid error if server does not
 +	send 004 (RPL_MYINFO) message.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-server-alistm erc-settings): Use lowercase
 +	"freenode", as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Use lowercase "freenode",
 +	as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el (pcomplete/erc-mode/DCC): Append "send" as a list.
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-networks-alist): Changed "Freenode" to
 +	"freenode".
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Improved the docstring.	Made
 +	message to user more accurate	depending on whether a single
 +	channel is being listed or not.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-determine-network): Make matching logic simpler
 +	(suggested by Damian Elmes).
 +	(erc-current-network, erc-network-name): Add `make-obsolete' form.
 +	(erc-set-network-name): Indentation fix.
 +	(erc-ports-list): Add docstring.  Rework function body to use
 +	`nconc'.
 +
 +2004-03-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el, erc-notify.el: (require 'erc-nets): added
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-network-name): Function definition moved to
 +	erc-nets.el.  The functions `erc-determine-network' and
 +	`erc-network' in erc-nets.el do what this did before.  Deprecated.
 +	Use (erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Changed copyright notice.  Now require
 +	erc-nets.  erc-nets.el now takes care of network-related functions
 +	and variables.
 +	(erc-nickserv-alist): Changed network symbols to match those in
 +	`erc-networks-alist' in erc-nets.el.
 +	(erc-nickserv-identify-autodetect): Use `erc-network'.
 +	(erc-nickserv-identify): Use `erc-network'.  Changed wording for
 +	interactive use, now shows current nick.
 +	(erc-networks): Removed.  Use `erc-networks-alist' as defined in
 +	erc-nets.el.
 +	(erc-current-network): Function definition moved to erc-nets.el.
 +	The functions `erc-determine-network' and `erc-network' in
 +	erc-nets.el do what this did before.  Deprecated.  Use
 +	(erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added commentary, `erc-nets-version'.
 +	(erc-server-alist): Changed Brasnet to BRASnet.
 +	(erc-networks-alist): All networks (except EFnet and IRCnet) now
 +	have a MATCHER.  (erc-network): New variable.
 +	(erc-determine-network): New function. Determine the network the
 +	user is on.  Use the server parameter NETWORK, if provided, else
 +	parse the server name and search for a match (regexp and loop by
 +	wencem) in `erc-networks-alist'.  Return the name of the network
 +	or "Unknown" as a symbol.
 +	(erc-network): New function.  Returns value of `erc-network'.  Use
 +	this when the current buffer is not the server process buffer.
 +	(erc-current-network): Returns the value of `erc-network' as
 +	expected by users who used the function as it was defined in
 +	erc-nickserv.el.  Deprecated.
 +	(erc-network-name): Returns the value of `erc-network' as expected
 +	by users who used the function as it was defined in erc.el.
 +	Deprecated.
 +	(erc-set-network-name): New function.  Added to
 +	`erc-server-375-hook' and `erc-server-422-hook'.
 +	(erc-unset-network-name): New function.  Added to
 +	`erc-disconnected-hook'.
 +	(erc-server-select): Small documentation word change.
 +
 +2004-03-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS: disumu info updated
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-cmd-LIST): Take &rest rather than &optional
 +	arguments.
 +	(erc-chanlist): Construct correct LIST command from list of
 +	channels.
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line-buffer): Add 'help-echo property to
 +	header-line text.  This allows header lines longer than the width
 +	of the current window to be seen.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-directed-at-fool-p): Also check for
 +	"FOOL, "
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Only use nick-or-keyword if
 +	we're matching our nick.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: The highlight type for the current nickname can
 +	now also be 'nick-or-keyword, to highlight the nick of the sender
 +	if that is available, but fall back to highlighting your nickname
 +	in the whole message otherwise.
 +	(erc-current-nick-highlight-type): Adapted docstring accordingly.
 +	(erc-match-message): Added new condition. Also added some comments
 +	to this monster of a function.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-is-valid-nick-p): Don't check for length less or
 +	equal to 9.
 +
 +2004-03-06  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nickserv.el (erc-current-network): the last change resulted
 +	in this function failing when a network identifies itself as
 +	anything other than var.netname.com, so for instance
 +	'vic.au.austnet.org' fails. This version is only a marginal
 +	improvement over the original, but if we want to be more flexible
 +	we'll probably have to do the iteration ourselves instead of using
 +	assoc.
 +
 +2004-03-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: Added erc-server-001 which runs when the server sends
 +	its welcome message.  It sets the current-nick to reflect the
 +	server's settings. This fixes a bug where nicks that were too long
 +	and got truncated by ther server were still set to the old value.
 +	(nickname-in-use): If user wants to try again manually, let user
 +	know that the nick is taken.  If not, go through erc-default-nicks
 +	until none are left, and then try one last time with
 +	erc-nick-uniquifier.  If it's still a bad-nick, make the user
 +	change nick manually.  When applying uniquifier, use NICKLEN if
 +	it's in the server parameters, otherwise use what RFC 2812 says is
 +	the max nick length (9 chars).  Added custom variable
 +	erc-manual-set-nick-on-bad-nick-p, which is set to nil and
 +	erc-nick-change-attempt-count.  Reset erc-default-nicks and
 +	erc-nick-change-attempt-count when the nick has been changed
 +	successfully.  This fixes the bug where ERC would get caught in a
 +	neverending loop of trying to set the same nick if the nick was
 +	too long and the uniquified nick was not available.
 +
 +	* added erc-cmd-WHOAMI
 +
 +	* added custom variable erc-mode-line-away-status-format, use this
 +	instead of   the previous hard-coded setting
 +
 +	* erc-server-315|318|369-hook defvar lines removed - they're
 +	already defined in erc-server-hook-list
 +
 +2004-03-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Initial commit.  Some thoughts on coding standards.
 +
 +2004-03-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: added the variable erc-track-priority-faces-only
 +	which adds the option to ignore changes in a channel unless there
 +	are faces from the erc-track-faces-priority-list in the message
 +	options are nil, 'all, or a list of channel name strings
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el: Changed erc-is-channel-op
 +	and erc-is-channel-voice to erc-channel-user-op-p and
 +	erc-channel-user-voice-p to better match erc-channel-user
 +	structure (and emacs lisp usage)
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el:
 +	erc-track-modified-channels-mode is now erc-track-mode
 +
 +2004-02-29  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added 'keyword option to
 +	erc-current-nick-highlight-type highlights all instances of
 +	current-nick in the message ('nickname option in cvs revisions 1.9
 +	- 1.11 had same effect)
 +
 +2004-02-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: Add Lisp: prefix for the EmacsWiki Elisp area.
 +	(erc-button-alist): Added Lisp: prefix.
 +	(erc-emacswiki-lisp-url): New variable.
 +	(erc-browse-emacswiki-lisp): New function.
 +
 +2004-02-27  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-get-arglist): Use `substitute-command-keys', rather
 +	than hard-coding C-h f for `describe-function'.
 +
 +2004-02-26  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): bind `inhibit-read-only'
 +	to t around call to `erase-buffer'.
 +
 +2004-02-23  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-chess.el, erc-dcc.el, erc-ezbounce.el, erc-list.el,
 +	erc-macs.el, erc-ring.el, erc-stamp.el, erc.el: Normalized buffer
 +	local variable creation.
 +
 +2004-02-17  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-scroll-to-bottom, erc-add-scroll-to-bottom): Mention
 +	`erc-input-line-position' in docstring.
 +
 +2004-02-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-kick-hook): Typo fix.
 +
 +2004-02-13  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Added `erc-kick-hook', which is called when the local
 +	user is kicked from a channel.  Fixed a bug in `erc-cmd-OPS', such
 +	that the command now works.  Added `erc-remove-channel-users', in
 +	order to fix a number of significant bugs relating to channel
 +	parting.
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove last change. This caused a
 +	lot of trouble :(
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Also set 'field property, so C-j
 +	works on an empty prompt.
 +
 +2004-02-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-topic): Ensure that `channel-topic'
 +	does not contain any bare format controls.
 +
 +2004-02-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el (erc-timestamp-intangible): New variable (user
 +	feature request)
 +	(erc-format-timestamp): Use erc-timestamp-intangible.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-button.el: Fixed bug related to nickname buttonizing and text
 +	fields due to erc-stamp.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* CREDITS: Added mention of my change of ERC to use hash tables.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* AUTHORS: Added myself to the list.
 +
 +2004-02-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Jeremy Maitin-Shepard <jbms@attbi.com>:
 +	(erc-remove-channel-user): Use `delq' not `delete'.
 +	(erc-get-buffer): Pass PROC through to `erc-buffer-filter'.
 +	(erc-process-sentinel): Use `erc' rather than `erc-reconnect' for
 +	auto-reconnection.
 +
 +2004-02-02  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-buffer-list-with-nick): Apply `erc-downcase' NICK.
 +
 +2004-01-30  Alex Schroeder <alex@gnu.org>
 +
 +	* erc.el: (erc-get-buffer): Use erc-buffer-filter.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: (erc-get-channel-nickname-list): New function.
 +	(erc-get-server-nickname-list): New function.
 +	(erc-get-server-nickname-alist): New function.
 +	(erc-get-channel-nickname-alist): New function.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list,
 +	erc-remove-entry-from-list): Use `erc-member-ignore-case' to
 +	compare entries.
 +	(erc-add-pal, erc-add-fool): Fix type bug. Use
 +	`erc-get-server-nickname-alist'.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: Adds xemacs compatibility to hash table
 +	channel-members patch.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: (erc-update-undo-list): Rewritten. Update
 +	buffer-undo-list in place.  Deal with XEmacsesque
 +	entries (extents) in the list.
 +	(erc-channel-users): Fix unescaped open-paren in left column in
 +	docstring.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-ring.el: (erc-replace-current-command): Exclude the prompt
 +	from the deleted region and don't redisplay the prompt (because
 +	`erc-display-prompt' flushes `buffer-undo-list').
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list): Use `symbol-value' instead
 +	of `eval'.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-kill-buffer-function): maphash was missing an
 +	argument.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* Makefile, erc-autoaway.el, erc-button.el, erc-ibuffer.el,
 +	erc-lang.el, erc-list.el, erc-match.el, erc-menu.el, erc-page.el,
 +	erc-pcomplete.el, erc-speedbar.el, erc.el: HUGE change by jbms.
 +	This makes channel-members a hash, erc-channel-users.
 +
 +	Modified files: Makefile erc-autoaway.el erc-button.el
 +	erc-ibuffer.el erc-lang.el erc-list.el erc-match.el erc-menu.el
 +	erc-page.el erc-pcomplete.el erc-speedbar.el erc.el
 +
 +	The changes are too numerous to document properly. Have fun with
 +	the breakage.
 +
 +2004-01-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-send-input-line): Add a space to empty lines so the
 +	server likes them.
 +
 +2004-01-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-send-whitespace-lines: New variable.
 +	(erc-send-current-line): Use erc-send-whitespace-lines. Also,
 +	removed superflous test for empty line in the mapc, since the
 +	blank line test should find all. I do like to be able to send an
 +	empty line when i want to!
 +	(erc-send-current-line): Check for point being in input line
 +	before checking for blank lines.
 +
 +2004-01-21  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-display-line-1): Move `erc-update-undo-list' outside
 +	`save-restriction'.  Removing need for temporary variable.
 +	(erc-send-current-line): Fix bug introduced by last change, remove
 +	complement in blank line regexp.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-undo-list): Add logic to catch the case when
 +	`buffer-undo-list' is t, indentation cleanup.
 +	(erc-send-current-line):  Reverse logic for matching blank lines.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-input-line-position): New variable.  If non-nil,
 +	specifies the argument to `recenter' in `erc-scroll-to-bottom'.
 +	(erc-scroll-to-bottom): Use it.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Johan Bockgård <bojohan+news@dd.chalmers.se>:
 +	(erc-update-undo-list): New function.  Update `buffer-undo-list'
 +	so that calling `undo' in an ERC buffer doesn't mess up the
 +	existing text.
 +	(erc-display-line-1): Use it.
 +
 +2004-01-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-beg-of-input-line): Use `forward-line' rather than
 +	`beginning-of-line'.  Docstring fix.
 +	(erc-end-of-input-line): Docstring fix.
 +
 +2004-01-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove the undo list after
 +	displaying the prompt, so the user can't undo ERC changes, which
 +	breaks some stuff anyways. This way the user can still undo his
 +	editing, but not ours.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Should recenter on the bottom
 +	line, not the second-to-last one.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-bol): Fix bug introduced in revision 1.601.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Brian Palmer <bpalmer@gmail.com>
 +	(erc-cmd-JOIN): Use `erc-member-ignore-case', rather than
 +	`member-ignore-case'.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: There was an inconsistency where the values of op and
 +	voice in channel-names could be 'on or 'off after an update, t and
 +	nil before.  The intended version was to have t or nil, so i fixed
 +	it to do so.
 +	(channel-names): Updated docstring.
 +	(erc-update-current-channel-member): Clarified docstring, fixed so
 +	it sets t or nil on an update as well, not only on an add.
 +	(erc-cmd-OPS): Updated not to check for 'on (the only function that
 +	did this!)
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-part-reason-various-alist,
 +	erc-update-mode-line-buffer): Fix docstring
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line): Fix typo.
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-prompt-interactive-input): Removed.
 +	(erc-display-prompt): Removed `erc-prompt-interactive-input'
 +	option.  (erc-interactive-input-map): Removed.
 +
 +	Major docstring fixes.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-OPS): Added this function.
 +	(erc-cmd-IDLE): Switched from using erc-display-message-highlight
 +	to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Switched from using
 +	erc-display-message-highlight to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event): Added a sentence to the
 +	docstring.  Now returns the uninterned symbol that is added to the
 +	server hook.
 +	(erc-cmd-IDLE): Changed to use erc-once-with-server-event instead
 +	of erc-once-with-server-event-global.
 +
 +2004-01-06  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-hide-modeline): New variable.
 +	(erc-chanlist): Now displays message as a notice.  Also hides the
 +	modeline if erc-chanlist-hide-modeline is non-nil.
 +
 +2004-01-05  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-server-PRIVMSG-or-NOTICE): Now nicks appear as
 +	<nick> in query buffers, instead of as *nick*.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): Changed to return
 +	the uninterned symbol that it creates.
 +	(erc-cmd-LIST): Changed to clean up hooks that don't run.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/IDLE): Added to support new
 +	/IDLE command.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): New function.  Like
 +	erc-once-with-server-event, except it modifies the global value of
 +	the event hook.
 +	(erc-cmd-IDLE): New function.  Implements the new /IDLE command.
 +	Usage: /IDLE NICK (erc-seconds-to-string): New function.  Converts
 +	a number of seconds to an Engligh phrase.
 +
 +2004-01-02  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el: Added variable erc-chanlist-mode-hook.
 +
 +See ChangeLog.03 for earlier changes.
 +
-     Copyright (C) 2004 Free Software Foundation, Inc.
++    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
diff --cc ChangeLog.05
index b91395b,0000000..ec72c60
mode 100644,000000..100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@@ -1,1228 -1,0 +1,1228 @@@
 +2005-11-23  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SAY): Strip leading space in input line.
 +
 +2005-10-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: Add stuff that needs to be done before the 5.1
 +	release.  Longer-term items can be added to the 5.2 section.
 +
 +	* Makefile (SITEFLAG): New variable that indicates what variant of
 +	"--site-flag" to use.  XEmacs needs "-site-flag".
 +	(INSTALLINFO): New variable indicating how we should call
 +	install-info when installing documentation.
 +	(erc-auto.el, .elc.el): Use $(SITEFLAG).
 +
 +	* NEWS: Note that last release was 5.0.4.
 +
 +	* erc.texi: Initial and incomplete draft of ERC documentation.
 +	Commence collaborate-documentation-hack-mode :^) .
 +
 +2005-10-29  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el (erc-replace-current-command): Revert last change
 +	since it made the prompt disappear when using `erc-next-command'
 +	and `erc-previous-command'.
 +
 +2005-10-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-input-marker): New variable that indicates the
 +	position where text from the user begins, after the prompt.
 +	(erc-mode-map): Bind <HOME> to erc-bol, just like C-a.
 +	(erc): Initialize erc-input-marker.
 +	(erc-display-prompt): Even in case where no prompt is desired by
 +	the user, clear the undo buffer and set the input marker.
 +	(erc-bol, erc-user-input): Simplify by using erc-input-marker.
 +
 +	* erc-pcomplete.el (pcomplete-parse-erc-arguments): Use
 +	erc-insert-marker.
 +
 +	* erc-ring.el (erc-previous-command)
 +	(erc-replace-current-command): Use erc-insert-marker.
 +
 +	* erc-spelling.el (erc-spelling-init): Make sure that even Emacs21
 +	obeys erc-spelling-flyspell-verify.
 +	(erc-spelling-flyspell-verify): Use erc-input-marker.  This should
 +	make it considerably faster when switching to a buffer that has
 +	seen a lot of activity since last viewed.
 +
 +2005-10-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-server-version, 004): Re-added setting of
 +	`erc-server-version'.  It doesn't hurt to set, and it could be
 +	used in modules or users' settings.
 +
 +	* NEWS: Added descriptions of some new features.
 +
 +2005-10-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
 +	as default.
 +	(erc-beep-match-types): New variable.
 +	(erc-text-matched-hook): Doc fix.  Added `erc-beep-on-match' to
 +	customization options.
 +	(erc-beep-on-match): New function.  If the MATCH-TYPE is found in
 +	`erc-beep-match-types', beep.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	New functions to deal with the difference in the number of
 +	arguments accepted by `make-obsolete' and `make-obsolete-variable'
 +	in Emacs and XEmacs.
 +
 +	* erc.el, erc-nets.el: Use `erc-make-obsolete' and
 +	`erc-make-obsolete-variable'.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	Handle `wrong-number-of-arguments' error instead of checking for
 +	xemacs feature as future versions of XEmacs might accept three
 +	arguments.
 +
 +2005-10-18  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
 +	docstrings.
 +
 +2005-10-08  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
 +	Updated my email address.
 +
 +2005-10-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-send-input-line, erc-cmd-KICK, erc-cmd-PART)
 +	(erc-cmd-QUIT, erc-cmd-TOPIC, erc-kill-server, erc-kill-channel):
 +	Adapt to new TARGET parameter of erc-server-send.
 +
 +	* erc-backend.el (erc-server-connect): Don't specify encoding for
 +	erc-server-process, since we set this each time we send a line to
 +	the server.
 +	(erc-encode-string-for-target): Remove.
 +	(erc-server-send): Allow TARGET to be specified.  This was how it
 +	used to be before my more-backend work.  Set encoding of server
 +	process just before sending text to it.  Associate encoding with
 +	text if we are using the queue.
 +	(erc-server-send-queue): Pull encoding from queue.
 +	(erc-message, erc-send-ctcp-message, erc-send-ctcp-notice): Adapt
 +	to new TARGET parameter of erc-server-send.
 +
 +2005-10-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Use erc-view-mode-enter
 +	rather than view-mode.
 +
 +	* erc-backend.el (erc-encode-string-for-target): If given a nil or
 +	empty string, return "".
 +	(erc-server-send-queue): XEmacs fix: Use erc-cancel-timer rather
 +	than cancel-timer.
 +
 +	* erc-compat.el (erc-view-mode-enter): New function that is
 +	aliased to the correct way of entering view-mode.
 +
 +	* erc-match.el (erc-log-matches-make-buffer): Use
 +	erc-view-mode-enter rather than view-mode-enter.
 +
 +2005-10-05  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-backend.el (erc-encode-string-for-target): If str is nil,
 +	pass the empty string to erc-encode-coding-string instead, which
 +	allows one to /part and /quit without providing a reason again.
 +
 +2005-10-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-message, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Encode string for target before sending.
 +
 +	* erc.el (erc-cmd-KICK, erc-cmd-PART, erc-cmd-QUIT, erc-cmd-TOPIC)
 +	(erc-kill-server, erc-kill-channel): Ditto.
 +
 +2005-09-05  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc-page.el (erc-ctcp-query-PAGE): (message text) -> (message
 +	"%s" text).
 +	(erc-cmd-PAGE): Simplify regexp. Put `do-not-parse-args' t.
 +
 +2005-09-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-flood-limit, erc-flood-limit2): Remove since they
 +	are no longer needed.
 +	(erc-send-input): Detect whether we want flood control to be
 +	active.  The previous behavior was to always force the message.
 +	(erc-toggle-flood-control): Adapt to new flood control method.  No
 +	more 'strict.
 +	(erc-cmd-SV): Use concat rather than
 +	format-time-string.
 +	(erc-format-target, erc-format-target-and/or-server): Shorten
 +	logic statements.
 +
 +	* erc-compat.el (erc-emacs-build-time): Use a string
 +	representation rather than trying to coerce a time out of a string
 +	on XEmacs.
 +
 +	* erc-identd.el (erc-identd-start): Use make-network-process
 +	instead of open-network-stream.  Error out if this is not defined.
 +
 +	* erc-backend.el (erc-send-line): New command that sends a line
 +	using flood control, using a callback for display.  It isn't used
 +	yet.
 +
 +2005-09-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias and make-obsolete-variable for
 +	erc-default-coding-system.
 +	(channel-topic, channel-modes, channel-user-limit, channel-key,
 +	invitation, away, channel-list, bad-nick): Rename globally to
 +	erc-{name-of-variable}.
 +
 +2005-09-03  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-message): Simplify regexp.
 +	(erc-cmd-DEOP, erc-cmd-OP): Simplify.
 +
 +2005-08-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Alias erc-send-command to erc-server-send.  ErBot needs
 +	this to work without modification.  Add defvaralias for
 +	erc-process.  Make this and the other backwards-compatibility
 +	functions and variables be marked obsolete as of ERC 5.1.
 +
 +	* erc-backend.el: Add autoload for erc-log macro.
 +	(erc-server-connect): Set some variables before defining process
 +	handlers.  It probably doesn't make any difference.
 +
 +2005-08-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias for erc-announced-server-name, since
 +	this seems to be widely used.
 +
 +2005-08-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc): Remove unnecessary boundp check.
 +
 +	* erc-autoaway.el: Fix compiler warning.
 +
 +	* erc-backend.el (erc-server-version): Since this isn't used by
 +	any code, and isn't generally useful, remove it.
 +	(erc-server-send-queue): Use erc-current-time rather than
 +	float-time.
 +	(004): Don't set erc-server-version.
 +
 +	* erc-dcc.el (erc-dcc-chat-request, erc-dcc-get-parent): Move to
 +	fix a compiler warning.
 +
 +	* erc-ibuffer.el (erc-server): Remove unnecessary boundp check.
 +
 +	* erc-identd.el (erc-identd-start): Use read-string instead of
 +	read-input.
 +
 +	* erc-imenu.el (erc-unfill-notice): Use a while loop instead of
 +	replace-regexp.
 +
 +	* erc-nicklist.el: Add conditional dependency on erc-bbdb.
 +	(erc-nicklist-insert-contents): Tighten some regexps.
 +
 +	* erc-notify.el (erc-notify-list): Docfix.
 +
 +	* erc-spelling.el (erc-spelling-dictionaries): Add :type and
 +	:group to silence a compiler warning.
 +
 +2005-08-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-session-server, erc-session-port)
 +	(erc-announced-server-name, erc-server-version)
 +	(erc-server-parameters): Moved here from erc.el.
 +	(erc-server-last-peers): Moved, renamed from last-peers.
 +	(erc-server-lag): Moved, renamed from erc-lag.
 +	(erc-server-duplicates): Moved, renamed from erc-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server): New customization group hosting all options from
 +	this file.
 +	(erc-server-prevent-duplicates): Moved, renamed from
 +	erc-prevent-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server-auto-reconnect, erc-split-line-length)
 +	(erc-server-coding-system, erc-encoding-coding-alist)
 +	(erc-server-connect-function, erc-server-flood-margin)
 +	(erc-server-flood-penalty): Change group to 'erc-server.
 +	(erc-server-send-ping-interval): Moved, renamed from
 +	erc-ping-interval.
 +	(erc-server-ping-handler): Moved, renamed from erc-ping-handler.
 +	(erc-server-setup-periodical-server-ping): Moved, renamed from
 +	erc-setup-periodical-server-ping.
 +	(erc-server-connect): Add to docstring.  Move more initialization
 +	here.
 +	(erc-server-processing-p): Docfix.
 +	(erc-server-connect): Use 'raw-text like in the original version.
 +	(erc-server-filter-function): Don't reset process coding system.
 +
 +	* erc-stamp.el (erc-add-timestamp): If the text at point is
 +	invisible, don't insert a timestamp.  Thanks to Pascal
 +	J. Bourguignon for the suggestion.
 +
 +	* erc-match.el (erc-text-matched-hook): Don't hide fools by
 +	default, but include it in the available options.
 +
 +2005-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-*.el: s/erc-send-command/erc-server-send/g.
 +	s/erc-process/erc-server-process/g (sort of).  Occasional
 +	whitespace and indentation fixes.
 +
 +	* erc-backend.el: Specify a few local variables for indentation.
 +	Take one item off of the TODO list.
 +	(erc-server-filter-data): Renamed from erc-previous-read.  From
 +	circe.
 +	(erc-server-processing-p): New variable that indicates when we're
 +	currently processing a message.  From circe.
 +	(erc-split-line-length): New option that gives the maximum line
 +	length of a single message.  From circe.
 +	(erc-default-coding-system): Moved here from erc.el.
 +	(erc-split-line): Renamed from erc-split-command and taken from
 +	circe.
 +	(erc-connect-function, erc-connect, erc-process-sentinel-1)
 +	(erc-process-sentinel, erc-flood-exceeded-p, erc-send-command)
 +	(erc-message, erc-upcase-first-word, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Moved here from erc.el.
 +	(erc-server-filter-function): Renamed from erc-process-filter.
 +	From circe.
 +	(erc-server-process): Renamed from `erc-process' and moved here
 +	from erc.el.
 +	(erc-server-coding-system): Renamed from
 +	`erc-default-coding-system'.
 +	(erc-encoding-coding-alist): Moved here from erc.el.
 +	(erc-server-flood-margin, erc-server-flood-penalty):
 +	(erc-server-flood-last-message, erc-server-flood-queue):
 +	(erc-server-flood-timer): New options from circe that allow
 +	tweaking of flood control.
 +	(erc-server-connect-function): Renamed from erc-connect-function.
 +	(erc-flood-exceeded-p): Removed.
 +	(erc-coding-system-for-target)
 +	(erc-encode-string-for-target, erc-decode-string-from-target):
 +	Moved here from erc.el
 +	(erc-server-send): Renamed from erc-send-command.  Adapted from
 +	the circe function by the same name.
 +	(erc-server-send-queue): New function from circe that implements
 +	handling of a flood queue.
 +	(erc-server-current-nick): Renamed from current-nick.
 +	(erc-server-quitting): Renamed from `quitting'.
 +	(erc-server-last-sent-time): Renamed from `last-sent-time'.
 +	(erc-server-last-ping-time): Renamed from `last-ping-time'.
 +	(erc-server-lines-sent): Renamed from `lines-sent'.
 +	(erc-server-auto-reconnect): Renamed from `erc-auto-reconnect'.
 +	(erc-server-coding-system): Docfix.
 +	(erc-server-connect): Renamed from `erc-connect'.  Require SERVER
 +	and PORT parameters.  Initialize several variables here.  Don't
 +	set `erc-insert-marker'.  Use a per-server coding system via
 +	erc-server-default-encoding.
 +
 +	* erc.el (erc-version-string): Changed to indicate we are running
 +	the `more-backend' branch.
 +	(erc-send-single-line): Implement flood control using
 +	erc-split-line.
 +	(erc-send-input): Move functionality of erc-send-single-line in
 +	here.
 +	(erc-send-single-line): Assimilated!
 +	(erc-display-command, erc-display-msg): Handle display hooks.
 +	(erc-auto-reconnect, current-nick, last-sent-time)
 +	(last-ping-time, last-ctcp-time, erc-lines-sent, erc-bytes-sent)
 +	(quitting): Moved to erc-backend.el.
 +	(erc): Docfix.  Don't initialize quite so many things here.
 +
 +2005-08-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/copyright (Copyright): Remove notices for 4 people, since
 +	they didn't contribute legally-significant changes, or have had
 +	these changes overwritten.
 +
 +	* erc-log.el: Remove copyright notice.
 +
 +	* erc.el: Remove 3 copyright notices.
 +
 +2005-08-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-3 package.  This doesn't serve
 +	any purpose other than to thank Romain Francoise for some advice.
 +
 +	* Makefile (debrelease): Allow last upload and extra build options
 +	to be specified.
 +
 +2005-08-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-2 package.
 +
 +	* debian/control (Uploaders): Add Romain Francoise.
 +	(Standards-Version): Update to 3.6.2.
 +	(Depends): Add `emacsen'.
 +
 +	* debian/scripts/startup.erc (load-path): Minor whitespace fixup.
 +
 +	* Makefile (clean): Split target from realclean and make it remove
 +	files that aren't packaged in releases.
 +	(clean, release): Minor cleanups.
 +	(debrelease): Use debuild rather than dpkg-buildpackage since the
 +	former calls lintian.  Minor cleanups.
 +	(debrelease-mwolson): New target that removes old Debian packages,
 +	calls debrelease, and copies the resulting package to my dist dir.
 +	(upload): New target that automates the process of uploading an
 +	ERC release to sourceforge.
 +
 +	* erc.el (erc-mode): Use `make-local-variable' instead of
 +	`make-variable-buffer-local'.
 +
 +2005-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Build 5.0.4-1.
 +
 +	* Makefile (release): Prepare zip file in addition to tarball.
 +
 +	* NEWS: Add item for the undo fix.
 +
 +2005-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Check
 +	erc-announced-name before erc-session-server.  Make sure that we
 +	can never get a stringp (nil) error.
 +	(erc-nicklist-call-erc-command): If given no command, do nothing.
 +	This fixes an error that used to occur when a stray mouse click
 +	was made outside of the popup window, but on the erc-nicklist
 +	menu.
 +
 +	* erc-bbdb.el (erc-bbdb-search-name-and-create): Get rid of the
 +	infinite input loop when you want to create a new record.  Replace
 +	most of that with a completing read of existing nicks.  If no nick
 +	is chosen, create a new John Doe record.  The net effect of this
 +	is that the old behavior is re-instated, with the addition of one
 +	completing read that happens when you do a /whois.
 +
 +2005-07-09  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Docfix.
 +	(erc-update-mode-line-buffer): Use `erc-propertize' instead of
 +	`propertize'.
 +	(erc-propertize): Move to erc-compat.el.
 +
 +	* erc-compat.el (erc-propertize): Move here from erc.el. Always
 +	return a copy of the string (like `propertize' in GNU Emacs).
 +
 +	* erc-nicklist.el (erc-nicklist-icons-directory)
 +	(erc-nicklist-voiced-position)
 +	(erc-nicklist-insert-medium-name-or-icon): Docfix.
 +	(erc-nicklist-insert-contents): Simplify.
 +	(erc-nicklist-mode-map): Bind RET instead of `return'. Bind
 +	`down-mouse-3' instead of `mouse-3'.
 +	(erc-nicklist-kbd-cmd-QUERY): Cleanup regexp.
 +	(erc-nicklist-channel-users-info): Docfix. Simplify.
 +
 +2005-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* images: New directory containing the images that are used by
 +	erc-nicklist.el.  These are from Gaim, and are thought to be
 +	available under the terms of the GPL.
 +
 +	* erc-bbdb.el: Add local variables section to preserve tabs, since
 +	that is the style used throughout this file.  Apply patch from
 +	Edgar Gonçalves as follows.
 +	(erc-bbdb-bitlbee-name-field): New variable that indicates the
 +	field name to use for annotating the "displayed name" of a bitlbee
 +	contact.
 +	(erc-bbdb-irc-highlight-field): Docfix.
 +	(erc-bbdb-search-name-and-create): Prompt the user for the name of
 +	a contact if none was found.  Merge the new entries into the
 +	specified contact.  If new arg SILENT is non-nil, do not prompt
 +	the user for a name or offer to merge the new entry.
 +	(erc-bbdb-insinuate-and-show-entry): New arg SILENT is accepted,
 +	which is passed on to erc-bbdb-search-name-and-create.
 +	(erc-bbdb-whois): Tell erc-bbdb-search-name-and-create to prompt
 +	for name if necessary.
 +	(erc-bbdb-JOIN, erb-bbdb-NICK): Forbid
 +	erc-bbdb-search-name-and-create from prompting for a name.
 +
 +	* erc-nicklist.el: Add local variables section to preserve tabs,
 +	since that is the style used throughout this file.  Apply patch
 +	from Edgar Gonçalves as follows.
 +	(erc-nicklist-use-icons): New option; if non-nil, display an icon
 +	instead of the name of the chat medium.
 +	(erc-nicklist-icons-directory): New option indicating the path to
 +	the PNG files that are used for chat icons.
 +	(erc-nicklist-use-icons): New option indicating whether to put
 +	voiced nicks on top, bottom, or not to differentiate them.  The
 +	default is to put them on the bottom.
 +	(erc-nicklist-bitlbee-connected-p): New variable that indicates
 +	whether or not we are currently using bitlbee.  An attempt will be
 +	made to auto-detect the proper value.  This is bound in the
 +	`erc-nicklist-insert-contents' function.
 +	(erc-nicklist-nicklist-images-alist): New variable that maps a
 +	host type to its icon.  This is set by `erc-nicklist'.
 +	(erc-nicklist-insert-medium-name-or-icon): New function that
 +	inserts an icon or string that identifies the current host type.
 +	(erc-nicklist-search-for-nick): New function that attempts to find
 +	a BBDB record that corresponds with this contact given its
 +	finger-host.  If found, return its bitlbee-nick field.
 +	(erc-nicklist-insert-contents): New function that inserts the
 +	contents of the nick list, including text properties and images.
 +	(erc-nicklist): Populate `erc-nicklist-images-alist'.  Move
 +	nicklist content generation code to
 +	`erc-nicklist-insert-contents'.
 +	(erc-nicklist-mode-map): Map C-j to erc-nicklist-kbd-menu and RET
 +	to erc-nicklist-kbd-cmd-QUERY.
 +	(erc-nicklist-call-erc-command): Make use of
 +	`switch-to-buffer-other-window'.
 +	(erc-nicklist-cmd-QUERY): New function that opens a query buffer
 +	for the given contact.
 +	(erc-nicklist-kbd-cmd-QUERY): Ditto; contains most of the code.
 +	(erc-nicklist-kbd-menu): New function that shows the nicklist
 +	action menu.
 +	(erc-nicklist-channel-users-info): Renamed from
 +	`erc-nicklist-channel-nicks'.  Implement sorting voiced users.
 +
 +2005-06-29  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Fix regexp for Azzurra.
 +
 +2005-06-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autojoin.el (erc-autojoin-add, erc-autojoin-remove): Use
 +	`erc-session-server' if `erc-announced-server-name' is nil.  This
 +	happens when servers don't send a 004 message.
 +
 +	* erc.el (erc-quit-server): Ditto.
 +
 +	* erc-ibuffer.el (erc-server, erc-server-name): Ditto.
 +
 +	* erc-notify.el (erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Ditto.
 +
 +2005-06-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-default-coding-system)
 +	(erc-handle-user-status-change): Docstring fix.
 +	(with-erc-channel-buffer): Removed.
 +	(erc-ignored-reply-p): Replace `with-erc-channel-buffer' with
 +	`erc-with-buffer'.
 +	(erc-display-line-1): Revision 1.730 broke undo. Fix it.
 +
 +2005-06-23  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add entries for Luigi Panzeri and Andreas Schwab.
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Add entries for Azzurra
 +	and OFTC.  Thanks to Luigi Panzeri and Andreas Schwab for
 +	providing these.
 +
 +2005-06-16  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add John Paul Wallington.
 +
 +	* erc.el: Thanks to John Paul Wallington for the following.
 +	(erc-nickname-in-use): Use `string-to-number' instead of
 +	`string-to-int'.
 +
 +	* erc-dcc.el (erc-dcc-handle-ctcp-send)
 +	(erc-dcc-handle-ctcp-chat, erc-dcc-get-file)
 +	(erc-dcc-chat-accept): Ditto.
 +
 +	* erc-identd.el (erc-identd-start): Ditto.
 +
 +2005-06-16  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-mode-map): Suppress `font-lock-fontify-block' key
 +	binding since it destroys face properties.
 +
 +2005-06-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-UNIGNORE): Use `erc-member-ignore-case' instead
 +	of `member-ignore-case'.  Thanks to bpalmer for the heads up.
 +
 +2005-06-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Fix a mistake I made when editing this a
 +	few days ago.  Modes should now be disabled properly.
 +	(erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Remove unnecessary call to
 +	`format'.  Thanks to Andreas Schwab for reporting this.
 +
 +	* debian/changelog: Close "README file missing" bug.
 +
 +	* debian/rules (binary-erc): Install README file.
 +
 +2005-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-with-buffer): Set `lisp-indent-function' so Emacs
 +	Lisp mode knows how to indent erc-with-buffer blocks.
 +	(with-erc-channel-buffer): Ditto.
 +	(erc-with-all-buffers-of-server): Ditto.
 +	(erc-modules): Use pcomplete by default, not completion, since
 +	erc-complete.el is deprecated.  Use `fboundp' instead of
 +	`symbol-value' to check for existence of a function before calling
 +	it.  This was causing an error when untoggling the `completion'
 +	option and trying to save via the customize interface.
 +
 +	* erc-track.el (erc-modified-channels-update): If a buffer is not
 +	currently connected, remove it from the modified channels list.
 +	This should fix the problem where residue was left on the mode
 +	line after quitting ERC.
 +
 +	* erc-list.el (erc-prettify-channel-list): Docfix; thanks to John
 +	Paul Wallington for reporting this.
 +
 +2005-05-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: First draft of entries for the 5.0.3 release.
 +
 +	* debian/README.Debian: Note that ERC will now install correctly
 +	on versions of Emacs or XEmacs that do not have the `format-spec'
 +	library.  Correct some grammar and prune the content a bit.
 +
 +	* debian/scripts/install (emacs20): Remove line since we no longer
 +	need to deal with format-spec.el.
 +
 +	* NEWS: Add entries for the upcoming 5.0.3 release.
 +
 +	* erc.el: Don't require format-spec since this is provided in
 +	erc-compat.el now.
 +	(erc-process-sentinel, erc-setup-periodical-server-ping): Use
 +	`erc-cancel-timer' instead of `cancel-timer'.
 +	(erc-version-string): Update to 5.0.3.
 +
 +	* erc-autoaway.el (autoaway, erc-autoaway-reestablish-idletimer):
 +	Use `erc-cancel-timer' instead of `cancel-timer'.
 +
 +	* erc-compat.el (format-spec, format-spec-make): If we cannot load
 +	the `format-spec' library, provide versions of these functions.
 +	This should keep problems from surfacing with Emacs21 Debian
 +	builds.
 +	(erc-cancel-timer): New function created to take the place of
 +	`cancel-timer' since XEmacs calls it something else.
 +
 +	* erc-track.el (erc-modified-channels-update): Accept any number
 +	of arguments, which are ignored.  This allows it to be run from
 +	`erc-disconnected-hook' without extra bother.
 +	(track): Add `erc-modified-channels-update' to
 +	`erc-disconnected-hook' so that the indicators are removed
 +	correctly in some edge cases.
 +	(erc-modified-channels-display): Make sure that we never pass nil
 +	to the function in `erc-track-shorten-function'.  This happens
 +	when we have deleted buffers in `erc-modified-channels-alist'.
 +	Also, make sure that the buffer has a non-nil short-name before
 +	adding it to the string list.  This should fix some XEmacs
 +	warnings when running /quit with unchecked buffers, as well as get
 +	rid of a stray buffer problem (or so it is hoped).
 +
 +2005-05-31  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-replace.el, erc-speak.el: Clean up comment formatting.
 +
 +	* erc-ring.el (ring, erc-input-ring-index, erc-clear-input-ring):
 +	Clean up docstring formatting.
 +
 +2005-05-30  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Delete superfluous
 +	arg to `format'.
 +	(erc-load-irc-script): Use `insert-file-contents' instead of
 +	`insert-file'. Simplify.
 +
 +2005-05-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Move this up so that it is
 +	evaluated before the `require' statements.  Not a major change.
 +
 +2005-04-27  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-complete-word): Simplify.
 +
 +2005-04-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Use a slightly different approach when
 +	removing CVS and Arch cruft.
 +
 +	* debian/changelog: Update for 5.0.2-1 package.
 +
 +2005-04-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move code
 +	block higher in file to fix a load failure when using Emacs21.
 +	Thanks to Daniel Brockman for the report and fix.
 +
 +2005-04-24  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-backend.el (JOIN): save-excursion so that
 +	`erc-current-logfile' inserts into the correct channel buffers
 +	when using erc-log-insert-log-on-open in combination with autojoin
 +	to multiple channels.
 +
 +2005-04-17  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-log.el: Remove stray whitespace.
 +	* erc.el: Ditto.
 +
 +2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
 +
 +	* erc.el: autoload erc-select-read-args, which, because it parses
 +	erc-select's args, can be called before erc.el is loaded. 
 +
 +2005-04-07  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Remove final newlines from previously-existing ERC
 +	buffers. (Minor bug fix.)
 +
 +2005-04-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Ignore errors from deleting Arch and CVS
 +	metadata.
 +
 +2005-04-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, CREDITS, AUTHORS: Correct name and email address of
 +	Marcelo Toledo.
 +
 +2005-04-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Add entry for spelling module.
 +
 +	* erc-spelling.el: Add autoload line.
 +
 +	* erc-backend.el: Apply latest non-ascii patch from Kai Fan.
 +	(erc-decode-parsed-server-response): Search
 +	erc-response.command-args for channel name.  Decode the
 +	erc-response struct using this channel name as key according to
 +	the `erc-encoding-coding-alist'.
 +
 +	* erc-track.el: Apply patch from Henrik Enberg.
 +	(erc-modified-channels-object): Use optimal amount of whitespace
 +	around modified channels indicator.
 +
 +2005-04-02  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (define-erc-module, erc-with-buffer)
 +	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
 +	edebug-form-spec.
 +
 +	* erc-compat (erc-define-minor-mode): Ditto.
 +
 +2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
 +
 +	* erc-spelling.el: New file.
 +
 +2005-03-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (define-erc-response-handler): Add
 +	`definition-name' property to constructed symbols so that
 +	find-function and find-variable will find them.
 +
 +2005-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el, erc-goodies.el, erc-list.el, erc-notify.el,
 +	erc-ring.el, erc.el: Copyright assignment occurred.
 +
 +	* debian/scripts/install: Make a shell wrapper around the original
 +	Makefile and inline the Makefile.  The problem is that Debian
 +	passes all the Emacs variants at once, rotating them at every
 +	invocation of the install script, which happens once per variant.
 +	This caused each installation to happen N-1 times more often than
 +	it should have.  As a result, we need to only deal with the first
 +	argument.
 +	(ELFILES): Only add format-spec.el if we are compiling for
 +	emacs21.  Don't filter out erc-compat.el.
 +	(SITEFLAG): New variable that indicates that the "nosite" option
 +	should look like.
 +	(.DEFAULT): Use $(FLAVOUR) instead of $@ for clarity.
 +
 +	* debian/rules: Install NEWS file and compress it.
 +
 +	* debian/maint/postinst: Be more cautious about configuration
 +	step.
 +
 +	* debian/copyright (Copyright): Another assignment came in.
 +
 +	* debian/control (Standards-Version): Update to a newer version as
 +	recommended by lintian.
 +
 +	* debian/changelog: Changes made for the Debian package.
 +
 +	* debian/README.Debian: Keep only the General Notes section.
 +
 +	* NEWS: Move old history items here from debian/README.Debian.
 +
 +	* Makefile (SNAPSHOTDATE): Deprecate this option since we hope to
 +	release more often.
 +
 +2005-03-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-define-catalog, `ctcp-request-to'): Fix typo (%: ->
 +	%t:).
 +
 +2005-03-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Replace tabs with spaces
 +	in code indentation.
 +
 +2005-02-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply corrected patch from Henrik
 +	Enberg.
 +
 +2005-02-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply patch from Henrik Enberg.
 +	Check here to see if a message should be hidden, rather than
 +	relying on code in each individual command.
 +	(erc-version-string): Add "(CVS)" to the version string for
 +	clarity.
 +
 +	* erc-backend.el (JOIN, KICK, MODE, NICK, PART, QUIT, TOPIC):
 +	Don't check `erc-hide-list' here.
 +
 +	* erc-list.el, erc-match.el, erc.el, debian/copyright: Update
 +	copyright information as a few more people have assignments
 +	registered.
 +
 +2005-02-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el: Apply patch from Kai Fan for non-ASCII character
 +	support.
 +	(erc-parse-server-response): Add call to
 +	`erc-decode-parsed-server-response'.
 +	(erc-decode-parsed-server-response): New function that decodes a
 +	pre-parsed server response before it can be handled.
 +	(PRIVMSG): Comment out call to `erc-decode-string-from-target'.
 +	(TOPIC): Ditto.
 +
 +2005-02-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-sentinel-1): Don't reconnect on connection
 +	refused. This error is reported differently when using
 +	open-network-stream-nowait.
 +
 +2005-01-26  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-APPENDTOPIC, erc-set-topic): The control
 +	character in `channel-topic' was changed to \C-o - replaced \C-c
 +	with \C-o so that these functions work as expected again.
 +	(erc-get-channel-mode-from-keypress): Doc fix.
 +
 +2005-01-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-button.el, erc-compat.el, erc-goodies.el,
 +	erc-match.el, erc-nets.el, ChangeLog, NEWS: Merged bug fixes made
 +	on release_5_0_branch since 5.0.1 release.
 +
 +2005-01-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-input-action): Quote `erc-action-history-list' so
 +	that input history actually works.
 +	(erc-process-ctcp-query): Fix and simplify logic.
 +	(erc-get-channel-mode-from-keypress): Use `C-' string syntax.
 +	(erc-load-irc-script-lines): Use `erc-command-indicator' instead
 +	of `erc-prompt'.
 +
 +2005-01-23  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Ensure that `viper-comint-mode-hook' runs in
 +	buffers whose `erc-mode-hook' has already run when this file is
 +	loaded.
 +	Explicitly `require' erc.el.
 +
 +2005-01-22  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Remove frobbing of `require-final-newline'.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Remove frobbing of
 +	`require-final-newline'.
 +
 +	* erc-viper.el: New file. This is where all ERC/Viper
 +	compatiibilty code should live. When and if ERC is bundled with
 +	Emacs, some of the hacks in this file should be merged into Viper
 +	itself.
 +
 +2005-01-21  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Set `require-final-newline' to nil in ERC
 +	buffers. This prevents a Viper misfeature whereby extraneous
 +	newlines are inserted into the ERC buffer when switching between
 +	viper states.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Bind `require-final-newline'
 +	to t when calling `write-region' to ensure that further log
 +	entries start on fresh lines.
 +	
 +2005-01-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-face): Reverted my change to the
 +	order faces since it had the unwanted effect of putting the button
 +	face after all others.
 +	(erc-button-face-has-priority): Removed this variable as it is not
 +	necessary anymore - it was used to compensate for the above
 +	mentioned change.
 +
 +	* NEWS: Added the latest fixes.
 +
 +2005-01-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el, erc-match.el:
 +	(erc-button-syntax-table, erc-match-syntax-table): Added \ as a
 +	legal character for nicknames.
 +
 +	* erc-nets.el (erc-server-select): Fixed so that only networks
 +	with servers found in `erc-server-alist' are available as choices.
 +
 +	* erc.el, erc-compat.el, erc-goodies.el:
 +	(erc-replace-match-subexpression-in-string): New function.  Needed
 +	because `replace-match' in XEmacs doesn't replace regular
 +	expression subexpressions in strings, only in buffers.
 +	(erc-seconds-to-string, erc-controls-interpret): Use the new
 +	function.
 +
 +	* erc-button.el (erc-button-add-button): Use the `:button-face'
 +	key combined with an `erc-mode' local `widget-button-face' set to
 +	nil to get the widget overlay face suppressed in XEmacs.
 +
 +2005-01-19  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-face): The face added by this
 +	function is more important than the existing text's face, so we
 +	now prepend erc-button-face to the list of existing faces when
 +	adding a button.  To instead append erc-button-face to existing
 +	faces, set variable `erc-button-face-has-priority' to nil.
 +	(erc-button-face-has-priority): New variable to control how
 +	erc-button-add-face adds erc-button-face to existing faces.
 +	(erc-button-press-button): Silenced a byte-compiler warning about
 +	too few arguments in a call to `error'.
 +
 +2005-01-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* NEWS: Added list of 5.0.1 fixes.
 +
 +2005-01-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Move to format that cscvs can understand.  As an added
 +	perk, entries line up nicer.
 +
 +	* erc.el, erc-fill.el, erc-pcomplete.el, debian/copyright: Merge a
 +	few more copyright lines thanks to Alex Schroeder's BBDB file.
 +
 +	* Makefile: Change version to correspond with our new scheme.
 +
 +2005-01-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el (erc-chanlist-channel-line-regexp): Now matches
 +	private channels, the channels `#' and `&', and channels with
 +	names including non-ascii characters.
 +	(erc-chanlist-join-channel): Don't attempt to join private
 +	channels since the channel name is unknown.
 +
 +	* erc-goodies.el (erc-make-read-only): Add `rear-nonsticky'
 +	property to avoid `Text is read-only' errors during connection.
 +	`front-nonsticky' does not exist, changed to `front-sticky'.
 +	(erc-controls-interpret, erc-controls-strip): Just work on the
 +	string, don't open a temporary buffer.
 +	(erc-controls-propertize): Now accepts optional argument STR.
 +
 +2005-01-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile: Version is 5.01, but only in the Makefile.  It has not
 +	been released yet.
 +
 +	* erc-auto.in, erc-autojoin.el, erc-bbdb.el, erc-button.el,
 +	erc-chess.el, erc-complete.el, erc-dcc.el, erc-fill.el,
 +	erc-goodies.el, erc-ibuffer.el, erc-identd.el, erc-imenu.el,
 +	erc-list.el, erc-match.el, erc-menu.el, erc-nets.el,
 +	erc-netsplit.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el,
 +	erc-ring.el, erc-speak.el, erc-speedbar.el, erc-stamp.el,
 +	erc-track.el, erc-xdcc.el, erc.el, debian/copyright: Update
 +	copyright notices.  If anyone has signed papers for Emacs in
 +	general, merge them with the FSF's entry.
 +
 +2005-01-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc): `erc-set-active-buffer' was being called before
 +	`erc-process' was set, so that channels weren't being marked
 +	active correctly upon join; fixed.
 +
 +2005-01-15  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (def-edebug-spec): This macro caused problems (in
 +	XEmacs). Use its expansion directly.
 +
 +2005-01-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-button): Reverted previous change
 +	since `:suppress-face' doesn't seem to be checked for a certain
 +	face.
 +	(erc-button-add-face): FACE is now appended to the `old' face.
 +	This should fix the problem of faces being "covered" by
 +	`erc-button-face'.
 +
 +2005-01-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-OPS, erc-cmd-COUNTRY,
 +	erc-cmd-NICK, erc-process-ctcp-query, ERROR, PONG, 311, 312, 313,
 +	314, 317, 319, 320, 321, 322, 330, 352): Use catalog entries
 +	instead of hard-coded text messages.
 +	(english): Added new catalog entries `country', `country-unknown',
 +	`ctcp-empty', `ctcp-request-to', `ctcp-too-many', `nick-too-long',
 +	`ops', `ops-none', `ERROR', `PONG', `s311', `s312', `s313',
 +	`s314', `s317', `s317-on-since', `s319', `s320', `s321', `s322',
 +	`s330', and `s352'.
 +	(erc-send-current-line): Use `erc-set-active-buffer' (change was
 +	lost in previous bug fix).
 +
 +2005-01-14  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-button): Fixed a bug where the
 +	overlay created by widget-convert-button has a `face' property
 +	that hides the `face' property set on the underlying button text.
 +
 +	* erc-goodies.el: Docstring fix.
 +
 +	* erc-button.el: Improved docstring for variable erc-button-face.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el (erc-menu-definition): "Topic set by channel
 +	operator": Small word change.  "Identify to NickServ...": Check
 +	that we're connected to the server.  Added "Save buffer in log"
 +	and "Truncate buffer".
 +
 +2005-01-13  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el (erc-display-line-1): Widen before we try to insert
 +	anything, this makes sure input isn't broken when the buffer is
 +	narrowed by the user.
 +	(erc-beg-of-input-line): Simplify, just return the position of
 +	`erc-insert-marker' or error if does not exist.
 +	(erc-send-current-line): Widen before trying to send anything.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el, erc-list.el:
 +	(erc-update-mode-line-buffer): Strip controls characters from
 +	`channel-topic' since we add our own control character to it.
 +	(TOPIC, 332): Use \C-o instead of \C-c to force an end of IRC
 +	control characters as it also ends bold, underline, and inverse -
 +	\C-c only ends colors.
 +	(erc-chanlist-322): Strip control characters from channel and
 +	topic.  No need to interpret controls when we're applying overlays
 +	to the lines.
 +
 +	* erc.el, erc-backend.el, erc-button.el, erc-netsplit.el,
 +	erc-nicklist.el: Fixed so that each server has an active buffer.
 +	(erc-active-buffer): Now a buffer-local variable.
 +	(erc-active-buffer, erc-set-active-buffer): New functions.
 +	(erc-display-line, erc-echo-notice-in-active-non-server-buffer,
 +	erc-process-away, MODE): Call `erc-active-buffer' to get the
 +	active buffer for the current server.
 +	(erc, erc-process-sentinel-1, erc-grab-region, erc-input-action,
 +	erc-send-current-line, erc-invite-only-mode,
 +	erc-toggle-channel-mode, erc-channel-names, MODE, erc-nick-popup,
 +	erc-nicklist-call-erc-command): Use `erc-set-active-buffer' to set
 +	the active buffer for the current server.
 +	(erc-cmd-WHOLEFT): Use 'active as BUFFER in `erc-display-message'.
 +
 +	* erc-track.el (erc-track-modified-channels): Server buffers are
 +	now treated the same as channels and queries.  This means that
 +	`erc-track-priority-faces-only', `erc-track-exclude', and
 +	`erc-track-exclude-types' now work with server buffers.
 +
 +2005-01-12  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (475): Prompt for the channel's key if
 +	`erc-prompt-for-channel-key' is non-nil.  Send a new JOIN message
 +	with the key if a key is provided.
 +
 +	* erc.el (erc-command-indicator): Fixed customization choices so
 +	that there's no `mismatch' message when nil is the value.
 +
 +2005-01-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-bbdb.el (bbdb): Lowercase the name of the module.  This
 +	fixes a bug which caused an error to occur when trying to enable
 +	the module using the customization interface.
 +
 +2005-01-08  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-track.el: Support using faces to indicate channel activity
 +	in the modeline under XEmacs.
 +	(erc-modified-channels-object): New function.
 +	(erc-modified-channels-display): Use it.
 +	`erc-modified-channels-string' renamed to
 +	`erc-modified-channels-object' (because it's no longer a string on
 +	XEmacs). The new function `erc-modified-channels-object' is used
 +	to generate updated values for the same-named variable.
 +
 +2005-01-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* ChangeLog.2002: Changed instances of my sourceforge username and
 +	email address to real name and email.
 +
 +	* erc.el (erc-modules): Changed customization tag descriptions, so
 +	that they all start with a verb; added new modules to choices.
 +
 +2005-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/rules: Introduce new variable DOCDIR to simplify stuff a
 +	bit.
 +
 +2005-01-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS, ChangeLog.2004: Change bpalmer's email address as
 +	requested.
 +
 +	* CREDITS: Add everyone who is mentioned in the ChangeLogs.
 +
 +	* debian/copyright (Copyright): Add last few people.  This can now
 +	be considered a complete list, as far as CVS entries are
 +	concerned.  If people have assigned copyright to the FSF, merge
 +	them with the entry for the FSF.
 +
 +	* debian/README.Debian: Add entry for XEmacs-related change in
 +	`erc-track.el'.
 +
 +	* erc.el (erc-cmd-MODE): New command that changes or displays the
 +	mode for a channel or user.  The functionality was present before
 +	this change, but there was no documentation for it.
 +
 +	* erc-auto.in, erc-*.el: Fully investigate copyright headers and
 +	change them appropriately.  If a file has been pulled off of
 +	erc.el at one time, keep track of copyright from the time of
 +	separation, but not before.  If a file has been derived from a
 +	work outside of erc, keep copyright statements in place.
 +
 +	* Makefile (VERSION): Change to 5.0! :^) Congrats on all the great
 +	work.  I'll wait until hober commits his XEmacs compatibility
 +	patch to erc-track.el, and then release.
 +	(distclean): Alias for `realclean' target.
 +
 +2005-01-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Add Marcelo Toledo, who has CVS access to this project.
 +
 +	* ChangeLog.2004: Add my name to my one contribution to erc last
 +	year.
 +
 +	* CREDITS: Add people that were discovered while scouring
 +	ChangeLogs.
 +
 +	* debian/copyright: Add everyone from `AUTHORS' to Upstream
 +	Authors.  Anyone who has contributed 15 or more lines of
 +	code (according to ChangeLogs) is listed in Copyright section.
 +	Accurate years are included.
 +
 +	* debian/README.Debian: Paste content of NEWS and reformat
 +	slightly.
 +
 +	* debian/rules: Concatenate the ChangeLogs during the Debian
 +	install process and then gzip them.
 +
 +	* Makefile (MISC): Add ChangeLog.yyyy files to list.
 +	(ChangeLog): Remove rule since we do not dynamically generate the
 +	ChangeLog anymore.
 +
 +	* MkChangeLog: Removed since we do not use it to generate the
 +	ChangeLog anymore.  cvs2cl does a much better job anyway.
 +
 +	* NEWS: Use 3rd level heading instead of bullets for lists that
 +	contain descriptions.
 +
 +2005-01-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Require 'sort.
 +	(erc-chanlist): Disable undo in the channel list buffer.
 +
 +	* erc.el, erc-menu.el: The `IRC' menu is now automatically added
 +	to the menu-bar.  Add the call to `easy-menu-add' to
 +	`erc-mode-hook' when running in XEmacs (without this the menu
 +	doesn't appear).
 +
 +	* NEWS: Added the information from
 +	http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer
 +	changes which weren't yet documented on that page.
 +
 +2005-01-06  Hoan Ton-That  <hoan@ton-that.org>
 +
 +	* erc-log.el (erc-current-logfile): Only downcase the logfile
 +	name, not the whole filename.  Also expand relative to
 +	`erc-log-channels-directory'.
 +	(erc-generate-log-file-name-with-date)
 +	(erc-generate-log-file-name-short)
 +	(erc-generate-log-file-name-long): Don't expand filename, done in
 +	`erc-current-logfile'.
 +
 +2005-01-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* NEWS: New file, details user visible changes from version to
 +	version.
 +
 +	* HACKING (NEWS entries): Mention NEWS file, and what its purpose
 +	is.
 +
 +2005-01-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: New file containing the list of release-critical
 +	tasks.  Feel free to add to it.
 +
 +	* debian/rules (binary-erc): Add ChangeLog files.
 +
 +2005-01-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.2001, ChangeLog.2002, ChangeLog.2003, ChangeLog.2004:
 +	ChangeLog entries from previous years.
 +
 +	* ChangeLog: New file containing ChangeLog entries for the current
 +	year.  Please update this file manually whenever a change is
 +	committed.  This is a new policy.
 +
 +	* AUTHORS: Add myself to list.  Some entries were space-delimited
 +	instead of TAB-delimited, and since the latter seemed to be the
 +	default, make the other entries conform.
 +
 +	* HACKING (ChangeLog Entries): Update section to reflect new
 +	policy toward ChangeLog entries, which is that they should be
 +	manually updated whenever a change is committed.
 +
 +2005-01-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-connection-established, erc-login): Update the
 +	mode-line.
 +	(erc-update-mode-line-buffer): If `erc-current-nick' returns nil,
 +	use an empty string for ?n character in format spec.  Set
 +	`mode-line-process' to ":connecting" while the connection is being
 +	established.
 +
 +2005-01-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* AUTHORS: Update list of authors.
 +
 +2005-01-02  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-goodies.el (erc-control-characters): New customization
 +	group.
 +	(erc-interpret-controls-p): Small fix, addition to
 +	documentation. Updated customization to allow 'remove as a value.
 +	Use 'erc-control-characters as `:group'.
 +	(erc-interpret-mirc-color): Use 'erc-control-characters as
 +	`:group'.
 +	(erc-beep-p): Updated documentation.  Use 'erc-control-characters
 +	as `:group'.
 +	(define-erc-module irccontrols): Add `erc-controls-highlight' to
 +	`erc-insert-modify-hook' and `erc-send-modify-hook' since it
 +	changes the text's appearance.
 +	(erc-controls-remove-regexp, erc-controls-interpret-regexp): New
 +	variables.
 +	(erc-controls-highlight): Fixed so that highlighting works even if
 +	there is no following control character.  Fixed mirc color
 +	highlighting; now respecting `erc-interpret-mirc-color'.  Fixed a
 +	bug where emacs would get stuck in a loop when \C-g was in a
 +	message and `erc-beep-p' was set to nil (default setting).
 +
 +See ChangeLog.04 for earlier changes.
 +
-     Copyright (C) 2005 Free Software Foundation, Inc.
++    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 +  Copying and distribution of this file, with or without modification,
 +  are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
 +;; End:
 +
 +;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
diff --cc erc-backend.el
index c12e9b3,8c4b915..086335f
--- a/erc-backend.el
+++ b/erc-backend.el
@@@ -1272,7 -1233,7 +1272,7 @@@ add things to `%s' instead.
          (when buffer
            (with-current-buffer buffer
              ;; update the chat partner info.  Add to the list if private
--            ;; message.	 We will accumulate private identities indefinitely
++            ;; message.  We will accumulate private identities indefinitely
              ;; at this point.
              (erc-update-channel-member (if privp nick tgt) nick nick
                                         privp nil nil host login nil nil t)
@@@ -1387,7 -1348,7 +1387,7 @@@
  According to RFC 2812, suggests alternate servers on the network.
  Many servers, however, use this code to show which parameters they have set,
  for example, the network identifier, maximum allowed topic length, whether
--certain commands are accepted and more.	 See documentation for
++certain commands are accepted and more.  See documentation for
  `erc-server-parameters' for more information on the parameters sent.
  
  A server may send more than one 005 message."
diff --cc erc.el
index 5de73f8,98a369f..177190e
--- a/erc.el
+++ b/erc.el
@@@ -485,7 -461,7 +485,7 @@@ Removes all users in the current channe
      (clrhash erc-channel-users)))
  
  (defsubst erc-channel-user-op-p (nick)
--  "Return `t' if NICK is an operator in the current channel."
++  "Return t if NICK is an operator in the current channel."
    (and nick
         (hash-table-p erc-channel-users)
         (let ((cdata (erc-get-channel-user nick)))
@@@ -493,7 -469,7 +493,7 @@@
  	      (erc-channel-user-op (cdr cdata))))))
  
  (defsubst erc-channel-user-voice-p (nick)
--  "Return `t' if NICK has voice in the current channel."
++  "Return t if NICK has voice in the current channel."
    (and nick
         (hash-table-p erc-channel-users)
         (let ((cdata (erc-get-channel-user nick)))
@@@ -783,7 -761,7 +783,7 @@@ set if some hacker is trying to flood y
    :type 'boolean)
  
  (defcustom erc-prompt-for-channel-key nil
--  "Prompt for channel key when using `erc-join-channel' interactively"
++  "Prompt for channel key when using `erc-join-channel' interactively."
    :group 'erc
    :type 'boolean)
  
@@@ -816,7 -794,7 +816,7 @@@ whose identifier matches, the message w
  CAVEAT: ERC doesn't know about the user and host of anyone who
  was already in the channel when you joined, but never said
  anything, so it won't be able to match the user and host of those
--people. You can update the ERC internal info using /WHO *."
++people.  You can update the ERC internal info using /WHO *."
    :group 'erc-ignore
    :type '(repeat regexp))
  
@@@ -836,9 -813,9 +836,9 @@@ See `erc-server-flood-margin' for othe
    "List of files to try for a startup script.
  The first existent and readable one will get executed.
  
--If the filename ends with `.el' it is presumed to be an emacs-lisp
++If the filename ends with `.el' it is presumed to be an Emacs Lisp
  script and it gets (load)ed.  Otherwise is is treated as a bunch of
--regular IRC commands"
++regular IRC commands."
    :group 'erc-scripts
    :type '(repeat file))
  
@@@ -850,7 -827,7 +850,7 @@@ directory in the list.
    :type '(repeat directory))
  
  (defcustom erc-script-echo t
--  "*If not-NIL, echo the IRC script commands locally."
++  "*If non-nil, echo the IRC script commands locally."
    :group 'erc-scripts
    :type 'boolean)
  
@@@ -1051,7 -1028,7 +1051,7 @@@ At this point, all modifications from p
  NOTE: The functions on this hook are called _before_ sending a command
  to the server.
  
--This function is called with narrowing, ala `erc-send-modify-hook'"
++This function is called with narrowing, ala `erc-send-modify-hook'."
    :group 'erc-hooks
    :type 'hook
    :options '(erc-make-read-only))
@@@ -1207,7 -1171,7 +1207,7 @@@ DOC is the documentation string to use 
  ENABLE-BODY is a list of expressions used to enable the mode.
  DISABLE-BODY is a list of expressions used to disable the mode.
  If LOCAL-P is non-nil, the mode will be created as a buffer-local
--mode.  Rather than a global one.
++mode, rather than a global one.
  
  This will define a minor mode called erc-NAME-mode, possibly
  an alias erc-ALIAS-mode, as well as the helper functions
@@@ -1275,7 -1235,7 +1275,7 @@@ You should make sure that `current-buff
  This function temporarily adds a function to EVENT's hook to
  execute FORMS.  After FORMS are run, the function is removed from
  EVENT's hook.  The last expression of FORMS should be either nil
--or t.  nil indicates that the other functions on EVENT's hook
++or t, where nil indicates that the other functions on EVENT's hook
  should be run too, and t indicates that other functions should
  not be run.
  
@@@ -1303,7 -1263,7 +1303,7 @@@ capabilities.
  This function temporarily prepends a function to EVENT's hook to
  execute FORMS.  After FORMS are run, the function is removed from
  EVENT's hook.  The last expression of FORMS should be either nil
--or t.  nil indicates that the other functions on EVENT's hook
++or t, where nil indicates that the other functions on EVENT's hook
  should be run too, and t indicates that other functions should
  not be run.
  
@@@ -1407,7 -1360,7 +1407,7 @@@ If BUFFER is nil, the current buffer i
  (defvar erc-active-buffer nil
    "The current active buffer, the one where the user typed the last command.
  Defaults to the server buffer, and should only be set in the
--server buffer")
++server buffer.")
  (make-variable-buffer-local 'erc-active-buffer)
  
  (defun erc-active-buffer ()
@@@ -1464,7 -1414,7 +1464,7 @@@ Turning on `erc-mode' runs the hook `er
  '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"
++any other value - in place of the current buffer."
    :group 'erc-buffers
    :type '(choice (const window)
  		 (const window-noselect)
@@@ -1474,7 -1424,7 +1474,7 @@@
  
  (defcustom erc-frame-alist nil
    "*Alist of frame parameters for creating erc frames.
--A value of `nil means to use `default-frame-alist'."
++A value of nil means to use `default-frame-alist'."
    :group 'erc-buffers
    :type '(repeat (cons :format "%v"
  		       (symbol :tag "Parameter")
@@@ -1590,7 -1539,7 +1590,7 @@@ SPEC should have the for
  If TARGET is a buffer, use it.  Otherwise, use the buffer
  matching TARGET in the process specified by PROCESS.
  
--If PROCESS is nil, use the current `erc-server-process'
++If PROCESS is nil, use the current `erc-server-process'.
  See `erc-get-buffer' for details.
  
  See also `with-current-buffer'.
@@@ -1770,19 -1716,10 +1770,19 @@@ buffer rather than a server buffer."
    "Used to keep track of how many times an attempt at changing nick is made.")
  (make-variable-buffer-local 'erc-nick-change-attempt-count)
  
 -(defcustom erc-modules '(netsplit fill button match track pcomplete readonly
 +(defun erc-migrate-modules (mods)
 +  "Migrate old names of ERC modules to new ones."
 +  ;; modify `transforms' to specify what needs to be changed
 +  ;; each item is in the format '(old . new)
 +  (let ((transforms '((pcomplete . completion))))
 +    (erc-delete-dups
 +     (mapcar (lambda (m) (or (cdr (assoc m transforms)) m))
 +	     mods))))
 +
 +(defcustom erc-modules '(netsplit fill button match track completion readonly
  				  ring autojoin noncommands irccontrols
 -				  stamp)
 -  "A list of modules which erc should enable.
 +				  stamp list)
-   "A list of modules which erc should enable.
++  "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
  removed from the list will be disabled."
@@@ -2046,7 -1969,7 +2046,7 @@@ parameters, SERVER, PORT and NICK.
  
  (defcustom erc-after-connect nil
    "Hook called after connecting to a server.
--This hook gets executed when an end of MOTD has been received.	All
++This hook gets executed when an end of MOTD has been received.  All
  functions in here get called with the parameters SERVER and NICK."
    :group 'erc-hooks
    :type 'hook)
@@@ -2143,7 -2061,7 +2143,7 @@@ Arguments are the same as for `erc'.
  (defun erc-open-ssl-stream (name buffer host port)
    "Open an SSL stream to an IRC server.
  The process will be given the name NAME, its target buffer will be
--BUFFER.	 HOST and PORT specify the connection target."
++BUFFER.  HOST and PORT specify the connection target."
    (when (require 'ssl)
      (let ((proc (open-ssl-stream name buffer host port)))
        ;; Ugly hack, but it works for now. Problem is it is
@@@ -2160,7 -2078,7 +2160,7 @@@
  
  The buffer is created if it doesn't exist.
  
--NOTE: If this variable is non-nil, and you kill the the only
++NOTE: If this variable is non-nil, and you kill the only
  visible \"*erc-protocol*\" buffer, it will be recreated shortly,
  but you won't see it.
  
@@@ -2175,7 -2093,7 +2175,7 @@@ This only has any effect if `erc-debug-
  The buffer is created if it doesn't exist.
  
  If OUTBOUND is non-nil, STRING is being sent to the IRC server
--and appears in erc-input-face in the buffer."
++and appears in face `erc-input-face' in the buffer."
    (when erc-debug-irc-protocol
      (let ((network-name (or (ignore-errors (erc-network-name))
  			    "???")))
@@@ -2259,7 -2177,7 +2259,7 @@@ I.e. any char in it has the `invisible
  
  (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
++Auxiliary function used in `erc-display-line'.  The line gets filtered to
  interpret the control characters.  Then, `erc-insert-pre-hook' gets called.
  If `erc-insert-this' is still t, STRING gets inserted into the buffer.
  Afterwards, `erc-insert-modify' and `erc-insert-post-hook' get called.
@@@ -2343,8 -2261,8 +2343,8 @@@ or omitted, the default ERC buffer for 
  The BUFFER can be an actual buffer, a list of buffers, 'all or 'active.
  If BUFFER = 'all, the string is displayed in all the ERC buffers for the
  current session.  'active means the current active buffer
--\(`erc-active-buffer').	 If the buffer can't be resolved, the current
--buffer is used.	 `erc-display-line-1' is used to display STRING.
++\(`erc-active-buffer').  If the buffer can't be resolved, the current
++buffer is used.  `erc-display-line-1' is used to display STRING.
  
  If STRING is nil, the function does nothing."
    (let ((inhibit-point-motion-hooks t)
@@@ -2370,9 -2289,9 +2370,9 @@@
  	(erc-display-line-1 string (current-buffer))))))
  
  (defun erc-display-message-highlight (type string)
--  "Highlight STRING according to TYPE, where erc-TYPE-face is an erc face.
++  "Highlight STRING according to TYPE, where erc-TYPE-face is an ERC face.
  
--See also `erc-make-notice'"
++See also `erc-make-notice'."
    (cond ((eq type 'notice)
  	 (erc-make-notice string))
  	(t
@@@ -2458,7 -2375,7 +2458,7 @@@ Returns non-nil if the command is actua
  otherwise.
  
  If the command in the LINE is not bound as a function `erc-cmd-<COMMAND>',
--it is passed to `erc-cmd-default'.  If LINE is not a command (ie. doesn't
++it is passed to `erc-cmd-default'.  If LINE is not a command (i.e. doesn't
  start with /<COMMAND>) then it is sent as a message.
  
  An optional FORCE argument forces sending the line when flood
@@@ -2683,7 -2591,7 +2683,7 @@@ VERSION and so on.  It is called with A
  
  If FUNC contains a valid function or variable, help about that
  will be displayed.  If FUNC is empty, display an apropos about
--erc commands.  Otherwise, do apropos in the erc namespace
++ERC commands.  Otherwise, do `apropos' in the ERC namespace
  \(\"erc-.*LINE\"\).
  
  Examples:
@@@ -2809,9 -2717,9 +2809,9 @@@ LINE has the format: \"#CHANNEL NICK RE
  
  (defun erc-cmd-LOAD (line)
    "Load the script provided in the LINE.
--If LINE continues beyond the file name,
--the rest of it is put in a (local) variable
--`erc-script-args', which can be used in elisp scripts.
++If LINE continues beyond the file name, the rest of
++it is put in a (local) variable `erc-script-args',
++which can be used in Emacs Lisp scripts.
  
  The optional FORCE argument is ignored here - you can't force loading
  a script after exceeding the flood threshold."
@@@ -3384,7 -3291,7 +3384,7 @@@ The ban list is fetched from the serve
  				  (and (boundp 'fill-column)
  				       fill-column)
  				  (1- (window-width))))
--	     (separator (make-string erc-fill-column (string-to-char "=")))
++	     (separator (make-string erc-fill-column ?=))
  	     (fmt (concat
  		   "%-" (number-to-string (/ erc-fill-column 2)) "s"
  		   "%" (number-to-string (/ erc-fill-column 2)) "s")))
@@@ -3450,7 -3357,7 +3450,7 @@@ Unban all currently banned users in th
         (lambda (x)
  	 (erc-server-send
  	  (format "MODE %s -%s %s" (erc-default-target)
--		  (make-string (length x) (string-to-char "b"))
++		  (make-string (length x) ?b)
  			(mapconcat 'identity x " "))))
         (erc-group-list bans 3))))
  	t))))
@@@ -3828,7 -3735,7 +3828,7 @@@ See also `erc-display-error-notice'.
  
  (defgroup erc-server-hooks nil
    "Server event callbacks.
--Every server event - like numeric replies - has it's own hook.
++Every server event - like numeric replies - has its own hook.
  Those hooks are all called using `run-hook-with-args-until-success'.
  They receive as first argument the process object from where the event
  originated from,
@@@ -3892,22 -3799,25 +3892,22 @@@ and as second argument the event parse
    :type 'function)
  
  (defun erc-format-nick (&optional user channel-data)
 -  "Standard nickname formatting function.  Only returns the value
 -of NICK."
 -  (if user
 -      (erc-server-user-nickname user)))
 +  "Return the nickname of USER.
 +See also `erc-format-nick-function'."
 +  (when user (erc-server-user-nickname user)))
  
  (defun erc-format-@nick (&optional user channel-data)
 -  "Format a nickname such that @ or + are prefix for the NICK
 -if OP or VOICE are t respectively."
 -  (if user
 -      (let (op voice)
 -	(if channel-data
 -	    (setq op (erc-channel-user-op channel-data)
 -		  voice (erc-channel-user-voice channel-data)))
 -    (concat (if voice "+" "")
 -	    (if op "@" "")
 -		(erc-server-user-nickname user)))))
 +  "Format the nickname of USER showing if USER is an operator or has voice.
 +Operators have \"@\" and users with voice have \"+\" as a prefix.
 +Use CHANNEL-DATA to determine op and voice status.
 +See also `erc-format-nick-function'."
 +  (when user
 +    (let ((op (and channel-data (erc-channel-user-op channel-data) "@"))
 +	  (voice (and channel-data (erc-channel-user-voice channel-data) "+")))
 +      (concat voice op (erc-server-user-nickname user)))))
  
  (defun erc-format-my-nick ()
--  "Return the beginning of this user's message, correctly propertized"
++  "Return the beginning of this user's message, correctly propertized."
    (if erc-show-my-nick
        (let ((open "<")
  	    (close "> ")
@@@ -3976,7 -3886,7 +3976,7 @@@ returns non-nil iff there is at least o
  sender is a member.
  
  See also: `erc-echo-notice-in-first-user-buffer',
--`erc-buffer-list-with-nick'"
++`erc-buffer-list-with-nick'."
    (let ((buffers (erc-buffer-list-with-nick sender erc-server-process)))
      (if buffers
  	(progn (erc-display-message parsed nil buffers s) t)
@@@ -3991,7 -3901,7 +3991,7 @@@ at least one buffer for which the sende
  default target.
  
  See also: `erc-echo-notice-in-user-buffers',
--`erc-buffer-list-with-nick'"
++`erc-buffer-list-with-nick'."
    (let ((buffers (erc-buffer-list-with-nick sender erc-server-process)))
      (add-to-list 'buffers buffer)
      (if buffers
@@@ -4006,7 -3916,7 +4006,7 @@@ returns non-nil iff there is at least o
  sender is a member.
  
  See also: `erc-echo-notice-in-user-buffers',
--`erc-buffer-list-with-nick'"
++`erc-buffer-list-with-nick'."
    (let ((buffers (erc-buffer-list-with-nick sender erc-server-process)))
      (if buffers
  	(progn (erc-display-message parsed nil (car buffers) s) t)
@@@ -4089,30 -3999,25 +4089,30 @@@
  (defun erc-connection-established (proc parsed)
    "Run just after connection.
  
--Set user modes and run `erc-after-connect hook'."
 -  (unless erc-server-connected ; only once per session
 -    (let ((server (or erc-server-announced-name (erc-response.sender parsed)))
 -	  (nick (car (erc-response.command-args parsed ))))
 -      (setq erc-server-connected t)
 -      (erc-update-mode-line)
 -      (erc-set-initial-user-mode nick)
 -      (erc-server-setup-periodical-server-ping)
 -      (run-hook-with-args 'erc-after-connect server nick))))
 -
 -(defun erc-set-initial-user-mode (nick)
 -  "If `erc-user-mode' is non-nil for NICK, set the user modes."
 -  (when erc-user-mode
 -    (let ((mode (if (functionp erc-user-mode)
 -		    (funcall erc-user-mode)
 -		  erc-user-mode)))
 -      (when (stringp mode)
 -	(erc-log (format "changing mode for %s to %s" nick mode))
 -	(erc-server-send (format "MODE %s %s" nick mode))))))
++Set user modes and run `erc-after-connect' hook."
 +  (with-current-buffer (process-buffer proc)
 +    (unless erc-server-connected ; only once per session
 +      (let ((server (or erc-server-announced-name
 +			(erc-response.sender parsed)))
 +	    (nick (car (erc-response.command-args parsed)))
 +	    (buffer (process-buffer proc)))
 +	(setq erc-server-connected t)
 +	(erc-update-mode-line)
 +	(erc-set-initial-user-mode nick buffer)
 +	(erc-server-setup-periodical-ping buffer)
 +	(run-hook-with-args 'erc-after-connect server nick)))))
 +
 +(defun erc-set-initial-user-mode (nick buffer)
 +  "If `erc-user-mode' is non-nil for NICK, set the user modes.
 +The server buffer is given by BUFFER."
 +  (with-current-buffer buffer
 +    (when erc-user-mode
 +      (let ((mode (if (functionp erc-user-mode)
 +		      (funcall erc-user-mode)
 +		    erc-user-mode)))
 +	(when (stringp mode)
 +	  (erc-log (format "changing mode for %s to %s" nick mode))
 +	  (erc-server-send (format "MODE %s %s" nick mode)))))))
  
  (defun erc-display-error-notice (parsed string)
    "Display STRING as an error notice.
@@@ -4424,7 -4329,7 +4424,7 @@@ The buffer where the change happened i
    "Updates the stored user information for the user with nickname
  NICK.
  
--See also: `erc-update-user'"
++See also: `erc-update-user'."
    (erc-update-user (erc-get-server-user nick) new-nick
  		   host login full-name info))
  
@@@ -4435,9 -4340,9 +4435,9 @@@ struct.  Any of NEW-NICK, HOST, LOGIN, 
  non-nil and not equal to the existing values for USER are used to
  replace the stored values in USER.
  
--If, any only if a change is made,
++If, and only if, a change is made,
  `erc-channel-members-changed-hook' is run for each channel for
--which USER is a member, and `t' is returned."
++which USER is a member, and t is returned."
    (let (changed)
      (when user
        (when (and new-nick
@@@ -4474,10 -4379,10 +4474,10 @@@
  	update-message-time)
    "Updates the stored user information for the user with nickname
  NICK.  `erc-update-user' is called to handle changes to nickname,
--host, login, full-name, and info.  If `op' or `voice' are
--non-nil, they must be equal to either `on' or `off', in which
--case the operator or voice status of USER in the current channel
--is changed accordingly.  If `update-message-time' is non-nil, the
++HOST, LOGIN, FULL-NAME, and INFO.  If OP or VOICE are non-nil,
++they must be equal to either `on' or `off', in which case the
++operator or voice status of the user in the current channel is
++changed accordingly.  If UPDATE-MESSAGE-TIME is non-nil, the
  last-message-time of the user in the current channel is set
  to (current-time).
  
@@@ -4486,7 -4391,7 +4486,7 @@@ information if it is not already presen
  lists.
  
  If, and only if, changes are made, or the user is added,
--`erc-channel-members-updated-hook' is run, and `t' is returned.
++`erc-channel-members-updated-hook' is run, and t is returned.
  
  See also: `erc-update-user' and `erc-update-channel-member'."
    (let* (changed user-changed
@@@ -4552,7 -4457,7 +4552,7 @@@
    "Updates user and channel information for the user with
  nickname NICK in channel CHANNEL.
  
--See also: `erc-update-current-channel-member'"
++See also: `erc-update-current-channel-member'."
    (erc-with-buffer
     (channel)
     (erc-update-current-channel-member nick new-nick add op voice host
@@@ -4560,8 -4465,8 +4560,8 @@@
  				      update-message-time)))
  
  (defun erc-remove-current-channel-member (nick)
--  "Remove NICK from current channel membership list.  Runs
--`erc-channel-members-changed-hook'."
++  "Remove NICK from current channel membership list.
++Runs `erc-channel-members-changed-hook'."
    (let ((channel-data (erc-get-channel-user nick)))
      (when channel-data
        (erc-remove-channel-user nick)
@@@ -4766,7 -4671,7 +4766,7 @@@ So far the following TYPE/L pairs are s
  
  (defun erc-highlight-notice (s)
    "Highlight notice message S and return it.
--See also variable `erc-notice-highlight-type'"
++See also variable `erc-notice-highlight-type'."
    (cond
     ((eq erc-notice-highlight-type 'prefix)
      (erc-put-text-property 0 (length erc-notice-prefix)
@@@ -4983,7 -4887,7 +4983,7 @@@ current position.
  	  (run-hooks 'erc-send-post-hook))))))
  
  (defun erc-command-symbol (command)
--  "Return the erc command symbol for COMMAND if it exists and is bound."
++  "Return the ERC command symbol for COMMAND if it exists and is bound."
    (let ((cmd (intern-soft (format "erc-cmd-%s" (upcase command)))))
      (when (fboundp cmd) cmd)))
  
@@@ -5083,7 -4986,7 +5083,7 @@@ See also `erc-downcase'.
  (defun erc-add-query (nickname)
    "Add QUERY'd NICKNAME to the default channel list.
  
--The previous default target of QUERY type gets removed"
++The previous default target of QUERY type gets removed."
    (let ((d1 (car erc-default-recipients))
  	(d2 (cdr erc-default-recipients))
  	(qt (cons 'QUERY (downcase nickname))))
@@@ -5308,8 -5210,8 +5308,8 @@@ See also `erc-startup-file-list'.
  
  FILE must be the full name, it is not searched in the
  `erc-script-path'.  If the filename ends with `.el', then load it
--as a emacs-lisp program.  Otherwise, treat it as a regular IRC
--script"
++as an Emacs Lisp program.  Otherwise, treat it as a regular IRC
++script."
    (erc-log (concat "erc-load-script: " file))
    (cond
     ((string-match "\\.el$" file)
@@@ -5321,13 -5223,13 +5321,13 @@@
    "Process an IRC script LINE.
  
  Does script-specific substitutions (script arguments, current nick,
--server, etc.)  in LINE and returns it.
++server, etc.) in LINE and returns it.
  
  Substitutions are: %C and %c = current target (channel or nick),
  %S %s = current server, %N %n = my current nick, and %x is x verbatim,
  where x is any other character;
  $* = the entire argument string, $1 = the first argument, $2 = the second,
--end so on."
++and so on."
    (if (not args) (setq args ""))
    (let* ((arg-esc-regexp "\\(\\$\\(\\*\\|[1-9][0-9]*\\)\\)\\([^0-9]\\|$\\)")
  	 (percent-regexp "\\(%.\\)")
@@@ -5452,10 -5354,10 +5452,10 @@@ user input.
    "Determine the connection and authentication parameters.
  Sets the buffer local variables:
  
--- erc-session-server
--- erc-session-port
--- erc-session-full-name
--- erc-server-current-nick"
++- `erc-session-server'
++- `erc-session-port'
++- `erc-session-full-name'
++- `erc-server-current-nick'"
    (setq erc-session-server (erc-compute-server server)
  	erc-session-port (or port erc-default-port)
  	erc-session-user-full-name (erc-compute-full-name name))
@@@ -5597,7 -5498,7 +5597,7 @@@ See also `erc-emacs-time-to-erc-time'.
  
  (defun erc-client-info (s)
    "Return CTCP CLIENTINFO on command S.
--If S is NIL or an empty string then return general CLIENTINFO"
++If S is nil or an empty string then return general CLIENTINFO."
    (if (or (not s) (string= s ""))
        (concat
         (apply #'concat
@@@ -5735,7 -5625,7 +5735,7 @@@ displayed hostnames.
    "(AWAY since %a %b %d %H:%M) "
    "When you're away on a server, this is shown in the mode line.
  This should be a string with substitution variables recognized by
--format-time-message."
++`format-time-string'."
    :group 'erc-mode-line-and-header
    :type 'string)
  
@@@ -5948,7 -5876,7 +5948,7 @@@ All windows are opened in the current f
  	(balance-windows)))))
  
  (defun erc-popup-input-buffer ()
--  "Provide a input buffer."
++  "Provide an input buffer."
     (interactive)
     (let ((buffer-name (generate-new-buffer-name "*ERC input*"))
  	 (mode (intern



From MAILER-DAEMON Wed Oct 17 10:36:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0O-00038Z-4e
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPe-0005Ik-Uk
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPX-0005Cr-99
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPW-0005CP-U1
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
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@hcoop.net>) id 1IgvPN-000454-0c
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPM-0005Gg-8e
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPM-0006Xw-AN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPM-0006Xw-AN@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:56 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Merged from erc--emacs--22
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, 14 Oct 2007 04:51:07 -0000

commit b584e980ef8653873218fefdf3a60003cdad974f
Merge: f6d782a... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 02:00:47 2007 +0000

    Merged from erc--emacs--22
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-43
       Sync license inanity from Emacs 22
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-134

diff --cc ChangeLog
index 95f6c79,cef3944..70ffa4e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,364 -1,314 +1,379 @@@
 -2006-01-28  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
 -	Space out copyright years like the rest of Emacs.  Use the Emacs
 -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
 -	IRC Client", since there are now several IRC clients for Emacs.
 -
 -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
 -	insert spaces instead of using special text property.
 +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.
 +
 +	* 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.
  
 -2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
 +	* 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.
  
 -	* erc.el (erc-format-message): More `cl' breakage; don't use
 -	`oddp'.
 +2007-01-11  Diane Murray  <disumu@x3y2z1.net>
  
 -2006-01-27  Michael Olson  <mwolson@gnu.org>
 +	* NEWS: Added note for `erc-my-nick-face'.  Fixed capab-identify
 +	wording.
  
 -	* debian/changelog: Update for new release.
 +2007-01-10  Diane Murray  <disumu@x3y2z1.net>
  
 -	* debian/control (Description): Update.
 +	* 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.
  
 -	* debian/rules: Concatenate ChangeLog for 2005.
 +2007-01-10  Michael Olson  <mwolson@gnu.org>
  
 -	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
 -	(debrelease, release): Copy images directory.
 +	* erc.el: Fix typo in url-irc-function instructions.
  
 -	* NEWS: Spelling fixes.  Add items for recent changes.
 +2007-01-09  Michael Olson  <mwolson@gnu.org>
  
 -	* erc.el (erc): Move call to erc-update-modules before the call to
 -	erc-mode.  This should fix a timestamp display issue.
 -	(erc-version-string): Release ERC 5.1.
 +	* 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.
  
 -2006-01-26  Michael Olson  <mwolson@gnu.org>
 +2007-01-07  Michael Olson  <mwolson@gnu.org>
  
 -	* erc-stamp.el (erc-insert-aligned): New function that inserts
 -	text in an perfectly-aligned way relative to the right margin.  It
 -	only works well with Emacs22.  A sane fallback is provided for
 -	other versions of Emacs.
 -	(erc-insert-timestamp-right): Use the new function.
 +	* erc.el (erc-modules): Add the menu module.  This should fix a
 +	bug with incorrect ERC submenus being displayed.
  
 -2006-01-25  Edward O'Connor  <ted@oconnor.cx>
 +	* erc-menu.el: Turn this into a module.
 +	(erc-menu-add, erc-menu-remove): New functions that add and remove
 +	the ERC menu.
  
 -	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
 -	before `erc-match-mode'.
  
 -	* erc-match.el (match): Append `erc-match-message' to
 -	`erc-insert-modify-hook'.
 +See ChangeLog.06 for earlier changes.
  
 -2006-01-25  Michael Olson  <mwolson@gnu.org>
 +    Copyright (C) 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
+ 
 -	* FOR-RELEASE: Mark last release requirement as done.
++  This file is part of GNU Emacs.
+ 
 -	* Makefile (realclean, distclean): Remove docs.
++  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 2, or (at your option)
++  any later version.
+ 
 -	* erc.texi: Take care of all pre-5.1 items.
++  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.
+ 
 -	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
 -	`process-send-string' in `condition-case' to avoid an error when
 -	quitting ERC.
++  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.
  
 -	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
 -	variable-width characters in the timestamp and on the same line.
 -	The latter is a kludge, but it seems to work with most of the
 -	input I've thrown at it so far.  It's certainly better than going
 -	past the end of line consistently when we have variable-width
 -	characters on the same line.  When `erc-timestamp-intangible' is
 -	non-nil, add intangible properties to the whitespace as well, so
 -	that hitting <end> does what you'd expect.
 +;; Local Variables:
 +;; coding: utf-8
 +;; add-log-time-zone-rule: t
 +;; End:
  
 -	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
 -	this to only use boolean values for `erc-flood-protect'.  Update
 -	documentation.
 -	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
 -	that any QUIT-related messages go there.
 -	(erc): Try to be more clever about re-using channel buffers when
 -	automatically re-connecting.  Thanks to e1f for noticing.
 -
 -2006-01-23  Michael Olson  <mwolson@gnu.org>
 -
 -	* ChangeLog.2005: Remove erroneous line.
 -
 -	* FOR-RELEASE: Make that the Makefile tweaking is complete.
 -	(NEWS): Mark as done.
 -
 -	* Makefile (MANUAL): New option indicating the name of the manual.
 -	(PREFIX, ELISPDIR, INFODIR): New options that specify the
 -	directories to install lisp code and info manuals to.  PREFIX is
 -	used only by ELISPDIR and INFODIR.
 -	(all): Call `lisp' and create the manual.
 -	(lisp): Compile lisp code.
 -	(%.info, %.html): New rules that make Info files and HTML files,
 -	respectively, from a TexInfo source.
 -	(doc): Create both the Info and HTML versions of the manual.  This
 -	is for the user -- we never call it automatically.
 -	(install-info): Install Info files.
 -	(install-bin): Install compiled and source Lisp files.
 -	(todo): Remove, since it seems pointless.
 -
 -	* NEWS: Update.
 -
 -	* README: Add Installation instructions.  Tweak layout.
 -
 -	* erc.texi: Work on some pre-5.1 items.
 -
 -	* erc-stamp.el, erc-track.el: Move some functions and options in
 -	order to get rid of a few compiler warnings.
 -
 -	* erc.el (erc-modules): Enable readonly by default.  This will
 -	prevent new users from accidentally removing old messages, which
 -	could be disconcerting.  Also enable stamp by default, since
 -	timestamps are a fairly standard feature among IRC clients.
 -
 -	* erc-button.el: Munge whitespace.
 -
 -	* erc-identd.el (erc-identd-start): Instead of throwing an error,
 -	just try to use the obsolete function.
 -
 -2006-01-22  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-backend.el (erc-decode-string-from-target): Make sure that
 -	we have a string as an argument.  If not, coerce it to the empty
 -	string.  Hopefully, this will work painlessly around an edge case
 -	related to quitting ERC around the same time a message comes in.
 -
 -2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
 -
 -	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
 -	`case'). Doc fixes.
 -	(erc-find-parsed-property): Simplify.
 -	(erc-track-get-active-buffer): Fix logic. Simplify.
 -	(erc-track-switch-buffer): Remove unused variable `dir'. Simplify.
 -
 -	* erc-speak.el: Doc fixes.
 -	(erc-speak-region): `propertize' --> `erc-propertize'.
 -
 -	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
 -	`erc-propertize'.
 -
 -	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
 -	account when wrapping URLs.
 -
 -	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
 -
 -	* erc-backend.el (define-erc-response-handler): Doc fix.
 -
 -2006-01-22  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc.el (erc-update-modules): Use `require' instead of `load',
 -	but prevent it from causing errors, in order to preserve the
 -	previous behavior.
 -
 -2006-01-21  Michael Olson  <mwolson@gnu.org>
 -
 -	* FOR-RELEASE (Source): Mark cl task as done.
 -
 -	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
 -	generate-autoloads.
 -	(erc-auto.el, %.elc): Don't show command, just its output.
 -
 -	* NEWS: Add items from 2005-01-01 to 2005-08-13.
 -
 -	* debian/copyright (Copyright): Update.
 -
 -	* erc-auto.in (erc-generate-autoloads): Rename from
 -	generate-autoloads.
 -
 -	* erc.el, erc-autoaway.el, erc-backend.el: Use
 -	erc-server-process-alive instead of erc-process-alive.
 -
 -	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
 -	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
 -	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
 -	Use (eval-when-compile 'cl), so that compilation doesn't fail.
 -
 -	* erc-fill.el, erc-truncate.el: Whitespace munging.
 -
 -	* erc.el: Update copyright notice.  Remove eval-after-load code.
 -	(erc-with-buffer): Docfix.
 -	(erc-once-with-server-event, erc-once-with-server-event-global)
 -	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
 -	instead of gensym.
 -	(erc-banlist-update): Use erc-delete-if instead of delete-if.
 -	(erc): Call `erc-update-modules' here.
 -
 -	* erc-backend.el: Require 'erc-compat to minimize compiler
 -	warnings.
 -	(erc-decode-parsed-server-response): Docfix.
 -	(erc-server-process-alive): Move here from erc.el and rename from
 -	`erc-process-alive'.
 -	(erc-server-send, erc-remove-channel-users): Make sure process is
 -	alive before sending data to it.
 -
 -	* erc-bbdb.el: Update copyright years.
 -	(erc-bbdb-whois): Remove overexuberant comment.
 -
 -	* erc-button.el: Require erc-fill, since we make liberal use of
 -	`erc-fill-column'.
 -
 -	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
 -	functions, the latter of which provides an `assert' equivalent.
 -	(erc-remove-if-not): New function that provides a simple
 -	implementation of `remove-if-not'.
 -	(erc-gensym): New function that provides a simple implementation
 -	of `gensym'.
 -	(erc-delete-if): New function that provides a simple
 -	implementation of `delete-if'.
 -	(erc-member-if): New function that provides a simple
 -	implementation of `member-if'.
 -	(field-end): Remove this, since it is unused, and later versions
 -	of XEmacs have this function already.
 -	(erc-function-arglist): Moved here from erc.el.
 -	(erc-delete-dups): New compatibility function for dealing with
 -	XEmacs.
 -	(erc-subseq): New function copied from cl-extra.el.
 -
 -	* erc-dcc.el: Require pcomplete during compilation to avoid
 -	compiler warnings.
 -	(erc-unpack-int, erc-dcc-send-filter)
 -	(erc-dcc-get-filter): Use erc-assert instead of assert.
 -	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
 -	remove-if-not.
 -
 -	* erc-match.el (erc-log-matches): Fix compiler warning.
 -
 -	* erc-nicklist.el: Update copyright notice.
 -	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
 -	(erc-nicklist-bitlbee-connected-p): Remove.
 -	(erc-nicklist-insert-medium-name-or-icon): Accept channel
 -	argument.  Use it to determine whether we are on bitlbee.  Now
 -	that bitlbee names its channel "&bitlbee", this is trivial.
 -	(erc-nicklist-insert-contents): Pass channel as specified above.
 -	Don't try to determine whether we are on bitlbee here.
 -	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
 -	of remove-if-not.
 -	(erc-nicklist-search-for-nick): Use erc-member-if instead of
 -	member-if.
 -
 -	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
 -	partially-evaluated lambda expression instead of `delete' and
 -	`find'.
 -
 -	* erc-track.el: Use erc-assert.
 -	(erc-track-modified-channels): Remove use of `return'.
 -	(erc-track-modified-channels): Use `cadr' instead of `second',
 -	since otherwise we would need yet another eval-when-compile line.
 -
 -2006-01-19  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
 -	detect SIGPIPE, since it doesn't work.
 -
 -2006-01-10  Diane Murray  <disumu@x3y2z1.net>
 -
 -	* erc-spelling.el: Updated copyright years.
 -	(define-erc-module): Enable/disable `flyspell-mode' for all open
 -	ERC buffers as well.
 -	(erc-spelling-dictionaries): Reworded customize description.
 -
 -	* erc.el (erc-command-symbol): New function.
 -	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
 -	fixes a bug where "Symbol's function definition is void:
 -	erc-cmd-LIST" would be shown after typing /list at the prompt (the
 -	command was interned because erc-menu.el uses it and is enabled by
 -	default whereas erc-list.el is not).
 -
 -	* NEWS: Started a list of renamed variables.
 -
 -	* erc.el: Reworded the message sent when defining variable
 -	aliases.
 -	(erc-command-indicator-face): Doc fix.
 -	(erc-modules): Enable the match module by default which makes
 -	current nickname highlighting on as the default.
 -
 -	* erc-button.el: Updated copyright years.
 -	(erc-button): New face.
 -	(erc-button-face): Use `erc-button'.
 -	(erc-button-nickname-face): New customizable variable.
 -	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
 -	new argument to `erc-button-add-button'.
 -	(erc-button-add-button): Doc fix.  Added new argument to function
 -	definition, NICK-P.  If it's a nickname, use
 -	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
 -	makes channel tracking and buttons work better together when
 -	`erc-button-buttonize-nicks' is enabled, since there is a nickname
 -	on just about every line.
 -
 -	* erc-track.el (erc-track-use-faces): Doc fix.
 -	(erc-track-faces-priority-list): Added `erc-button' to list.
 -	(erc-track-priority-faces-only): Doc fix.
 -
 -2006-01-09  Diane Murray  <disumu@x3y2z1.net>
 -
 -	* erc-button.el (erc-button-url-regexp): Use `concat' so the
 -	regexp is not one long line.
 -	(erc-button-alist): Fixed so that customizing works correctly.
 -	Reorganized.  Removed lambda functions with more than two lines.
 -	Doc fix.
 -	(erc-button-describe-symbol, erc-button-beats-to-time): New
 -	functions.  Moved from `erc-button-alist'.
 -
 -2006-01-07  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
 -	process if a SIGPIPE occurs.  This happens when a new message
 -	comes in at the same time a /quit is requested.
 -	(erc-process-sentinel): Use string-match rather than string= to do
 -	these comparisons.  Matching literal newlines makes me nervous.
 -
 -	* erc-track.el (erc-track-remove-from-mode-line): Handle case
 -	where global-mode-string is not a list.  Emacs22 permits this.
 -
 -    Copyright (C) 2006 Free Software Foundation, Inc.
 -  Copying and distribution of this file, with or without modification,
 -  are permitted provided the copyright notice and this notice are preserved.
 +;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496
diff --cc ChangeLog.01
index 7998938,0000000..99c34a2
mode 100644,000000..100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@@ -1,1046 -1,0 +1,1061 @@@
 +2001-12-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.176: * Added missing 747 numreply (banned)
 +
 +2001-12-15  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/scripts/install 1.4, debian/rules 1.6:
 +	updated to 2.1.cvs.20011215-1
 +
 +	* debian/changelog 1.12: Debian version 2.1.cvs.20011215-1
 +
 +2001-12-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.175:
 +	* applied a nicer version of mhp's patch to remove the last prompt from
 +	  saved logs
 +
 +	* erc-replace.el 1.1: * Initial checkin
 +
 +2001-12-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.174:
 +	* fixed bug triggered when reuse-buffer was enabled (the default).
 +	  Another silly port type problem. Maybe we should unify that once and for all sometimes...
 +
 +2001-12-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.173: * erc-message-english: New QUIT and s004 entries.
 +	* erc-save-buffer-on-part: New variable.
 +	* erc-kill-buffer-on-part: New variable.
 +	* (erc-server-PART): Use above variables.
 +	* (erc-join-channel): Use DEF argument instead of initial input for completing-read.
 +
 +2001-12-08  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.172: added defcustom erc-nick-uniquifier ^ (i prefer _)
 +
 +2001-12-07  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.11: changelog for version 2.1.cvs.20011208-1
 +
 +2001-12-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.171:
 +	Added erc-scroll-to-bottom as an erc-insert-hook function.  It still bugs a bit, so please test it, thanks
 +
 +2001-12-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.170: * Fixed silly bug in erc-server-TOPIC (thanks mhp)
 +
 +	* erc-speak.el 1.17:
 +	* Fix non-greedy matching bug. That one somehow swallowed text
 +
 +	* erc.el 1.169:
 +	Fix Emacs20 problem. For now, we disable erc-track-modified-channels-minor-mode in emacs20
 +
 +2001-12-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.5:
 +	* Fix another stupid one-off error. This time it really works!
 +	 (Until I find the next bug. I guess you can hold your breath) (-:
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.4: * Fixed static filling:
 +	** No more \ed (continued on next line) lines anymore
 +	** Fixed bug with previous version where longer lines wouldn't get
 +	   filled correctly (i.e. at all)
 +
 +2001-12-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.10: changelog for 2.1.cvs.20011206-1 added
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.168:
 +	* Don't discard away status when identifying to NickServ
 +	* Modify `erc-already-logged-in': check for port, too.
 +
 +	* erc-fill.el 1.3:
 +	* Fix stupid loop non-termination error in erc-fill-static when filling
 +	  one-line regions.
 +	* Make erc-count-lines return meaningful values
 +
 +2001-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.167:
 +	* (erc-process-input): Make ' /command' work for quoting /commands
 +
 +	* erc-speak.el 1.16: see changelog
 +
 +	* erc-fill.el 1.2: see erc.el changelog
 +
 +	* erc.el 1.166:
 +	* erc-insert-hook: Changed strategy completely, no start end parameters any more.
 +	We narrow-to-region now, thats much cleaner.
 +	* rename erc-fill-region to erc-fill and change the autoload
 +	** You'll probably need to restart Emacs
 +
 +2001-12-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.165:
 +	* (erc-send-current-line): Fixed long outstanding bug. XEmacs users with erc-fill-region on erc-insert-hook knew that one a long time.
 +
 +	* erc.el 1.164: fix order of attack
 +
 +	* erc.el 1.163: * macroexpanded define-minor-mode for XEmacs
 +
 +	* erc.el 1.162: First try to make channel tracking mouse sensitive
 +
 +	* erc.el 1.161: * More erc-message-format conversion.
 +	  erc-format-message-english-PART as an example on how to use functions to format message
 +	* (erc-format-message): Fallback mechanism to use english catalog if variable is not bound
 +
 +2001-12-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.160: * (erc-iswitchb): Rewrite, docfix.
 +	Make it use erc-modified-channels as default if available.
 +
 +	* erc-menu.el 1.2:
 +	* Fixage related to erc-track-modified-channels-minor-mode rewrite
 +
 +	* erc.el 1.159:
 +	* erc-track-modified-channels-minor-mode: Use buffer objects instead of erc-default-target return value for internal state keeping.
 +
 +	* erc.el 1.158: * Made reconnect behave nicer (erc-process-sentinel)
 +	* Rewrote erc-modified-channels-tracking completely.
 +	  Its now a minor mode (erc-track-modified-channels-minor-mode)
 +	  It uses a list as internal representation now, so all silly string-parsing
 +	  related bugs should be gone.
 +	  Use (erc-track-modified-channels-minor-mode t) now to toggle this functionality.
 +	  Dont set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
 +
 +2001-11-29  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.9: final version
 +
 +2001-11-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.157:
 +	* (erc-channel-p): Make it work with string and buffer as parameter. buffer.
 +	* (erc-format-message): Add a check for functionp. This allows a format-specifier also to be a function name, which gets called with args applied and needs to return the actual format string.
 +	* Converted some formats, JOIN, JOIN-you, MODE, ...
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.156:
 +	* (erc-prepare-mode-line-format): Added sanity checks to prevent it from having problems with server buffers where the connection failed
 +
 +	* erc-bbdb.el 1.7:
 +	* (erc-bbdb-JOIN): regexp-quote the fingerhost before searching, some people have really strange characters as their user names
 +
 +	* erc.el 1.155: Remove a stupid debug like (message ...) call
 +
 +2001-11-28  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.8: draft of 2.1.cvs.20011128-1
 +
 +	* debian/rules 1.5: simplify for the all-in-one erc package
 +
 +	* debian/control 1.3: integrated erc-speak back into erc
 +
 +	* debian/maint/conffiles 1.3, debian/maint/conffiles.in 1.2, debian/maint/postinst 1.3, 
 +	  debian/maint/postinst.in 1.2, debian/maint/prerm 1.3, debian/maint/prerm.in 1.2, 
 +	  debian/scripts/install 1.3, debian/scripts/install.in 1.3, debian/scripts/remove 1.3, 
 +	  debian/scripts/remove.in 1.2, debian/scripts/startup.erc-speak 1.2:
 +	since erc-speak is gone, resurrect the static files, and update them to support the latest erc
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.154: * (erc-mode): Shouldn't be interactive.
 +	* (erc-info-mode): Ditto.
 +
 +	* erc.el 1.153: * (erc-server-352): Added hopcount parsing.
 +	Added call to erc-update-channel-member to fill in channel-members information
 +	on /WHO if the channel is joined.
 +
 +2001-11-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.6: *** empty log message ***
 +
 +	* erc-speedbar.el 1.5: * (erc-speedbar-expand-user): New function.
 +	Used when more information than just the nick name is available about a dude.
 +
 +	* erc.el 1.152: * Fixed stupid edit,checkin,save cycle error :)
 +
 +	* erc.el 1.151:
 +	* (erc-generate-log-file-name-default): Renamed to -long
 +	Doc fix.
 +	* (erc-generate-log-file-name-old): Renamed to -long
 +	Doc fix.
 +	* erc-generate-log-file-name-function: Set default to ...-long
 +	Doc fixes
 +
 +	* erc-speedbar.el 1.4: *** empty log message ***
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.3: * Integrated channel names list
 +	  what else do we need to replace info buffers???
 +	  please test that code and comment on erc-ehlp, thanks
 +
 +	* erc-speedbar.el 1.2:
 +	* Added erc-speedbar-goto-buffer and therefore enable switching to the buffers from speedbar
 +
 +	* erc-speedbar.el 1.1:
 +	I had to check this in, it works !! sort of,, megaalphagammaversion, first version. test, play, submit ideas/patches
 +
 +2001-11-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.150 (erc-mode): moved erc-last-saved-position here
 +	moved buffer naming code from here..
 +	(erc): ...to here
 +	(erc-generate-log-file-name-old): only prepend target if it exists
 +
 +	made erc-log-insert-log-on-open a defcustom
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.149:
 +	* Applied antifuchs/mhp patches, the latest on erc-help, unmodified
 +	* New variable: erc-reuse-buffers default to t.
 +	* Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
 +	  then one can assume thats the same channel/query target again.
 +
 +2001-11-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.6:
 +	* new function erc-BBDB-NICK to handle nickname anotation on a nick-change event of a known record
 +
 +	* erc.el 1.148: * Remove erc-rename-buffer, its no longer necessary
 +	* Remove erc-autoop-*. it was broken, and needed rewrite anyway
 +	* write erc-already-logged-in in terms of erc-buffer-list and make the duplicate login check work again
 +
 +	* erc.el 1.147: * Fixed stupid typo
 +
 +2001-11-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.146: * New local variable, erc-announced-server-name
 +	* erc-mode-line-format supports a new symbol, target-and/or-server
 +	* The mode-line displays the announced server name now (for autojoin later..., 
 +	  greets Adam)
 +	* New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
 +	  Thanks go to the guy from #emacs who helped with that
 +	* erc-fill-region is now autoloaded from erc-fill.el
 +	  * erc-fill.el implements a new fill method, erc-fill-static
 +	    (setq erc-fill-function 'erc-fill-static)
 +	* Some other things I forgot right now
 +
 +	* erc-bbdb.el 1.5: *** empty log message ***
 +
 +	* erc-fill.el 1.1: Initial version.
 +
 +	* erc-complete.el 1.4:
 +	Applied antifuchs patch to make completion work with (string= erc-prompt "")
 +
 +	* erc-complete.el 1.3:
 +	added function erc-nick-completion-exclude-myself
 +	you can set erc-nick-completion to 'erc-nick-completion-exclude-myself to use it
 +
 +2001-11-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.4:
 +	* Changed usage of 'finger-host to bbdb-finger-host-field
 +
 +	* erc-bbdb.el 1.3:
 +	* Changed WHOIS to use finger-host instead of net field.
 +	* Added 'visible as option to erc-bbdb-popup-p to only pop-up the bbdb buffer if a join happened in a visible buffer on any visible frame.
 +	* Added (regexp-quote ...) for nickname search in erc-bbdb-JOIN
 +
 +2001-11-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.2: * Added JOIN support
 +
 +2001-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.145:
 +	Initial message catalog code. converted erc-action-format usage to use it
 +
 +	* erc.el 1.144: * erc-play-sound: Added XEmacs related check
 +
 +	* erc-bbdb.el 1.1: * Initial version, many thanks to Andreas Fuchs
 +
 +	* erc.el 1.143: * Fixed silly problem with whois/was handling
 +
 +	* erc.el 1.142: * Renamed prev-rd to erc-previous-read
 +	* Removed erc-next-line-add-newlines and s next-line-add-newlines to nil in defun erc by default
 +
 +	* erc.el 1.141:
 +	fixed xemacs compatibility prob with delete, thanks Adam
 +
 +2001-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.140: numreplies 301 & 461
 +
 +2001-11-13  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.139:
 +	Added code for error reply 421 "Unknown command", to test the new server parsing system.
 +	This was really easy!  Thanks ZenIRC guys & delysid :-)
 +
 +2001-11-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.138: * Allow connecting to SSL enabled irc servers.
 +	   Ugly hack, but it works for now. Be sure to use the numeric irc port 994 so that erc can recognize what you want
 +	  good example is
 +	irc server: ircs.segfault.net
 +	port: 994
 +
 +	meet me there, I am still delYsid :)
 +
 +	* erc.el 1.137: * some more numreply handlers
 +	* cleanup in erc-process-away-p
 +	* new function erc-display-error-notice
 +
 +	* erc.el 1.136: * numreply 501 and 221
 +
 +	* erc.el 1.135:
 +	removed obsolete old hook variables. Your functions may break, but it is easy to hook them up to the new hooks.
 +	erc-part-hook: use erc-server-PART-hook instead
 +	erc-kick-hook: use erc-server-KICK-hook instead
 +	and so on
 +
 +	* erc.el 1.134:
 +	fixed serious bug which cause privmsgs vanishing when erc-auto-query was set to nil
 +
 +	* erc.el 1.133: cleaned up erc-process-filter
 +
 +	* erc.el 1.132: * 401 and 320 numreplies implemented
 +
 +	* erc.el 1.131: * Removed old/now obsolete code
 +
 +	* erc.el 1.130: * Fixed bug in erc-server-MODE
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.129: fixed it
 +
 +	* erc.el 1.128:
 +	*** We switched over. New server message parsing/handling is running now. Thansk to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
 +
 +	* erc.el 1.127: *** empty log message ***
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.125:
 +	Fixed bug in erc-get-buffer, now channel names are compared in
 +	a case-insensitive way.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.124: erc-server-353
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.123: Fixed docstring for erc-get-buffer.
 +	Added erc-process to a lot of calls to erc-get-buffer, so
 +	that only the local process is searched.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.122: * erc-buffer-filter: do it differently
 +
 +	* erc.el 1.121: ugly but working fix for mhp's query problem
 +
 +	* erc.el 1.120: * erc-server-PRIVMSG-or-NOTICE
 +	  Now, all the server word replies are finished. Going to numreplies now
 +
 +	* erc.el 1.119:
 +	* debugging fascilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
 +
 +	* erc.el 1.118: * erc-server-KICK and erc-server-TOPIC. new functions
 +	* erc-server-305-or-306 and erc-server-311-or-314
 +
 +	* erc.el 1.117:
 +	* ported PART and QUIT msgs to the new scheme, many to go. but it is a easy task. does someone wanna try and start with numreplies?
 +
 +	* erc.el 1.116: * erc-server-JOIN
 +
 +	* erc.el 1.115: * Ported erc-server-INVITE code
 +
 +	* erc.el 1.114: * erc-server-ERROR and erc-server-MODE
 +
 +2001-11-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.113: * zen
 +
 +	* erc.el 1.112: * New variable erc-connect-function.
 +
 +	* erc.el 1.111:
 +	* New function erc-channel-p and use it where appropriate
 +
 +	* erc.el 1.110: * Removed the variable erc-buffer-list completely now
 +	* Moved erc-dbuf around a bit
 +
 +	* erc.el 1.109: * Fix silly change in quit/rename msg handling
 +
 +	* erc.el 1.108: thanks mhp, fixed
 +
 +	* erc.el 1.107: * Tijs van Bakel's work from 10th Nov. merged in
 +	* My additions to that idea merged in too
 +	Basicly, this is a major rewrite, if you are scared and want avoid problems,
 +	stay at your current version. It seems fairly stable though.
 +	That changed? erc-buffer-name handling was completely rewritten,
 +	and erc-buffer-list local variable handling removed.
 +	Simplifies alot of code. Poke at it. read the diff. report bug/send patches!
 +
 +	* erc.el 1.106: * Added variable listing when /set is used without args
 +
 +2001-11-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.105:
 +	* Comment/structure cleanup, removal of unnecessary code
 +
 +	* erc.el 1.104: only some code beautification
 +
 +	* erc-imenu.el 1.2:
 +	remove add-hook call, thats done in erc.el now for autoloadability
 +
 +	* erc.el 1.103: * Make erc-imenu autoloadable
 +
 +	* erc.el 1.102:
 +	* The long promised erc-mode-line-format handling rewrite
 +	   Poke at it, try it, play with it, report bugs
 +
 +	* erc.el 1.101:
 +	some regex-quote fixes, new function erc-cmd-set, and minor things
 +
 +2001-11-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.100:
 +	* added second timestamp-format (erc-away-timestamp-format) for marking msgs when being away
 +
 +	* erc-complete.el 1.2: fixed silly deffun
 +
 +	* erc.el 1.99: * Rewrote erc-load-irc-script (simplified)
 +	* Removed depricated code
 +
 +	* erc-speak.el 1.15: * reflect changes in erc.el
 +
 +	* erc.el 1.98:
 +	* Moved completion related functions into erc-complete.el
 +	  placed an autoload instead into erc.el. That quite cool,
 +	  because erc-complete.el only gets loaded when you use
 +	  TAB first time in erc.
 +
 +	* erc-complete.el 1.1: _ Initial checkin
 +
 +	* erc.el 1.97: * New function: erc-chain-hook-with-args
 +	* Changed calls to erc-insert-hook to use it
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.96: * Patch from Fabien Penso
 +	  Make completion case insensitive. try it! its cool
 +
 +	* erc.el 1.95: * Reduction patch 2
 +	  This time, we move the input ring handling into erc-ring.el
 +	  Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
 +	  And remeber, that you dont need it if you dont use input ring :-)
 +
 +	* erc-ring.el 1.1: * Initial checkin
 +
 +	* erc.el 1.94: * The great reduction patch :-)
 +	  moved relevant function from erc.el to new file erc-menu.el and erc-imenu.el
 +
 +	* erc-imenu.el 1.1: nitial version
 +
 +	* erc-menu.el 1.1: * Initial version
 +
 +	* erc.el 1.93: * wording change suggested by Benjamin Drieu
 +
 +2001-11-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.92: Added Emacs version to /SV
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.91: * Hookification patch, read the diff
 +
 +	* erc.el 1.90: too tired for a changelog :)
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.89:
 +	* make erc-cmd-op and erc-cmd-deop take multiple nicknames as argument
 +
 +2001-11-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.7: sync
 +
 +	* debian/rules 1.4: fixed a typo: PKGDIR, not PKIDR
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.88:
 +	* Changed timestamping when away to use erc-timestamp-format and append the timestamp instead of prepending it..
 +	* minor cleanup, s/(if (not /(unless/ and thelike
 +
 +2001-11-06  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.87: Fixed OP and DEOP commands to return T.
 +	Added SV say-version command.
 +	Added erc-send-message utility function, but it's not used everywhere yet.
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.86: stupid delYsid, forgot require 'format-spec. good nite
 +
 +	* erc.el 1.85:
 +	* new variable erc-action-format. Some erc-notice-prefix fixes again
 +
 +	* erc.el 1.84: * erc-minibuffer-privmsg defaults to t
 +
 +	* erc.el 1.83:
 +	* Small fix in relation to the transition to erc-make-notice
 +
 +2001-11-05  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.82:
 +	Renamed erc-message-notices to erc-minibuffer-notice, and renamed erc-prevent-minibuffer-privmsg to erc-minibuffer-privmsg, inverting its functionality
 +
 +	* erc.el 1.81: Added support for channel names starting with & + and !.
 +	Also, many changes partially discussed on the mailinglist:
 +
 +		* erc.el (cl): Add requirement for cl package.
 +		(erc-buffer-list): Make this variable global again.
 +		(erc-default-face): Fix typo.
 +		(erc-timestamp-face): Add face for timestamps.
 +		(erc-join-buffer, erc): Add a 'bury option.
 +		(erc-send-action): Add timestamp.
 +		(erc-command-table): Add /CLEAR, /DEOP, /OP, /Q.
 +		(erc-send-current-line): Add timestamp.
 +		(erc-send-current-line): Add call to erc-insert-hook.
 +		(erc-cmd-clear): New command to clear buffer contents.
 +		(erc-cmd-whois): Fix cut'n'paste-o.
 +		(erc-cmd-deop): New command to deop a user.
 +		(erc-cmd-op): New command to op a user.
 +		(erc-make-notice): Moved a lot of duplicate code here.  Perhaps
 +		this should also be done for erc-highlight-error.
 +		(erc-parse-line-from-server): Now NOTICE will also open a new
 +		query, just as PRIVMSG.
 +		(erc-parse-line-from-server): Call erc-put-text-property on a
 +		channel message/notice first, before concatenating nick and
 +		timestamp &c.
 +		(erc-message-notices): Add option to display notices in
 +		minibuffer.
 +		(erc-fill-region): No longer strip spaces in front of incoming
 +		messages.
 +		(erc-parse-current-line): No longer strip spaces in front of text
 +		input by user.
 +
 +	Hopefully I didn't break too much :(
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.80:
 +	* New function erc-nickserv-identify-autodetect for erc-insert-hook. Added by default currently.
 +
 +	* erc.el 1.79:
 +	* Mini-fix in erc-process-num-reply (= n 353): Added @ as prefix character to make certain channels on opn work again nicely
 +
 +2001-10-31  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.6: updated to reflect changes
 +
 +	* debian/scripts/install.in 1.2:
 +	moved #PKGFLAG# before -f batch-byte-compile
 +
 +2001-10-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.78:
 +	Imenu fixed somehow, added IRC services interactive function for indentify to NickServ. Read the diff
 +
 +2001-10-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.5: sigh. -2
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.4: updated to reflect changes
 +
 +	* debian/rules 1.3: handle conffiles.in too
 +
 +	* debian/maint/conffiles.in 1.1: new file
 +
 +	* debian/maint/conffiles 1.2: superceded by conffiles.in
 +
 +	* debian/scripts/startup 1.2: superceded by startup.erc
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/startup.erc-speak 1.1: * Initial version
 +
 +	* debian/scripts/startup.erc 1.1: * Added and fixes minimal typo
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.3: updated to reflect changes
 +
 +	* debian/rules 1.2:
 +	modified to be able to build the erc-speak package too
 +
 +	* debian/control 1.2: added the new erc-speak package
 +
 +	* debian/README.erc-speak 1.1, debian/maint/postinst.in 1.1, debian/maint/prerm.in 1.1, 
 +	  debian/scripts/install.in 1.1, debian/scripts/remove.in 1.1:
 +	new file
 +
 +	* debian/maint/postinst 1.2, debian/maint/prerm 1.2, debian/scripts/install 1.2, 
 +	  debian/scripts/remove 1.2:
 +	removed, superceded by it's .in counterpart
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.77: * Fixed some defcustom :type 's
 +	* Added erc-before-connect hook which gets called with server port and nick.
 +	  Use this hook to e.g. setup a tunnel before actually connecting.
 +	  something like (when (string= server "localhost") ...)
 +
 +2001-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.76: * Patch by smoke: fix erc-cmd-* commands and add aliases
 +
 +2001-10-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.14:
 +	* Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
 +	  especially if you are on more than one channel simultaniously.
 +
 +	* erc.el 1.75:
 +	* Made the completion postfix customizable through erc-nick-completion-postfix
 +
 +	* erc-speak.el 1.13, erc.el 1.74:
 +	* Added erc-prevent-minibuffer-privmsg
 +
 +	* erc-speak.el 1.12:
 +	* Quickish hack to allow exclusion of timestamps from speaking. see erc-speak-filter-timestamps
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.11:
 +	* Removed now really obsolete code. Package size reduced by 50%
 +
 +	* erc-speak.el 1.10:
 +	* Very important fix! Now erc-speak is really complete. Messages dont get cut anymore. Be sure to use auditory icons, 
 +	  it's reallllly cool now!!!
 +
 +	* erc-speak.el 1.9: *** empty log message ***
 +
 +	* erc-speak.el 1.5: * Major simplification. depends on erc.el,v 1.73
 +	* Things removed, read diff
 +
 +2001-10-21  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.2: oops, silly typo
 +
 +	* debian/changelog 1.1, debian/control 1.1, debian/copyright 1.1, 
 +	  debian/maint/conffiles 1.1, debian/maint/postinst 1.1, debian/maint/prerm 1.1, 
 +	  debian/rules 1.1, debian/scripts/install 1.1, debian/scripts/remove 1.1, 
 +	  debian/scripts/startup 1.1:
 +	initial check-in
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.73:
 +	* Changed erc-insert-hook to get two arguments, START and END of the region
 +	  which got inserted. CAREFUL! This could break stuff, but it makes the hook
 +	  much more useable.
 +
 +	* erc.el 1.72:
 +	* Made erc-smiley a new option, currently set to t to showoff this feature. :)
 +
 +2001-10-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.71: * Add missing erc-mode-hook variable
 +	* Add smiley-support (preliminary test)
 +
 +2001-10-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.70:
 +	Replaced all occurences of put-text-property with a call to
 +	erc-put-text-property.
 +	(erc-put-text-property): New function.
 +	(erc-tracking-modified-channels): Moved to the front of the file such
 +	that it is already defined when the menu is being defined.
 +	(erc-modified-channel-string): Ditto.
 +
 +2001-10-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.69: Removed some commentary.  The wiki page is the place to
 +	put such information.
 +	(erc-fill-prefix): Doc change.
 +	(erc-notice-highlight-type): Doc change, now a user option.
 +	(erc-pal-highlight-type): Doc change, now a user option.
 +	(erc-fool-highlight-type): New option.
 +	(erc-keyword-highlight-type): New option.
 +	(erc-dangerous-host-highlight-type): New option.
 +	(erc-uncontrol-input-line): Doc change.
 +	(erc-interpret-controls-p): Doc change, now a user option.
 +	(erc-multiline-input): Doc change.
 +	(erc-auto-discard-away): Doc change.
 +	(erc-pals): Changed from string to regexp.
 +	(erc-fools): New option.
 +	(erc-keywords): Renamed from erc-highlight-strings.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-dangerous-hosts): Renamed from erc-host-danger-highlight.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-menu-definition): Added menu entries for fools, keywords and
 +	dangerous hosts.
 +	(erc-mode-map): Changed keybindings from C-c <plain ascii> to
 +	various C-c <C-ascii> combinations.
 +	(erc-dangerous-host-face): Renamed from erc-host-danger-face.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-fool-face): New face.
 +	(erc-keyword-face): Renamed from erc-highlight-face.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-parse-line-from-server): Fixed highlighting in the cases
 +	where (equal erc-pal-highlight-type 'all), added code to handle
 +	erc-fool-highlight-type, erc-dangerous-host-highlight-type
 +	(erc-update-modes): Replaced erc-delete-string with delete.
 +	(erc-keywords): Renamed from erc-highlight-strings, handle
 +	erc-keyword-highlight-type.
 +	(erc-delete-string): Removed.
 +	(erc-list-match): New function.
 +	(erc-pal-p): Use erc-list-match.
 +	(erc-fool-p): New function.
 +	(erc-keyword-p): New function.
 +	(erc-dangerous-host-p): Renamed from erc-host-danger-p, use
 +	erc-list-match.
 +	(erc-directed-at-fool-p): New function.
 +	(erc-add-entry-to-list): New function.
 +	(erc-remove-entry-from-list): New function.
 +	(erc-add-pal): Use erc-add-entry-to-list.
 +	(erc-delete-pal): Use erc-remove-entry-from-list.
 +	(erc-add-fool): New function.
 +	(erc-delete-fool): New function.
 +	(erc-add-keyword): New function.
 +	(erc-delete-keyword): New function.
 +	(erc-add-dangerous-host): New function.
 +	(erc-delete-dangerous-host): New function.
 +
 +2001-10-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.68: * irc vs ircd default port fixed
 +
 +	* erc.el 1.67: * Added topic-change to imenu
 +
 +	* erc.el 1.66: * More imenu spiffyness
 +
 +	* erc.el 1.65: * Added imenu support
 +
 +	* erc.el 1.64:
 +	* Fix to /topic to show topic instead of setting it to null :)
 +
 +2001-10-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.63: * First version of erc-rename-buffer
 +
 +	* erc.el 1.62: * more header-line tricks.
 +
 +	* erc.el 1.61:
 +	* Small fix to do erc-update-mode-line-buffer in erc-update-channel-topic
 +
 +	* erc.el 1.60: * Added erc-header-line-format
 +
 +2001-10-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.59: * mini-fix, add msgp to auto-query code
 +
 +	* erc.el 1.58: * Added command-names to completion (erc-command-table)
 +	* New variable erc-auto-query. When set, every arriving message to you
 +	will open a query buffer for that sender if not already open.
 +	* Compatibility function fo non-existing line-beginning|end-position functions in XEmacs.
 +
 +2001-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.57:
 +	* Removed alot of (progn ...) where they were not necessary
 +	* Changed some (if ...) without else part to (when ...)
 +	* Some (while ...) to use (dolist ...)
 +	* Fix for completion popup generating tracebacks.
 +	* New function erc-arrange-session-in-mulptiple-windows
 +	* Lots of other stuff, read the diff
 +
 +2001-10-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.56: * Added erc-kill-input and keybinding C-c C-u for it
 +
 +2001-10-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.55: * Another fix to nick-completion
 +	* Additional checks in erc-track-modified-channels
 +
 +2001-09-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.54: * Fixed completion (alex)
 +	  * Now popup buffer doesnt destroy your window configuration.
 +	* Fixed away handling (incomplete)
 +
 +2001-09-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.53: Fixed silly quoting-escape error
 +
 +2001-09-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.52: * Added auto-op support (unfinished)
 +	* Added erc-latest-version.
 +	* Added erc-ediff-latest-version.
 +
 +2001-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.51:
 +	* Minor menu additions (invite only mode is now a checkbox)
 +
 +2001-09-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.50:
 +	* Fix (erc-cmd-names): This should fix C-c C-n too, hoepfully it was the right fix and doesnt break anything else.
 +
 +	* erc.el 1.49: * Fixes XEmacs easymenu usage (2nd time).
 +
 +2001-09-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.48:
 +	* (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
 +
 +	* erc.el 1.47:
 +	* Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
 +	* Fix for custom problem with :must-match on XEmacs (thanks shapr)
 +	* Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
 +	* Fix for case-sensitivity problem with pals (they are now all downcased)
 +	* Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
 +	  instead of just displaying it in the minibuffer.
 +
 +2001-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.46: Updated erc-version-string
 +
 +	* erc.el 1.45: Version number change and last read-through...
 +
 +2001-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.44: Added some asterisks
 +
 +2001-08-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.43:
 +	Fixed hidden channel buffer tracking (sort of), now using switch-to-buffer for advice.
 +	This version is unofficially named 2.1prebeta1. Please test it and send
 +	fixes to various problems you may encounter so that we can eventually
 +	release 2.1 soon.
 +
 +2001-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.42:
 +	Added function erc-bol and keybinding C-c C-a for it (contributed by Benjamin Rutt <brutt@bloomington.in.us)
 +
 +2001-08-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.41:
 +	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesnt seem to work.
 +	Removed (nick -> #channel) from mode-line. (CLOSED) and (AWAY...) should still be displayed when appropriate
 +
 +2001-08-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.40:
 +	added local-variable channel-list in session-buffers and make /LIST use it.
 +	erc-join-channel can now do completion after /LIST was executed
 +
 +2001-08-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.39: Tweaked erc-join-channel and erc-part-from-channel
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.38: some more defcustom stuff
 +
 +	* erc.el 1.37: Patch from Henrik Enberg <henrik@enberg.org>:
 +	   Adds variables erc-frame-alist and erc-frame-dedicated-p.
 +
 +	* erc.el 1.36: fixed erc-part-from-channel
 +
 +	* erc.el 1.35:
 +	fixed match-string problem and added interactive topic setting function.
 +
 +	* erc.el 1.34: fixed silly string-match bug
 +
 +	* erc.el 1.33:
 +	Added erc-join-channel and erc-part-from-channel (interactive prompts), as well as keybindings. C-c C-j #emacs RET is now enough :)
 +
 +2001-07-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.32 (erc-display-line-buffer): Simplified filling.
 +	(erc-fill-region): New function.
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.31: Added redundancy check in output
 +
 +2001-07-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.30 (erc-send-action): Add text-property stuff.
 +	(erc-input-action): Removed text-property stuff.
 +	(erc-command-table): Corrected command for DESCRIBE.  Still
 +	doesn't work though.  No idea what it should do.  Looks like a no op.
 +	(erc-cmd-me): Doc change.
 +
 +2001-07-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.29:
 +	fixed one occurence of a setq with only one argument (XEmacs didnt like that)
 +
 +	* erc.el 1.28:
 +	Added erc-next-line-add-newlines customisation possibility.
 +
 +	* erc.el 1.27:
 +	added erc-fill-prefix for defining your own way of filling and fixed filling somehow
 +
 +	* erc.el 1.26:
 +	fixed small incompatibility in erc-parse-line-from-server at (and (= n 353) regexp
 +
 +2001-07-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.25:
 +	Added erc-filling and filling code to erc-display-line-buffer.
 +
 +2001-07-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.24 (try-complete-erc-nick): Make the ": " part of the
 +	expansion
 +
 +	* erc.el 1.23: require ring
 +
 +2001-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.22: *** empty log message ***
 +
 +2001-07-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.21: typo
 +
 +	* erc.el 1.20: ommit
 +	:wq
 +
 +2001-07-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.19 (erc-mode): Call erc-input-ring-setup.
 +	(erc-send-current-line): Call erc-add-to-input-ring.
 +	(erc-input-ring): New variable.  Currently not buffer local.
 +	(erc-input-ring-index): New variable.  Currently not buffer local.
 +	(erc-input-ring-setup): New function.
 +	(erc-add-to-input-ring): New function.
 +	(erc-previous-command): New function.
 +	(erc-next-command): New function.
 +	(erc-mode-map): Uncommented keybindings for erc-next-command and
 +	erc-previous-command.
 +
 +2001-07-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.18 (erc-highlight-strings): Removed debug message.
 +
 +	* erc.el 1.17 (erc-join-buffer): Changed default to 'buffer.
 +	(erc-join-info-buffer): Changed default to 'disable.
 +	(erc-nick-completion): Changed default to 'all.
 +
 +2001-07-04  uid31117  <uid31117@confusibombus>
 +
 +	* erc.el 1.16: Resolved...
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.15 (erc-highlight-strings): New option and new function.
 +	(erc-parse-line-from-server): Use it.
 +	Various empty lines removed.  Various doc strings fixed.
 +
 +	* erc.el 1.14: Removed more empty lines.
 +
 +	* erc.el 1.13 (erc-member-string): replaced by plain member
 +	Otherwise, lots of deleting of empty lines...  I'm not too happy with that
 +	but I feel better when the code is "cleaned up".
 +
 +2001-07-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.12: Ugly hack, but looks nicer when giving commands
 +
 +	* erc-speak.el 1.4: ugly hack, but looks nicer now
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.11 (try-complete-erc-nick): New function.
 +	(erc-try-complete-nick): New function.
 +	(erc-nick-completion): New option.
 +	(erc-complete): Call hippie-expand such that erc-try-complete-nick
 +	will be called eventually.  Based on erc-nick-completion
 +	try-complete-erc-nick will then complete on the nick at point.
 +
 +2001-07-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.10:
 +	Insert (erc-current-nick) instead of (erc-display-prompt). good night :)
 +
 +	* erc.el 1.9:
 +	small, but it was anoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
 +
 +2001-06-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.8: Use defface to define all faces.
 +	Removed some history from the commentary, as well as some other
 +	commentary editing.
 +
 +2001-06-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.7: hmm, defcustom for erc-user-full-name
 +
 +	* erc-speak.el 1.3, erc.el 1.6: *** empty log message ***
 +
 +2001-06-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.5: typo
 +
 +	* erc.el 1.4: Some more defcustom
 +
 +	* erc-speak.el 1.2: nothing, really
 +
 +2001-06-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.3: Some defcustom stuff. Still no defgroup though :)
 +
 +	* erc.el 1.2:
 +	Initial change to erc.el (2.0). Mainly list of ideas and features
 +	and syntax-table entries.
 +
 +	* erc-speak.el 1.1.1.1, erc.el 1.1.1.1: Initial Import
 +
 +	* erc-speak.el 1.1, erc.el 1.1: New file.
 +
 +    Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
diff --cc ChangeLog.02
index 2d55852,0000000..85be89c
mode 100644,000000..100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@@ -1,2607 -1,0 +1,2622 @@@
 +2002-12-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.398 (erc-split-command):
 +	Removed assignment to free variable "continue".
 +	(erc-strip-controls): New function.  Takes a string, returns the string with
 +	all IRC color/bold/underline/etc. control codes stripped out.
 +	(erc-interpret-controls): If variable erc-interpret-controls-p is nil, now
 +	uses erc-strip-controls to strip control codes.
 +	(erc-ctcp-reply-ECHO): Changed reference and assignment to free variable "s"
 +	into reference/assignment to "msg", which appears to be the original author's
 +	intent.
 +
 +	* erc-list.el 1.8 (erc-chanlist):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.
 +
 +	* erc-notify.el 1.10 (erc-notify-timer):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.  Also fixed a bug were variable
 +	erc-last-ison was being read from a non-server buffer (thus giving its default
 +	value instead of its per-server value).
 +
 +	* erc.el 1.397 (erc-once-with-server-event):
 +	This is now a function.  It was a macro with a
 +	bug (the call to gensym happened at byte-compile-time not macro-call-time).
 +	(erc-toggle-debug-irc-protocol): Now [return] is bound to this function in
 +	the *erc-protocol* buffer.
 +
 +2002-12-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.10 (erc-autoaway-idletimer): Doc,
 +	ref. erc-autoaway-use-emacs-idle.
 +	(autoaway): Doc, explain different idle definitions.  Reestablish
 +	the idletimer only when erc-autoaway-use-emacs-idle is non-nil.
 +	(erc-auto-set-away): Doc, ref erc-auto-discard-away.
 +	(erc-auto-discard-away): Doc, ref erc-auto-set-away.
 +	(erc-autoaway-use-emacs-idle): Doc, ref erc-autoaway-mode, and
 +	added a note that this feature is currently broken.
 +	(erc-autoaway-reestablish-idletimer): Doc.
 +	(erc-autoaway-possibly-set-away): Split test such that
 +	erc-time-diff is only computed when necessary, add a comment why
 +	erc-process-alive is not necessary.
 +	(erc-autoaway-set-away): Test for erc-process-alive.
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.9:
 +	Changed the order of defcustoms to avoid errors in the :set property
 +	of erc-autoaway-idle-seconds.
 +
 +2002-12-29  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.42:
 +	* (erc-track-get-active-buffer): remove superflous (+ arg 0)
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.8 (erc-autoaway): Moved the defgroup up to the
 +	top, before the define-erc-module call.
 +	(autoaway): Extended doc.
 +	(erc-autoaway-idle-seconds): Use a :set property to handle
 +	erc-autoaway-use-emacs-idle.
 +	(erc-auto-set-away): Set default to t.  Added doc strings where
 +	necessary, reformatted doc strings such that the first line can
 +	stand on its own.  This is important for the output of M-x
 +	apropos.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-auto.in 1.3:
 +	added (provide 'erc-auto), which is required for (require 'erc-auto) :)
 +
 +	* erc.el 1.396 (erc-display-prompt):
 +	Set the face property of the prompt to
 +	everything but the last character.
 +
 +	* erc.el 1.395 (erc-send-current-line):
 +	Check wether point is in the input line. If
 +	not, just beep and do nothing.
 +
 +2002-12-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.394 (erc-bol):
 +	Fixed bug when there is only a prompt, and no property
 +	change.
 +
 +	* erc.el 1.393 (erc-display-prompt): Rewrote using a save-excursion
 +	and erc-propertize.  No longer use a field for the prompt, but a
 +	plain text property called erc-prompt.
 +	(erc-bol): Use the erc-prompt text property instead of a field.
 +	Return point instead of t.
 +	(erc-parse-current-line): No need to call point here, then, since
 +	erc-bol now returns point.
 +
 +	* Makefile 1.11:
 +	make ChangeLog .PHONY, thus forcing it always to be rebuilt.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.392 (erc-log-irc-protocol):
 +	Removed check wether get-buffer-create
 +	    returned nil. "The value is never nil", says the docstring.
 +
 +	* erc.el 1.391: Day Of The Small Changes
 +
 +	(erc-display-prompt): Make the prompt 'front-sticky, which prevents it
 +	    from being modified. It *should* also make end-of-line move to the
 +	    end of the field (i.e. the end of the prompt) when point is at the
 +	    beginning of the prompt, but it doesn't. Dunno why. :(
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.10:
 +	Added "-f" to "rm" command in rule for target "realclean".
 +
 +	* erc.el 1.390:
 +	New function: erc-log-irc-protocol.  Consolidates nearly duplicate code
 +	from functions erc-send-command and erc-process-filter into one function.
 +
 +	* erc.el 1.389 (erc-toggle-debug-irc-protocol):
 +	Removed unneeded argument PREFIX and code
 +	which referenced it at end of function.
 +	(erc-send-command): Now we only append a newline to the logged copy
 +	of output protocol text if it doesn't have one.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.388 (erc-toggle-debug-irc-protocol):
 +	Display buffer if it's not shown
 +	    already, and use view-mode.
 +	(erc-toggle-debug-irc-protocol), (erc-send-command),
 +	    (erc-process-filter): inhibit-only t to insert into the
 +	    *erc-protocol* buffer (view-mode)
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.387 (erc-mode-map):
 +	Removed keybinding for erc-toggle-debug-irc-protocol.
 +	(erc-toggle-debug-irc-protocol): Now used erc-make-notice to propertize the
 +	face of the enabled/disabled messages in the *erc-protocol* buffer.
 +	(erc-send-command): Now outgoing IRC protocol traffic is logged too.
 +
 +	* erc.el 1.386:
 +	Added user-customizable variable erc-debug-irc-protocol.
 +	Added function erc-toggle-debug-irc-protocol.
 +	(erc-process-filter): Now supports IRC protocol logging.  If variable
 +	erc-debug-irc-protocol is non-nil, all IRC protocol traffic is appended
 +	to buffer *erc-protocol*, which is created if necessary.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.385 (erc-display-prompt):
 +	Don't make the prompt intangible; that didn't
 +	    make things that much better for the user, but confused ispell,
 +	    which checked the prompt when it should check the first word
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.4: fixed resolve's email add
 +
 +	* AUTHORS 1.3: added damien
 +
 +	* erc.el 1.384 (erc-truncate-buffer-on-save):
 +	Removed documentation that
 +	described behaviour now changed.  It used to say "When nil, no
 +	buffer is ever truncated."  This is no longer true; even when
 +	buffers are NOT truncated on save, they can be truncated, eg. by
 +	adding erc-truncate-buffer to the hook.
 +	(erc-logging-enabled): New function.
 +	(erc-current-logfile): New function.
 +	(erc): Use erc-logging-enabled and erc-current-logfile.
 +	(erc-truncate-buffer-to-size): Rewrote it, and made sure to use a
 +	(save-restriction (widen) ...) such that the truncation actually
 +	runs in the whole buffer, not in the last message only (as
 +	erc-insert-post-hook will do!).  This should fix rw's
 +	out-of-bounds error.
 +	(erc-generate-log-file-name-short): Made all but the BUFFER
 +	argument optional.  Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-generate-log-file-name-long): Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-save-buffer-in-logs): Use erc-logging-enabled and
 +	erc-current-logfile.  Doc: Mention erc-logging-enabbled.
 +
 +	(erc-encode-string-for-target): Only do the real work when
 +	featurep mule; else just return the string unchanged.
 +
 +2002-12-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.383:
 +	erc-encoding-default: check for (coding-system-p) for older emacs versions
 +
 +	* erc.el 1.382 (erc-connect): missing ()s added. "don't commit at 2am"
 +
 +	* erc.el 1.381 (erc-connect):
 +	check if (set-process-coding-system) is available before use
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.2: added franl
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.14 (pcomplete-parse-erc-arguments):
 +	Reworked, and fixed a bug that had
 +	caused completions to corrupt preceding text under some circumstances.
 +
 +	* erc.el 1.380 (erc-encoding-default): New.
 +	(erc-encode-string-for-target): Use it instead of a hard-coded ctext.
 +	(erc-encoding-coding-alist): Doc.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.379:
 +	Removed fix for bug 658552 recently checked-in, because it doesn't work.
 +
 +	* erc.el 1.378 (erc-kill-buffer-function):
 +	Removed check that connection is up
 +	before running erc-kill-server-hook hooks.  Those hooks should use
 +	erc-process-alive to avoid interacting with the process.
 +
 +	* erc.el 1.377:
 +	Fixed erc-send-current-line so it no longer assigns the free variable "s", and
 +	it doesn't move point to end-of-buffer in non-ERC buffers.  Fixed
 +	erc-kill-buffer-function so it doesn't run the erc-kill-server-hook hooks if the
 +	server connection is closed.  Fixed bug 658552, which is described in detail at
 +	http://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.376 (erc-cmd-SMV): Bug, now call erc-version-modules.
 +
 +	* erc-pcomplete.el 1.13 (erc-pcomplete-version): New.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el 1.12:
 +	Fix for bug where you could not complete a nick when there was text following
 +	the nick.
 +
 +2002-12-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.375 (erc-already-logged-in): Use erc-process-alive.
 +	(erc-prepare-mode-line-format): Use erc-process-alive.
 +	(erc-process-alive): Check erc-process for boundp and processp.
 +
 +	* erc.el 1.374 (erc-kill-buffer-function):
 +	Do not check wether the process is
 +	alive before running the hook, because there might be functions on
 +	the hook that need to run even when the process is dead.  And
 +	function that wants to check this, should use (erc-process-alive).
 +	(erc-process-alive): New function.
 +	(erc-kill-server): Use it.
 +	(erc-kill-channel): Use it.
 +
 +	* erc.el 1.373 (erc-kill-buffer-function):
 +	Reverted ignore-error change.
 +	ignore-error is dangerous because we might miss bugs in functions
 +	on erc-kill-server-hook.
 +
 +	* erc.el 1.372 (erc-kill-buffer-function): Use memq instead of member
 +	when checking process-status.  Added doc string with references to
 +	the other hooks.
 +	(erc-kill-server): Only send the command when the erc-process is
 +	still alive.  This prevents the error: "Process
 +	erc-irc.openprojects.net-6667 not running" when killing the buffer
 +	after having used /QUIT.
 +
 +2002-12-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.371 (erc-server-ERROR):
 +	Show the error reason, not only the originating host.
 +
 +	* erc.el 1.370 (erc-kill-buffer-function):
 +	(ignore-errors ...) in 'erc-kill-server-hook.
 +	    When the process for this server does not exist anymore, the hook
 +	    will cause an error, effectively preventing the buffer from being
 +	    killed.
 +
 +2002-12-24  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.9:
 +	Fixed erc-notify-timer so that it passes the correct nick to
 +	the functions on erc-notify-signoff-hook.
 +
 +2002-12-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.41: Doc
 +
 +	* erc-track.el 1.40 (erc-make-mode-line-buffer-name): Removed a
 +	superfluous if construct around erc-track-showcount-string.
 +	(erc-track-modified-channels): Use 1+.
 +	Plus some doc and comment changes.
 +
 +2002-12-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.369: Fix (erc-version) string
 +
 +2002-12-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.368:
 +	Removed unnecessary assignment to free-variable "p" in erc-downcase.
 +
 +	* erc.el 1.367:
 +	Now /PART reason strings are generated the same way /QUIT reason strings
 +	are generated (see variable erc-part-reason).  Also, when a server buffer
 +	is killed, a QUIT command is automatically sent to the server.
 +
 +	* erc.el 1.366:
 +	Changed erc-string-no-properties so that it is more efficient.  Now it uses
 +	set-text-properties instead of creating and deleting a temporary buffer.
 +
 +2002-12-21  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.365:
 +	erc-kill-input: added a check to prevent a (ding) and an error when
 +	    there's nothing to kill (thanks to Francis Litterio, franl on IRC)
 +
 +2002-12-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.364:
 +	AWAY notice duplication prevention. erc-prevent-duplicates now set to ("301") by default, and timeout to 60
 +
 +	* erc.el 1.363: erc-prevent-duplicates: New variable, see docstring
 +
 +2002-12-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.39:
 +	erc-track-modified-channels: Use cddr of cell for old-face. cdr of
 +	    cell is '(1 . face-name), i have no idea why :)
 +
 +2002-12-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.362 (erc-current-nick):
 +	check the server buffer is active before using
 +
 +	Also tabified and cleaned up some trailing whitespace
 +
 +2002-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.38: erc-track-count patch by az
 +
 +2002-12-14  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.361:
 +	last-peers: initialise to a cons. thanks to Francis Litterio
 +	    <franl@world.std.com> for the patch
 +
 +	* erc.el 1.360:
 +	erc-kill-channel-hook, erc-kill-buffer-hook, (erc-kill-channel):
 +	    both hooks now call erc-save-buffer-in-logs, so that query buffers are
 +	    saved properly now, and not just channel buffers.
 +
 +2002-12-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.37 (erc-unique-channel-names): Fix another #hurd
 +	vs. #hurd-bunny bug.
 +
 +	* erc-match.el 1.17 (match): No longer modify erc-send-modify-hook,
 +	since it does not work without a parsed text property, anyway.
 +	(erc-keywords): Allow cons cells.
 +	(erc-remove-entry-from-list): Deal with cons cells.
 +	(erc-keyword-p): Ditto.
 +	(erc-match-message): Ditto.
 +
 +	Moved nil to the beginning of the list, removed :tags for the
 +	-type variables:
 +	(erc-current-nick-highlight-type): Ditto.
 +	(erc-pal-highlight-type): Ditto.
 +	(erc-fool-highlight-type): Ditto.
 +	(erc-keyword-highlight-type): Ditto.
 +	(erc-dangerous-host-highlight-type): Ditto.
 +	(erc-log-matches-flag): Moved nil to the beginning.
 +
 +2002-12-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.359:
 +	erc-beg-of-input-line: Don't do (goto-char (beginning-of-line)), since
 +	    beginning-of-line always moves point and returns nil. Thanks to
 +	    franl on IRC for noting this.
 +
 +	* erc-stamp.el 1.20:
 +	erc-insert-timestamp-left, erc-insert-timestamp-right: Made the
 +	    timestamp a 'field named 'erc-timestamp. Now end-of-line and
 +	    beginning-of-line will move over the timestamp.
 +
 +2002-12-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.34 (erc-button-add-button):
 +	make the created button rear-nonsticky, to allow
 +	cutting and pasting of buttons without worrying about the button properties
 +	being inherited by the text typed afterwards.
 +
 +	* erc.el 1.358: save logfile when killing buffer
 +
 +2002-12-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.36 (erc-modified-channels-display): Reworked.
 +	(erc-track-face-more-important-p): Removed.
 +	(erc-track-find-face): Return only one face.
 +	(erc-track-modified-channels): Reworked.
 +	(erc-modified-channels-string): Changed from (BUFFER FACE...) to
 +	(BUFFER . FACE)
 +
 +	* erc-stamp.el 1.19 (erc-insert-timestamp-right): Do not assume
 +	erc-fill-column is available.
 +
 +2002-12-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.357:
 +	erc-ech-notices-in-minibuffer-flag, erc-minibuffer-notice: Clarified
 +	    the difference in the docstrings.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.356: erc-noncommands-list: added erc-cmd-SM and erc-cmd-SMV
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.355 (erc-cmd-SM): New.
 +	(erc-cmd-SMV): New.
 +
 +	* erc.el 1.354 (erc-modes): New.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.9:
 +	field-end: use (not (fboundp 'field-end)) instead of (featurep 'xemacs)
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.353 (erc-version-modules): New.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/changelog 1.19, debian/control 1.7, debian/scripts/startup.erc 1.3:
 +	debian release 3.0.cvs.20021208
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.352 (erc-split-command): Do the right thing with CTCPs.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.18: Be a bit more functional
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.8:
 +	XEmacs doesn't seem to have field-end, so we provide our own version here.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.9: Small fixes to debrelease target
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.351:
 +	make-obsolete-variable: xemacs doesn't have the WHEN parameter, remove it.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-imenu.el 1.5 (erc-create-imenu-index):
 +	Use (forward-line 0) instead of
 +	  (beginning-of-line) now, sine the latter ignores fields (used in the
 +	  prompt).
 +
 +	* erc.el 1.350:
 +	Rewrite of the prompt stuff to use a field named 'erc-prompt:
 +
 +	erc-prompt: Removed getter and setter functions. The properties were
 +	  already set (and overwritten) in erc-display-prompt.
 +	(erc-prompt): Add the trailing space here, not all over the code.
 +	(erc-display-prompt): Cleaned up a bit. The text-properties now are
 +	  valid on the whole prompt. Also, made the prompt 'intangible to
 +	  avoid confused users.
 +	(erc-bol): Now use the field 'erc-prompt for finding the prompt
 +	(erc-parse-current-line): Cleaned up considerably. Uses (erc-bol) now.
 +	(erc-load-irc-script-lines): Adjusted for the new (erc-prompt).
 +	(erc-save-buffer-in-logs): Adjusted for the new (erc-prompt).
 +
 +	* erc.el 1.349:
 +	erc-uncontrol-input-line: The comment said "Consider it deprecated",
 +	so I removed it now.
 +	erc-prompt-interactive-input: Marked obsolete as of 1.348
 +
 +	* erc.el 1.348:
 +	erc-smiley, erc-unmorse: Put at the end to separate it from the
 +	important parts of erc.el.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.17 (erc-insert-timestamp-right): New algorithm.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.347:
 +	last-peers, erc-message: Explained what last-peers is used for.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.3 (erc-cmd-PAGE): New function.
 +	(erc-ctcp-query-PAGE): Use the catalog entry for the message, too.
 +	(erc-ctcp-query-PAGE-hook): Added custom type.
 +	(erc-page-function): Changed custom type from ... function-item to
 +	... function.
 +	As well as doc strings.
 +
 +2002-12-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.2: provide feature at the end
 +
 +2002-12-06  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-nickserv.el 1.10:
 +	Added austnet in erc-nickserv.el (thanks to Damien Elmes
 +	<resolve@repose.cx>)
 +
 +2002-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.13: Add autoload cookie
 +
 +	* erc-speak.el 1.24: Small fix to make proper voice-changes
 +
 +2002-12-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-lang.el 1.1: New
 +
 +2002-12-03  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.346:
 +	erc-mode-map: Put back C-c C-p (PART) and C-c C-q (QUIT)
 +
 +2002-12-02  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.345:
 +	erc-insert-post-hook: Add :options erc-make-read-only, erc-save-buffer-in-logs
 +	erc-send-post-hook: Add :options erc-make-read-only
 +
 +	* erc.el 1.344: erc-insert-hook: Removed ("this hook is obsolescent")
 +	erc-insert-post-hook: Added :options '(erc-truncate-buffer)
 +
 +2002-12-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.343: Add missing requires
 +
 +2002-11-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.342 (erc-quit-reason-normal):
 +	Remove v before %s so it's "Version ..." not
 +	   "vVersion ..."
 +
 +2002-11-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.7 (erc-encode-coding-string): Add second argument
 +		coding-system, and for non-mule xemacsen, use a new defun instead
 +		of identity.
 +
 +	* erc.el 1.341:  (define-erc-module): Use the appropriate group.
 +	(erc-port): Changed custom type.
 +	(erc-insert-hook): Custom group changed to erc-hooks.
 +	(erc-after-connect): ditto
 +	(erc-before-connect): ditto
 +	(erc-disconnected-hook): ditto
 +
 +	* erc-button.el 1.33 (erc-button): New group, changed all custom groups
 +	from erc to erc-button, but left all erc-faces as-is.
 +
 +	* erc-track.el 1.35 (erc-track): New group, changed all custom groups
 +	from erc to erc-track.
 +
 +2002-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-macs.el 1.1:
 +	Macros for erc-victim handling.  Primary idea is to use setf and some fancy things to get nice syntax. have a look
 +
 +2002-11-26  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.340:
 +	pings, erc-cmd-PING, erc-ctcp-reply-PING, catalog entry CTCP-PING:
 +	Cleaned up. Removed buffer-local variable pings which stored a list of
 +	all sent CTCP PING requests. Now send our full time with the CTCP PING
 +	request and interpret the answer.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.339: nick-stk: replaced by the local variable current-nick.
 +
 +2002-11-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.338 (erc-send-command): Use erc-encode-string-for-target.
 +	(erc-encode-string-for-target): New.
 +
 +	* erc-compat.el 1.6 (erc-encode-coding-string): Add second argument
 +	coding-system, and for non-mule xemacsen, use a new defun instead
 +	of identity.
 +
 +	* erc-nickserv.el 1.9 (erc-nickserv-version): New.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* Makefile 1.8:
 +	UNCOMPILED: erc-chess.el depends on chess-network.el, which might not
 +	be installed. Don't compile it.
 +
 +	* erc.el 1.337:
 +	erc-mode-map: Added C-a as erc-bol (no reason why it shouldn't be),
 +	and removed C-c C-p (part channel) and C-c C-q (quite server) as these
 +	are a bit drastic in their consequences and easy to mistype.
 +
 +2002-11-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.34: erc-track-faces-priority-list: Extended list
 +
 +	* erc.el 1.336:
 +	channel-members: Updated docstring: We have a VOICE predicate, too.
 +
 +	* erc-track.el 1.33 (erc-unique-substrings):
 +	Don't shorten a single channel to "#", but
 +	always give at least 2 chars (except when there are no two chars).
 +
 +2002-11-23  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-nickserv.el 1.8:
 +	support for BrasNET. Thanks to rw on IRC for the settings.
 +
 +2002-11-23  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.335: (erc-default-recipients, erc-session-user-full-name)
 +		(nick-stk, pings, erc-announced-server-name, erc-connected)
 +		(channel-user-limit, last-peers, invitation, away, channel-list)
 +		(last-sent-time, last-ping-time, last-ctcp-time, erc-lines-sent)
 +		(erc-bytes-sent, quitting, bad-nick, erc-logged-in)
 +		(erc-default-nicks): Defvars.
 +
 +	* erc-compat.el 1.5: Switched tests to iso-8859-1 instead of latin-1.
 +
 +	* erc-compat.el 1.4 (erc-compat-version): New.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.334 (smiley): Smileys are a very small module, now.
 +
 +2002-11-22  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.333:
 +	erc-event-to-hook, erc-event-to-hook-name: eval-and-compile these,
 +	    since we need them in a macro. ERC now compiles again!
 +
 +	* erc-speak.el 1.23:
 +	erc-minibuffer-privmsg: Removed setting this variable to nil, since it
 +	    was removed from erc.el.
 +
 +	* erc.el 1.332 (erc-interactive-input-map): Added docstring.
 +	(erc-wash-quit-reason): Extended docstring.
 +	(erc-server-ERROR): Added docstring.
 +	(erc-server-321): buffer-local variable channel-list probably
 +	    shouldn't be renamed erc-channel-list - removed FIXME.
 +
 +	* erc.el 1.331: small cleanup.
 +	("was not used anymore" here means "not used in erc/*.el nor in
 +	fsbot", thanks to deego for checking that.)
 +
 +	erc-minibuffer-privmsg: Removed (was not used anymore)
 +	(erc-reformat-command): Removed (was not used anymore)
 +	(erc-strip-erc-parsed-property): Removed (was not used anymore)
 +	(erc-process-ctcp-response): Removed (replaced by ctcp-query-XXX-hook)
 +	(erc-send-paragraph): Removed ("Note that this function is obsolete,
 +	    erc-send-current-line handles multiline input.")
 +	(erc-input-hook): Removed ("This hook is obsolete. See
 +	    `erc-send-pre-hook', `erc-send-modify-hook' and
 +	    `erc-send-post-hook' instead.")
 +	(erc-message-hook): Removed ("This hook is obsolete. See
 +	    `erc-server-PRIVMSG-hook' and `erc-server-NOTICE-hook'.")
 +	(erc-cmd-default-channel): Removed ("FIXME: no clue what this is
 +	    supposed to do." - it was supposed to prepend the default channel
 +	    to a command before sending it. E.g. typing "/FOO now!" would send
 +	    the IRC command "FOO #mycurrentchannel now!")
 +
 +	* erc.el 1.330:
 +	erc-ctcp-query-PING: Send the whole argument back, not just the first
 +	number. This is required for many clients (e.g. irssi, BitchX, ...)
 +	which send their ping times in two different numbers for microsecond
 +	accuracy.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.32 (erc-track-shorten-function): Allow nil.
 +
 +2002-11-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.31 (erc-unique-channel-names): Fixed bug that appeared
 +	if one target name was a substring of another -- eg. #hurd and
 +	#hurd-bunny.  Added appropriate test.
 +
 +2002-11-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.30:
 +	erc-unique-channel-names: Don't take a substring of channel that could
 +	be longer than the channel, but at most (min (length candidate)
 +	(length channel). (thanks to deego for noticing this)
 +
 +2002-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.8: * (require pcomplete): Only when compiling.
 +
 +2002-11-19  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.29:
 +	erc-track-faces-priority-list: New variable, defines what faces will
 +	be shown in the modeline. If set to nil, the old behavior ("all")
 +	remains.
 +	erc-track-face-more-important-p: new function
 +	erc-track-find-face: new function
 +
 +2002-11-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-fill.el 1.20 (erc-stamp): Require it.
 +
 +	* erc-match.el 1.16 (away): devar for the compiler.
 +
 +	* erc-stamp.el 1.16 (stamp): Moved.
 +
 +	* erc.el 1.329 (erc-version-string): New version.
 +
 +	* erc-autoaway.el 1.7 (erc-autoaway-idletimer): Moved to the front of
 +	the file.
 +
 +	* erc-auto.in 1.2: (generated-autoload-file, command-line-args-left):
 +	Added defvar without value to silence byte compiler.
 +
 +	* Makefile 1.7 (realclean): renamed fullclean to realclean.
 +	(UNCOMPILED): New list, for erc-bbdb.el, erc-ibuffer.el,
 +	erc-speak.el.
 +	(SOURCE): Do not compile UNCOMPILED.
 +	(release): New target.
 +	(ChangeLog): New target.
 +	(todo): New target.
 +
 +	* erc-complete.el 1.12 (erc-match): Require it.
 +	(hippie-exp): Require it.
 +
 +	* erc-ezbounce.el 1.3 (erc): Require it.
 +
 +	* erc-imenu.el 1.4 (imenu): Require it.
 +
 +	* erc-nickserv.el 1.7 (erc-networks): Moved up.
 +
 +	* erc-notify.el 1.7 (pcomplete): Require it.
 +
 +	* erc-replace.el 1.5 (erc): Require it.
 +
 +	* erc-sound.el 1.3 (sound): Typo -- define-key in erc-mode-map.
 +
 +	* erc-speedbar.el 1.10 (dframe): Require it.
 +	(speedbar): Require it.
 +
 +	* erc-track.el 1.28 (erc-default-recipients): devar for the compiler.
 +
 +	* README 1.1: New file.
 +
 +2002-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.1: File needed for mkChangeLog
 +
 +	* mkChangeLog 1.1: Original code by mhp
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.32 (erc-button-list): Renamed to erc-list and moved
 +	to erc.el.
 +
 +	* erc.el 1.328 (erc-list): New.
 +
 +	* erc-track.el 1.27 (erc-make-mode-line-buffer-name): Simplified.
 +	(erc-modified-channels-display): Simplified.  Now works with all
 +	faces, and fixes the bug that when two faces where used (bold
 +	erc-current-nick-face), then no faces was added.
 +
 +	* erc-track.el 1.26: Lots of new tests.  Moved some defuns around in
 +	the file.
 +	(erc-all-channel-names): Renamed.
 +	(erc-all-buffer-names): New name, now include query buffers as
 +	well.
 +	(erc-modified-channels-update-inside): New variable.
 +	(erc-modified-channels-update): Use it to prevent running display
 +	if already inside it.  This prevented debugging of
 +	`erc-modified-channels-display'.
 +	(erc-make-mode-line-buffer-name): Moved.
 +	(erc-track-shorten-names): Don't test using erc-channel-p as that
 +	failed with query buffers.
 +	(erc-unique-substrings): Move setq i + 1 to the end of the while
 +	loop, so that start is used as a default value instead of start +
 +	1.
 +
 +2002-11-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.25:
 +	erc-unique-substrings: define this before using it in assert
 +
 +	* erc.el 1.327:
 +	with-erc-channel-buffer: Define *before* using this macro. This
 +	hopefully fixes a bug noted on IRC.
 +
 +	* erc-notify.el 1.6:
 +	erc-notify-signon-hook, erc-notify-signoff-hook: New hooks. They're
 +	even run when their name suggests!
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-list.el 1.7: Typo.
 +
 +	* erc-speedbar.el 1.9: Whitespace only.
 +
 +	* erc.el 1.326 (define-erc-module): Avoid defining an alias if name and
 +	alias are the same.
 +
 +	* erc-ibuffer.el 1.17: URL
 +
 +	* erc-imenu.el 1.3 (erc-imenu-version): New constant.
 +
 +	* erc-ibuffer.el 1.16 (erc-ibuffer-version): New constant.
 +
 +	* erc-ibuffer.el 1.15: File header, comments.
 +
 +	* erc-fill.el 1.19 (erc-fill-version): New constant.
 +
 +	* erc-ezbounce.el 1.2 (erc-ezb-version): New constant.
 +
 +	* erc-complete.el 1.11 (erc-complete-version): New constant.
 +
 +	* erc-chess.el 1.21 (erc-chess-version): New constant.
 +
 +	* erc-chess.el 1.20: Whitespace only.
 +
 +	* erc-bbdb.el 1.20 (erc-bbdb-version): Typo.
 +
 +	* erc-bbdb.el 1.19 (erc-bbdb-version): New constant.
 +	Lots of whitespace changes.  Changes to the header.
 +
 +	* erc-track.el 1.24 (erc-track-shorten-aggressively): Doc.
 +	(erc-all-channel-names): New function.
 +	(erc-unique-channel-names): New function.
 +	(unique-substrings): Renamed.
 +	(erc-unique-substrings): New name
 +	(unique-substrings-1): Renamed.
 +	(erc-unique-substring-1): New name.  Added lots of tests.
 +	(erc-track-shorten-names): Call erc-unique-channel-names instead
 +
 +	* erc-match.el 1.15 (match): Rewrote a as module.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-netsplit.el 1.6 (erc-netsplit-version): New.
 +	(netsplit): Defined as a module, replacing erc-netsplit-initialize
 +	and erc-netsplit-destroy.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.23 (erc-track-switch-buffer):
 +	define-erc-module defines erc-track-mode,
 +	not erc-track-modified-channels-mode.
 +
 +	* erc.el 1.325:
 +	Variables erc-play-sound, erc-sound-path, erc-default-sound,
 +	erc-play-command, erc-ctcp-query-SOUND-hook and functions
 +	erc-cmd-SOUND, erc-ctcp-query-SOUND, erc-play-sound, erc-toggle-sound
 +	moved to erc-sound.el
 +
 +	Variables erc-page-function, erc-ctcp-query-PAGE-hook and function
 +	erc-ctcp-query-PAGE moved to erc-page.el
 +
 +	* erc-page.el 1.1:
 +	erc-page.el: New file. CTCP PAGE support for ERC, extracted from erc.el.
 +
 +	* erc-sound.el 1.2:
 +	defin-erc-module: Typo. Autoload should do erc-sound-mode and "erc-sound".
 +
 +	* erc-sound.el 1.1:
 +	erc-sound.el: New file. Contains all the CTCP SOUND stuff from erc.el.
 +
 +	* erc.el 1.324 (erc-process-ctcp-request):
 +	Removed (old-style CTCP handling)
 +	(erc-join-autogreet): Removed (was broken anyways)
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.31 (erc-button-version): New constant.
 +
 +	* erc-button.el 1.30 (button): rewrote as a module.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.323: New functions:
 +	(erc-event-to-hook), (erc-event-to-hook-name): Convert an event to the
 +	corresponding hook. The latter only returns the name, while the former
 +	interns the hook symbol and returns it.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-replace.el 1.4:
 +	Practically total rewrite.  All smiley stuff deleted.
 +
 +	* erc-track.el 1.22 (track): typo.
 +
 +	* erc.el 1.322 (define-erc-module): Doc change.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.6: Changed to use define-erc-module.
 +
 +	* erc.el 1.321 (define-erc-module):
 +	Make the enable/disable functions interactive.
 +
 +	* erc.el 1.320 (erc):
 +	Don't use switch-to-buffer when we're in the minibuffer,
 +	because that does not work. Use display-buffer instead. This leaves
 +	two problems: The point does not advance to the end of the buffer for
 +	whatever reason, and after leaving the minibuffer, the new window gets
 +	buried.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.15 (stamp): Doc change.
 +
 +	* erc-stamp.el 1.14 (erc-stamp-version): New constant.
 +	(stamp): downcase alias name of the mode.
 +
 +	* erc.el 1.319 (define-erc-module): Added defalias option, renamed
 +	parameters again.
 +
 +	* erc-track.el 1.21: erc-track-modified-channels-mode is now only an
 +	alias to erc-track-mode.  Only erc-track-mode is autoloaded.
 +	(track): Rewrote call to define-erc-module.
 +
 +2002-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.5: * Spelling fix
 +
 +	* erc-fill.el 1.18: * Fix autoload definition for erc-fill-mode
 +
 +	* debian/control 1.6, debian/maint/postinst 1.4, debian/maint/prerm 1.4:
 +	* Remove /usr/doc -> /usr/share/doc link handling
 +
 +	* debian/changelog 1.18: * Sync with reality
 +
 +	* debian/scripts/startup.erc 1.2:
 +	* Add /usr/share/emacs/site-lisp/erc/ to load-path
 +	* (load "erc-auto")
 +
 +	* debian/README.Debian 1.4:
 +	* Info about the changes since last release updated
 +
 +	* erc-pcomplete.el 1.11: * Fix emacs/xemacs compatibility
 +
 +	* debian/scripts/install 1.10: * Dont compile erc-compat, fix ELCDIR
 +
 +	* debian/control 1.5: * Change maintainer field
 +
 +	* erc.el 1.318:
 +	* (defin-erc-module): Renamed argument mode-name to mname because silly byte-compiler thought we were talking about `mode-name'.
 +
 +	* Makefile 1.6: * Added debrelease target
 +
 +	* erc-bbdb.el 1.18, erc-pcomplete.el 1.10, erc-stamp.el 1.13, erc.el 1.317:
 +	* (define-erc-module): Added mode-name argument.
 +	* Converted erc-bbdb, erc-pcomplete and erc-stamp to new macro.
 +	* autoload fixes
 +
 +	* erc-bbdb.el 1.17:
 +	* Create a global-minor-mode (i.e., make it a proper erc-module)
 +
 +	* erc.el 1.316: * (define-erc-modle): New defmacro
 +
 +2002-11-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.5 (erc-autoaway-idle-seconds):
 +	t in docstrings should be non-nil
 +
 +2002-11-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, 
 +	  erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20:
 +	Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
 +
 +	* erc-stamp.el 1.12 (erc-insert-away-timestamp-function):
 +	New custom type.
 +	(erc-insert-timestamp-function): New custom type.
 +
 +	* erc-fill.el 1.16 (erc-fill-function): Doc, new custom type.
 +	(erc-fill-static): Doc.
 +	(erc-fill-enable): New function.
 +	(erc-fill-disable): New function.
 +	(erc-fill-mode): New function.
 +
 +	* erc-match.el 1.13 (erc-match-enable): add-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +	(erc-match-disable): remove-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +
 +2002-11-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.3:
 +	- Added a way to use auto-away using emacs idle timers
 +	- Renamed erc-set-autoaway to erc-autoaway-possibly-set-away for consistency
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.315: erc-mode-map: Removed the C-c C-g binding for erc-grab
 +
 +	* erc.el 1.314:
 +	(erc-server-341) Another instance of the channel/chnl problem i didn't
 +	see last time
 +
 +2002-11-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.3 (erc-decode-coding-string): typo
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.313 (erc-server-341):
 +	variable name should be chnl not channel, as it is
 +	used this way in this function, and the other erc-server-[0-9]* use
 +	chnl too.
 +
 +	* erc-autoaway.el 1.2:
 +	Set back on all servers, not just the current one, since we're set
 +	away on all servers as well.
 +
 +	* HISTORY 1.2: Fixed typo (ngu.org => gnu.org)
 +
 +	* erc-autoaway.el 1.1, erc-fill.el 1.15, erc.el 1.312: erc-autoaway.el:
 +	* new file
 +
 +	erc.el:
 +	* Removed auto-discard-away facility (now included in erc-autoaway.el)
 +	* (erc-away-p): new function
 +
 +	erc-fill.el:
 +	* (erc-fill-variable): Check wether erc-timestamp-format is bound before
 +	                       using it (erc-fill.el does not require erc-stamp).
 +
 +2002-11-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* TODO 1.4:
 +	TODO: moved it to http://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO
 +
 +	* erc.el 1.311 (with-erc-channel-buffer): Rudimentary doc string.
 +
 +2002-11-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.28 (erc-nick-popup-alist): Made a defcustom.
 +
 +	* erc-button.el 1.27 (erc-button-disable): New function.
 +	(erc-button-enable): New function, replaces the add-hook calls at top-level.
 +	(erc-button-mode): New minor mode.
 +
 +2002-11-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.26 (erc-button-entry): Use erc-button-syntax-table.
 +
 +	* erc.el 1.310, erc-stamp.el 1.10: Doc changes.
 +
 +	* erc-match.el 1.12 (erc-match-mode): New function, replacing the
 +	add-hook.
 +	(erc-match-enable): New function.
 +	(erc-match-disable): New function.
 +	(erc-current-nick-highlight-type): Changed from 'nickname to 'nick
 +	to make it consistent with the others.
 +	(erc-match-message): Ditto.
 +
 +	* erc-button.el 1.25 (erc-button-syntax-table): New variable.
 +	(erc-button-add-buttons): Use it.
 +
 +2002-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.309:
 +	1) (bug) ERC pops up a new buffer and window when being messaged
 +	   from an ignored person. fixed
 +	2) (misfeature) ERC notices the user in the minibuffer when it
 +	   ignores something - this can get very annoying, since the
 +	   minibuffer is also visible when not looking at ERC buffers.
 +	   Added a customizeable variable for this, the default is nil.
 +	3) (wishlist) There is no IGNORE or UNIGNORE command.
 +	   Added.
 +	4) (wishlist) Some IRC clients, notably irssi, allow the user to
 +	   ignore "replies" to ignored people. A reply is defined as a
 +	   line starting with "nick:", where nick is the nick of an
 +	   ignored person. Added that functionaly.
 +	Done by Jorgen Schaefer <forcer@forcix.cx>
 +
 +2002-11-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.308 (erc-connect): set-process-coding-system to raw-text.
 +
 +2002-11-01  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-pcomplete.el 1.9, erc-stamp.el 1.9, erc-track.el 1.19:
 +	Fixed more autoloads
 +
 +	* erc-compat.el 1.2: Added autoload for erc-define-minor-mode
 +
 +2002-11-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.307: * (erc-send-command): will break long messages into
 +	a bunch of smaller ones, to prevent them from being truncated by the server.
 +	The patch also axes some trailing whitespace. :-) <resolve>
 +
 +2002-10-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.8 (erc-compat): Require.
 +	(erc-completion-mode): Use erc-define-minor-mode.
 +
 +	* erc-track.el 1.18 (erc-compat): Require.
 +	(erc-track-modified-channels-mode): Use erc-define-minor-mode.
 +
 +	* erc-stamp.el 1.8 (erc-compat): Require.
 +	(erc-timestamp-mode): Use erc-define-minor-mode.
 +
 +	* erc-compat.el 1.1: New file with the code for erc-define-minor-mode,
 +	erc-encode-coding-string and erc-decode-coding-string.  Essentially
 +	all the stuff that cannot be tested for using a simple boundp or
 +	fboundp -- eg. because the number of arguments are wrong.
 +
 +	* erc.el 1.306 (erc-compat): Require.
 +	(erc-process-coding-system): Moved to erc-compat.el.
 +	(erc-connect): Do not set-process-coding-system.
 +	(encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(decode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-decode-coding-string): Compatibility code moved to erc-compat.el.
 +
 +2002-10-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.305 (erc-display-line-1): Removed call to
 +	erc-decode-coding-string.
 +	(erc-parse-line-from-server): Added call to
 +	erc-decode-coding-string before anything gets parsed at all.
 +	(erc-decode-coding-string): Use undecided coding system.
 +
 +2002-10-24  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-button.el 1.24, erc.el 1.304:
 +	Added LASTLOG command and action for nick-button
 +
 +2002-10-22  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.7:
 +	Fixed nopruning bug, added /MODE channel (mode) [nicks...] completion - mode not completed yet.
 +
 +2002-10-16  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.6:
 +	Fixed 'Hi delysid:' bug in SAY completion after realizing that pcomplete on commands already took care of completing the initial nick:
 +
 +2002-10-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.5: update from sachac
 +
 +2002-10-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.303 (erc-emacs-time-to-erc-time): Catch when tm is nil.
 +
 +2002-10-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.302:
 +	* Fixed `erc-scroll-to-bottom' to scroll to the bottom even when
 +	  in the middle of a line. Might also fix the Magic ECHAN Bug[tm]. (-:
 +
 +2002-10-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.6: Fixed erc-networks for the opn->freenode change
 +
 +2002-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.4:
 +	Make erc-completion-mode work interactively with already joined channel buffers
 +
 +	* erc-chess.el 1.19: Add autoload cookies
 +
 +	* erc-notify.el 1.5: Add pcomplete support
 +
 +	* erc.el 1.301:
 +	Remove autoload statments, remove autoload cookie from erc-mode and erc-info-mode
 +
 +	* erc-fill.el 1.14, erc-match.el 1.11: add/remove autoload cookies
 +
 +2002-10-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.3 (erc-completion-mode): New global minor mode
 +	with autoload cookie.
 +	(erc-pcomplete-enable): Renamed erc-pcomplete-initialize.
 +	(erc-pcomplete-disable): New function.
 +
 +	* erc-complete.el 1.10: Doc changes.
 +
 +	* erc-stamp.el 1.7 (erc-stamp-enable): Renamed erc-stamp-initialize.
 +	(erc-stamp-disable): Renamed erc-stamp-destroy.
 +	(erc-timestamp-mode): Use new names.
 +
 +	* erc.el 1.300: Removed autload for erc-complete and
 +	erc-track-modified-channels-mode -- the autoload cookie should do
 +	that instead.
 +	(erc-input-message): Doc string, removed binding for erc-complete.
 +	(erc-mode-map): Removed binding for erc-complete.
 +
 +2002-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.4:
 +	New functions erc-notify-JOIN and erc-notify-QUIT to catch some common cases (warning, untested)
 +
 +2002-10-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.6 (erc-timestamp-mode): New function.  Removed call
 +	to erc-stamp-initialize at the end.
 +
 +2002-09-25  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.299:
 +	Added customizable `erc-process-coding-system' variable.
 +
 +2002-09-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-fill.el 1.13:
 +	`erc-fill-variable' now does the right thing when `erc-hide-timestamps' is non-nil
 +
 +2002-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.12:
 +	patch from Peter Solodov <peter@alcor.concordia.ca>  (note, its slightly broken still
 +
 +2002-09-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.2: Added LEAVE as alias for PART
 +
 +2002-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.1:
 +	By sachac (good work!) keep up doing such things
 +
 +2002-08-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.298:
 +	A fix for Bug#133267: now you can put (erc-save-buffer-in-logs) on erc-insert-post-hook to save *every* incoming message.
 +
 +2002-08-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.297:
 +	Changed default value of erc-common-server-suffixes because of the OPN
 +	name change
 +
 +2002-08-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.5: Try to reactivate isearch in xemacs
 +
 +	* erc-stamp.el 1.4:
 +	fixes issues related to comparative emacsology and a silly bug
 +
 +2002-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.296:
 +	New hook erc-send-completed-hook (for robot stuff), changed alexanders email address to reflect reality, little fix to erc-auto-query to get a bit of a speedup
 +
 +2002-08-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.23:
 +	Fixed case-fold-search (thanks sachac), now lambda works in erc-button-alist, added wardwiki+google+symvar+rfc+itime regexps from the wiki
 +
 +2002-08-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.22:
 +	erc-nick-popup-alist: New variable to make erc-nick-popup configurable
 +
 +2002-08-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.21 (erc-recompute-nick-regexp): Fixed regexp.
 +
 +	* erc-button.el 1.20 (erc-button-buttonize-nicks): Changed custom type
 +	to integer.
 +	(erc-button-add-buttons): Moved button removal code to new
 +	function.
 +	(erc-button-remove-old-buttons): New function.
 +	(erc-button-add-button): Removed use of overlays and used
 +	erc-button-add-face instead.
 +	(erc-button-add-face): New function to merge faces as text
 +	properties.  This should be much faster when lots of buttons
 +	appear.
 +	(erc-button-list): New helper function.
 +
 +	* erc.el 1.295 (erc-display-message): Fixed argument list.
 +	(erc-display-prompt): Reduced calls to length, use start-open
 +	property for XEmacs to prevent a little box of erc-prompt-face at
 +	the end of messages other people send.
 +	(erc-refresh-channel-members): Fix XEmacs calls to split-string,
 +	which may return an empty string at the end of the list.  This
 +	would cause hangups in erc-button in re-search-forward loops.
 +	(erc-get-channel-mode-from-keypress): Replaced control codes with
 +	octal escape sequences.
 +
 +2002-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.19:
 +	Try to be compatible to XEmacs regexp-opt. (Im going to quit this job if I find more of those damn differencies
 +
 +	* debian/README.Debian 1.3, debian/scripts/install 1.9:
 +	* Added info to README.Debian
 +	* Finished debian/scripts/install
 +
 +2002-08-13  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/install 1.8: First attempt to fix it
 +
 +	* debian/README.Debian 1.2, debian/changelog 1.17, debian/scripts/install 1.7:
 +	changelog: Changed maintainer and added new entry
 +	README.Debian: Re-explained the byte-compile issue
 +	scripts/install: Exclude erc-bbdb|chess|ibuffer|speedbar from
 +	byte-compiling
 +
 +	* erc-track.el 1.17: Added C-c C-SPC in addition to C-c C-@
 +
 +	* erc-notify.el 1.3: Little docstring change
 +
 +2002-08-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.3:
 +	Change one use of set-text-properties to add-text-properties (tnx Lathi)
 +
 +2002-08-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.2: added erc-timestamp-only-if-changed-flag
 +
 +2002-07-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.294:
 +	Removed timestamp related code and moved into erc-stampe.l
 +
 +	* erc-stamp.el 1.1:
 +	Timestamping code moved out of erc.el. Additional, now we can timestamp either on the left or on the right side
 +
 +2002-07-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.293:
 +	* Make ctcp ping return its message in the active buffer, instead of the server buffer
 +	* Corrected minimal typo in catalog
 +	* Added var and variable as alias for /set
 +
 +2002-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.16:
 +	* New function erc-track-switch-buffer (by resolve)
 +	  Bound to C-c C-SPC, enjoy!
 +
 +2002-07-08  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.16: New snapshot deb
 +
 +	* debian/scripts/install 1.6: Rewrote in make.
 +	Does not byte-compile erc-speak.el at all, and excludes erc-track.el too, if
 +	ran for xemacs.
 +
 +	* debian/control 1.4: Added dependency on make
 +
 +	* debian/copyright 1.2: Updated copyright info
 +
 +	* debian/rules 1.10: Use $(wildcard *.el) instead of a hardcoded list
 +
 +2002-07-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.292:
 +	erc-iswitchb now works correctly if erc-modified-channels-alist is non-nil
 +
 +2002-07-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.8:
 +	* changed how we check if we should activate "Track hidden channels" and
 +	  whether it should be selected - fixes a bug Xemacs where whole menu bar
 +	  does not work if menu is loaded
 +
 +	* erc-menu.el 1.7:
 +	* added "Disconnect from server", only selectable if erc-connected is non-nil
 +
 +	* topic is allowed to be set by normal users if channel mode is not +t
 +
 +	* add " ..." after description if arguments needed after selecting menu item
 +
 +	* only allow selecting of menu points needing a channel if current buffer is
 +	  a channel buffer - done by testing if channel-members is non-nil
 +
 +	* put erc-match functions in new group "Pals, fools and other keywords"
 +
 +	* erc.el 1.291:
 +	* moved definition of erc-show-my-nick to GUI variables section
 +
 +	* erc-connected variable now defined with defvar
 +	  now set in channel and query buffers, was only in server buffer before
 +	  upon disconnect, set erc-connected to nil in all the server's buffers
 +
 +	* added erc-cmd-GQUIT and its alias erc-cmd-GQ - quit all servers at once
 +
 +	* added interactive function erc-quit-server, bound to C-c C-q
 +
 +	* added erc-server-WALLOPS
 +
 +	* added WALLOPS to english catalog, fixed s461 (was showing message twice)
 +
 +	* typo fixes, spacing change
 +
 +2002-06-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.290: Use pp-to-string in /set (without args)
 +
 +	* erc-netsplit.el 1.5:
 +	Make /set anonymous-lign set erc-anonymous-login, also report
 +	which var was set to which val.
 +
 +2002-06-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.6: added "Customize ERC"
 +
 +2002-06-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.289: New variable: erc-use-info-buffers, defaults to nil.
 +	  This prevents info-buffers from being created/updated.
 +	  Set to t if you use :INFO buffers.
 +	  (by rw)
 +	Delete (erc-display-prompt) from reconnect to avoid clutter
 +
 +2002-06-23  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.288:
 +	erc-get-channel-mode-from-keypress is now bound to C-c C-m
 +	erc-insert-mode-command is taken care of by this function as well
 +
 +2002-06-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.15:
 +	Fixed bug where buffer-names suddenly had text-properties.
 +
 +2002-06-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* Makefile 1.5: changed erc-auto.el to $(SPECIAL) in make fullclean
 +
 +	* Makefile 1.4: remove erc-auto.el on make fullclean
 +
 +2002-06-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.10: fixed spelling error
 +
 +	* erc-track.el 1.14, erc-match.el 1.9: * erc-match.el:
 +	  highlight current nickname in its own face (deactivated by default):
 +	  - added erc-current-nick-highlight-type, erc-current-nick-face,
 +	    erc-current-nick-p
 +
 +	* erc-track.el:
 +	  added support for erc-current-nick-face
 +
 +2002-06-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.287: * added beginning suport for 005 numerics:
 +	  - added buffer local variable erc-server-parameters
 +	  - added erc-server-005, which sets erc-server-parameters if the server has
 +	    used this code to show its parameters
 +
 +2002-06-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.286:
 +	* bugfix: when pasting lines with blank lines in between, remove the blank lines
 +	  but send the rest
 +
 +	* since we know the command, use it when checking what's in erc-hide-list
 +	  added check to erc-server-KICK
 +
 +	* added some blank lines for better readability
 +
 +2002-06-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.5 (erc-nickserv-alist): Fixed typo.
 +
 +2002-06-15  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.4 (erc-networks): Added doc string.
 +	(erc-nickserv-alist): Added doc string.
 +
 +2002-06-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el 1.4:
 +	fixed bug so that the prompt and command always get put at the end of the buffer
 +
 +2002-06-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.3: Added iip support.
 +	Added :type for erc-nickserv-passwords custom.
 +	Fixed hook usage.
 +
 +2002-06-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.2: * added GalaxyNet
 +
 +	* erc-nickserv-alist:
 +	  - sorting networks alphabetically
 +	  - added two more pieces of information in erc-nickserv-alist:
 +	    word to use for identification and whether to use the nickname
 +
 +	* erc-current-network:
 +	  - made regex case insensitive, downcase server to match
 +	  - uses the new information
 +	  - now uses new variable erc-networks instead of doing checking manually
 +
 +	* added variable erc-networks
 +
 +	* fixed some indentation, documentation
 +
 +2002-06-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.285: Fix for kill-buffer hook stuff
 +
 +2002-06-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.284: Added /squery command
 +
 +2002-06-06  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.5: * made group Channel modes
 +	  - moved change mode and invite only mode to here
 +	  - added secret, moderated, no external send, topic lock, limit, key
 +
 +	* check that user is in a channel buffer and user is a channel operator
 +	  for all op-related actions
 +
 +	* "Identify to nickserv" needs erc-nickserv-identify defined
 +
 +	* added "Show ERC version"
 +
 +	* erc.el 1.283:
 +	* added erc-set-channel-limit, erc-set-channel-key, erc-toggle-channel-mode
 +
 +	* added erc-get-channel-mode-from-keypress, which is binded to C-c m
 +	  sends the next character which is typed to one of the 3 new functions
 +	  - did not remove erc-invite-only-mode and it's key binding in case
 +	    people are used to it, although it probably should be removed...
 +
 +	* in erc-server-MODE:
 +	  added check if tgt equal to user's nick
 +	  removed erc-display-line, only using the erc-display-message
 +
 +	* added s461 to english catalog
 +
 +	* fixed bug where Xemacs would not quit if erc-quit-reason was
 +	  set to erc-quit-reason-various and assoc-default was not defined
 +
 +2002-06-04  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-ezbounce.el 1.1, erc-match.el 1.8:
 +	* erc-ezbounce.el: Added. Provides support for ezbouncer; automatic login,
 +	                   session management implemented. I've contacted the author
 +			   about stuff in EZBounce's logging.
 +	* erc-match.el: Fixed a stupid mistake where
 +	                "*** Your new nick is <foo>" would trigger an error.
 +
 +2002-06-04  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.1, erc.el 1.282: * added erc-nickserv.el
 +	* moved nickserv identification variables and functions to the new file
 +	  (require 'erc-nickserv) is now necessary for this to work
 +
 +	* erc.el 1.281:
 +	* results of /COUNTRY now formatted as notice; errors are ignored, 
 +	  fixing
 +	  bug which made prompt disappear
 +
 +	* added undefined-ctcp error message to english catalog
 +
 +	* changed some (when (not erc-disable-ctcp-replies) to use unless instead
 +	  and some if's without else statments to use when or use
 +
 +	* CTCP replies now use erc-display-message, formatted as notices
 +
 +	* added following to english catalog:
 +	  - undefined-ctcp
 +	  - CTCP-CLIENTINFO, CTCP-ECHO, CTCP-FINGER, CTCP-PAGE, CTCP-PING,
 +	    CTCP-SOUND, CTCP-TIME, CTCP-UNKNOWN, CTCP-VERSION
 +	  - s303, s305, s306, s353
 +
 +	* split erc-server-305-or-306 into erc-server-305 and erc-server-306
 +
 +	* KICK already had buffer set, using it
 +
 +	* erc.el 1.280:
 +	* erc-format-timestamp now only called from erc-display-message and
 +	  erc-send-current-line
 +
 +	* all instances of erc-display-line with erc-highlight-error
 +	  changed to use erc-display-message
 +
 +	* added following error messages to english catalog:
 +	  bad-ping-response, bad-syntax, cannot-find-file, cannot-read-file,
 +	  ctcp-request, flood-ctcp-off, flood-strict-mode, no-default-channel,
 +	  no-target, variable-not-bound
 +
 +	* added following server related messages to english catalog:
 +	  s324, s329, s331, s332, s333, s341, s406, KICK, KICK-you, KICK-by-you, MODE-nick
 +
 +	* ignoring server codes 315, 369
 +
 +	* added erc-server-341, erc-server-406
 +
 +	* channel topic and mode notices displayed in respective channel buffers if they
 +	  exist
 +
 +	* erc-server-KICK: display the message before removing this channel so that we
 +	  can track the kick
 +
 +	* send parsed to erc-ctcp-query-ACTION-hook so that actions can be checked
 +	  by erc-match
 +
 +	* fixed bug where nil was shown if no reason was given by users on /PART
 +
 +2002-06-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.7:
 +	* fixed bug where erc-log-matches produced an error when the value of
 +	  (erc-default-target) was not a channel
 +	* use erc-format-timestamp, if it's non-nil, for %t in erc-log-match-format
 +
 +2002-06-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el 1.18:
 +	* made action case insensitive in erc-nick-popup and added a more descriptive
 +	  error message
 +
 +2002-05-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.279:
 +	Removed multiple calls of `erc-prompt' in `erc-display-prompt'
 +
 +2002-05-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.278:
 +	First step timestampkiller cleanup. I'm tired, do the rest tomorrow.
 +
 +	* erc.el 1.277:
 +	New functionality: Catch channel/server buffer kills through kill-buffer-hook.
 +	Currently, it only does a PART if you kill a channel buffer.
 +
 +2002-05-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.276:
 +	defvar'ed some buffer-local variables to make elint at least a bit more happy.
 +	  Moved comments into docstrings.
 +	Changed some instances of member to memq.
 +
 +	* erc-track.el 1.13, erc.el 1.275:
 +	erc.el: (erc-message-type-member): New function, used to test
 +	for message type. Require erc-parsed text-property.
 +	erc-track.el: erc-track-exclude-types: New variable. Defaults to ("JOIN" "PART") right now for testing, it should eventually set to nil soon again.
 +	(erc-track-modified-channels): Use above fun and var to optionally exclude certain message types from channel tracking.
 +
 +2002-05-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* CREDITS 1.5: added myself, vain as it sounds ;)
 +
 +2002-05-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.274: * Some small docstring fixes
 +	* (erc-display-line): Now takes also a process object in the buffer argument.
 +	  Used for easy sending to the server buffer.
 +	* Several places: Just pass proc, not (process-buffer proc)
 +
 +2002-05-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.273: Mostly docstring fixes/additions
 +
 +	* erc-netsplit.el 1.4: Doc fixes, and a new netjoin-done message.
 +
 +	* erc-fill.el 1.11: Doc fixes, erc-fill custom group, autoloads.
 +
 +	* erc-netsplit.el 1.3: Fix to erc-netsplit-timer.
 +
 +	* erc-netsplit.el 1.2: Fixed a silly typo
 +
 +	* erc-maint.el 1.1: is this really necessary?
 +
 +	* erc.el 1.272: Added new variable erc-hide-list.
 +	It affects erc globally right now, and is used to hide certain IRC type messages like JOIN and PART.
 +
 +	* Makefile 1.3: Doh, I should really test this before checkin :)
 +
 +	* Makefile 1.2: Silly cut&paste bug fixed
 +
 +	* erc-list.el 1.6: Added autoload cookie
 +
 +	* erc-match.el 1.6: Added missing require erc.
 +
 +	* erc-notify.el 1.2: Autoload cookies and a -initialize function.
 +
 +	* erc-chess.el 1.18: Added autoload cookies
 +
 +	* Makefile 1.1: Finally, we have a Makefile.
 +	Primarily used for autoload definition generation right now.
 +
 +	* erc-auto.in 1.1: First version.
 +
 +	* erc-track.el 1.12: Added autoload cookie
 +
 +	* erc-netsplit.el 1.1:
 +	New module, used to autodetect and hide netsplits.
 +	(Untested, no netsplit happened yet :) )
 +
 +	* erc-nets.el 1.3: Added some old code I once worked on.
 +	Added autoload cookie
 +
 +2002-05-24  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.10:
 +	removed reference in documentation to old variable, changed it to the new one
 +
 +	* erc.el 1.271:
 +	* added new function erc-connection-established which is called after receiving
 +	  end of MOTD (does nothing if it's been called before)
 +
 +	* added new hook erc-after-connect which is called from
 +	  erc-connection-established with the arguments server (the announced server)
 +	  and nick - which other arguments should be sent??
 +
 +	* added buffer variable erc-connected which is set to t the first time
 +	  erc-connection-established is called, set to nil again if we've been
 +	  disconnected
 +
 +	* set initial user mode
 +	  - added custom variable erc-user-mode which can be a string or a function
 +	    which returns a string
 +	  - new function erc-set-initial-user-mode gets called from
 +	    erc-connection-established
 +
 +2002-05-22  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.270: fixed bug where prompt was missing after reconnect
 +
 +2002-05-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.269:
 +	in erc-nickserv-identify: if network is unknown, just use "Nickserv"
 +
 +	* erc.el 1.268: * fixed some typos
 +
 +	* timestamping
 +	  - ctcp request messages and replies now have timestamp
 +	  - timestamps in front of error messages now in timestamp face
 +	  - added timestamp to more error messages
 +
 +	* ctcp reply messages, server ping message updated
 +
 +	* added variable erc-verbose-server-ping - check this instead of erc-paranoid
 +
 +	* added whowas on no such nick:
 +	  - added variable erc-whowas-on-nosuchnick
 +	  - in erc-server-401 do WHOWAS if erc-whowas-on-nosuchnick is non-nil
 +
 +	* erc.el 1.267: forgot documentaion for erc-nickserv-alist
 +
 +	* erc.el 1.266: NickServ identification changed and enhanced:
 +	- erc-nickserv-identify-autodetect now called from erc-server-NOTICE-hook
 +	- now possible to identify automatically without prompt:
 +	  - added custom variables erc-prompt-for-nickserv-password and
 +	    erc-nickserv-passwords
 +	- added erc-nickserv-alist containing the different networks' nickserv details
 +	- added function erc-current-network to determine the network symbol
 +	- fixed bug where identification on dalnet didn't work, because they now
 +	  require NickServ@services.dal.net
 +	  now sends to all NickServ with nick@server where possible
 +
 +2002-05-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.9:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +	* erc.el 1.265: erc.el:
 +	* fixed bug where topic wasn't being set when chanel name was provided
 +
 +	erc-fill.el:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +2002-05-16  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.264: whitespace fix
 +
 +2002-05-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.263:
 +	* added explanation of empty string working in erc-quit-reason-various-alist
 +	* removed the text property from erc-send-message, it caused problems
 +	  with /SV (as noticed by gbvb on IRC) and is obviously not needed
 +	* when receiving a ctcp query, convert type to uppercase to allow for
 +	  "/ctcp nick time" and not just "/ctcp nick TIME"
 +	* timestamp in front of server notices now shown in the timestamp face
 +
 +2002-05-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.262:
 +	- in erc-format-privmessage: `erc-format-timestamp' added to message after
 +	  message's text properties are applied so that it doesn't lose its face
 +
 +	- /quit without reason now works when `erc-quit-reason' is set to
 +	  `erc-quit-reason-various' and the empty string "" is defined in
 +	  `erc-quit-reason-various-alist'
 +
 +2002-05-13  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.16:
 +	* Applied Drewies patch to pop-up on nick changes when -popup-type is 'visible
 +
 +2002-05-12  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.15, erc.el 1.261:
 +	* erc-bbdb.el: pop up the buffer on /whois when erc-bbdb-popup-type is 'visible
 +	* erc.el: fix for empty quit reason problem by drewie.
 +
 +2002-05-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.260: disumu nick patch
 +	- added erc-show-my-nick (default t)
 +	  if t, show nickname like <nickname>
 +	  if nil, only show a > character before the message
 +	- added faces erc-nick-default-face and erc-nick-msg-face
 +	  - nicknames (channel, msgs, notices) are now in bold face by default
 +	  - the msg face matches the erc-direct-msg-face color
 +
 +2002-05-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.259 (erc-send-pre-hook): Doc change.
 +
 +	* CREDITS 1.4: Alexander L. Belikoff is confirmed original author.
 +
 +2002-05-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.258:
 +	timestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumu
 +
 +2002-05-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.257: *** empty log message ***
 +
 +2002-05-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.256:
 +	New var: erc-echo-notices-in-minibuffer-flag. defaults to t.
 +
 +2002-05-04  John Wiegley  <johnw@gnu.org>
 +
 +	* TODO 1.3: *** empty log message ***
 +
 +2002-05-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.255: Copyright notice, version string updates.
 +
 +2002-05-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.254: Comment: dme is David Edmondson
 +
 +2002-05-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.253 (erc-warn-about-blank-lines): New option.
 +	(erc-send-current-line): Use it.
 +	(erc-quit-reason-various-alist): New option.
 +	(erc-quit-reason): New option.
 +	(erc-quit-reason-normal): New function.
 +	(erc-quit-reason-zippy): New function.
 +	(erc-quit-reason-various): New function.
 +	(erc-cmd-QUIT): Use them.
 +
 +2002-04-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.252: Version 2.92
 +
 +	* erc.el 1.251 (erc-send-modify-hook): Default value is nil.
 +
 +2002-04-27  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.250:
 +	Don't redisplay the prompt if the ERC buffer is no longer alive.
 +
 +2002-04-26  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.249:
 +	Don't call `set-buffer' on old-buf unless the buffer is valid.  It's
 +	often not when separate frames are being used.
 +
 +2002-04-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.17: fixed up erc-nick-regexp
 +
 +2002-04-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.248:
 +	`erc-prompt' may now be a function that returns a string (which is
 +	used as the prompt). I don't use Customize but I think customization
 +	of it may be broken if it's not a string.
 +
 +	There is a new `erc-prompt' function that returns the prompt as a
 +	string (e.g., returning either the result of `(funcall erc-prompt)' or
 +	`erc-prompt').
 +
 +	This allows for dynamic prompts, such as a LispWorks-like prompt, or
 +	one containing simply the current channel name. It was requested by
 +	Mojo Nichols (nick michols) in #emacs today, 21-Apr-2002; cf. the
 +	#emacs logs at <URL:http://www.tunes.org/~nef/logs/emacs/02.04.21.
 +
 +2002-04-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.247:
 +	fix erc-send-current-line to work on empty lines again (without sending the prompt)
 +	Fix C-c C-t to not include the nick/time info
 +	(both from antifuchs)
 +
 +	* erc-complete.el 1.9: Fix for xemacs elt behaviour
 +
 +2002-04-17  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.17:
 +	Added a missing arg in a call to erc-chess-handler.
 +
 +2002-04-15  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.16: *** empty log message ***
 +
 +2002-04-14  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.15: *** empty log message ***
 +
 +2002-04-12  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.14: *** empty log message ***
 +
 +	* erc-chess.el 1.12: bug fixes
 +
 +	* erc-chess.el 1.11: *** empty log message ***
 +
 +2002-04-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.6: change order.
 +
 +	* erc-chess.el 1.5: more fixing.
 +
 +	Now, the 'match question works. It sends an accept back.
 +	But display popup doesnt work..
 +
 +	* erc-chess.el 1.4: fixup (still far from working)
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.246:
 +	* Added :options entry for erc-mode-hook (erc-add-scroll-to-bottom)
 +
 +2002-04-11  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.245: remove trailing \n from any sent text
 +
 +	* servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, 
 +	  erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, 
 +	  erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, 
 +	  erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 1.244:
 +	clean whitespace
 +
 +	* erc.el 1.243: Replaced erc-scroll-to-bottom.
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.10:
 +	try to fix behaviour when used with different frames.
 +
 +2002-04-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.2:
 +	fixup release, far from ready for real usage, but it appears to work.
 +
 +	* erc.el 1.242:
 +	speed improvments based on elp-instrument-package RET erc- RET results
 +
 +	* erc-chess.el 1.1: initial version.
 +	please test it
 +	Get chess.el from johnw's cvs:
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot login
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot co chess
 +
 +	(as usual, blank password)
 +
 +	Add the resulting dir to your load-path and reqire erc-chess.
 +
 +	Usage: Just do /chess nickname
 +	The remote end much use erc, as no other irc client I know of supports this ...
 +
 +	See erc-chess-default-display and maybe set it to chess-images or chess-ics1 if you prefer those over chess-plain.
 +	Also, see erc-chess-user-full-name to set the name you use in chess games.
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.241: New hackery latenightwise
 +
 +	* erc.el 1.240: upupadowndowncase
 +
 +2002-04-04  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.15: Updated for the new snapshot
 +
 +	* debian/rules 1.9: Install README.Debian into the package
 +
 +	* debian/README.Debian 1.1: Initial check-in
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.239:
 +	Fixed that /me in query buffers ended up in server buffer
 +
 +	* erc.el 1.238: * Implemented joining +k channels
 +
 +2002-03-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.237: New utility function: erc-channel-list
 +	minor fix to erc-get-buffer. hopefully that helps shapr
 +
 +2002-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.236:
 +	New /command: /QUOTE for sending directly to the IRC server
 +	Removed erc-fill from erc-insert-modify-hook. To activate filling, simply customize that var.
 +
 +2002-03-09  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.3: *** empty log message ***
 +
 +2002-03-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.7:
 +	New variable: erc-nick-completion-ignore-case. Defaults to t.
 +
 +	* erc-track.el 1.9:
 +	* erc-track-shorten-name-function can now be set to nil to avoid treating of channel names at all.
 +
 +2002-03-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.14, debian/rules 1.8: update to new snapshot
 +
 +2002-03-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.235:
 +	Fixed nasty bug which prevented channel limit from correctly display/handling
 +
 +	* erc-track.el 1.8: Made shortening code highly customizable.
 +	Now, there is the variable erc-track-shorten-function which holds
 +	a function which gets called with one argument, CHANNEL-NAMES, which is a list
 +	of strings of the channel names.
 +	It needs to return a list of strings of the same length with the modified values...
 +
 +	* erc-track.el 1.7:
 +	Added erc-track-shorten-aggressively, default to nil
 +	if it is set to t, erc will shorten a bit more.
 +	if nil, erc will shorten the name only if it would get shorter than just
 +	one char...
 +
 +	* erc-speak.el 1.21: added iirc to the abbreviation expansion list.
 +
 +	* erc-track.el 1.6:
 +	Added customization variable: erc-track-use-faces. defaults to t.
 +
 +	* erc-track.el 1.5: *** empty log message ***
 +
 +	* erc-track.el 1.4:
 +	experimental: Added face support to mode-line channel activity tracker.
 +	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal acitivity...)
 +
 +2002-03-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.6: * added docfixes (thanks ore)
 +
 +	* erc-track.el 1.3: Fixed channel-name reduction.
 +	thanks again alex.
 +	Renamed the vars to erc-track-opt-start and erc-track-opt-cutoff.
 +
 +	* erc.el 1.234: fixed another silly error
 +
 +	* erc-track.el 1.2: Implemented channel name shortening.
 +	Vars erc-track-cutoff says: all channel names longer than this will be shortened.
 +	Var erc-track-minimum-channel-length says: dont make names shorten than this.
 +	(Thanks go out to kensanata for the nice unique-substrings utility function).
 +
 +	* erc.el 1.233: silly typo corrected
 +
 +	* erc.el 1.232:	* erc.el 1.232: * New varialbe: erc-common-server-name-suffixes
 +	  This alist can be used to change the server names displayed in mode-line
 +	  to a shorter version..
 +	* New function: erc-shorten-server-name (uses var above)
 +	* Changed erc-prepare-mode-line to use erc-shorten-server-name.
 +
 +2002-02-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.231:
 +	CTCP handling rewritten. Seems to work. please test and report probs.
 +
 +2002-02-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.230:
 +	Fixed emacs20 backward compatibility (new defun/alias: erc-propertize)
 +
 +2002-02-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.15: *** empty log message ***
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.14, erc.el 1.229:
 +	minor fixup related to read-only prompts and command renaming.
 +
 +2002-02-21  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.228: * modify `erc-remove-text-properties-region' to work.
 +	  Could even be a little faster now. (-:
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ring.el 1.3:
 +	fixed erc-replace-command to behave right when text is read-only.
 +	Also, use erc-insert-marker and (point-max) now.
 +
 +	* erc.el 1.227: * Made erc-prompt read-only
 +	* new function: erc-make-read-only. Can be used on erc-insert-post-hook and erc-send-post-hook to ensure read-only buffer text too
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.4: added comment to docstring
 +
 +	* erc-speak.el 1.20: minor updates, use erc-nick-regexp now
 +
 +	* erc.el 1.226:
 +	ensure that erc-timer-hook is called inside the server-buffer.
 +
 +2002-02-19  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.4:
 +	* Probably fixed the "number-char-or-marker-p: nil" bug.
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.1: Initial release.
 +
 +	* erc.el 1.225: added #303 handling
 +	moved timer and added an arg (erc-current-time)
 +
 +	* erc-list.el 1.3, erc.el 1.224:
 +	slightly changed the erc-once-with-server-event macro
 +
 +	* erc-button.el 1.13: erc-button-alist: doc fix and custom type fix
 +
 +2002-02-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.2, erc.el 1.223: new macro: erc-once-with-server-event
 +	erc-list.el: use it
 +
 +	* erc-match.el 1.3:
 +	Minor fix related to hook call method change (-until-seccess now)
 +
 +	* erc.el 1.222: fixed ctcp behaviour abit (with auto-query on)
 +
 +	* erc-list.el 1.1: ChanList mode.
 +	Load it, and type M-x erc-chanlist RET
 +	Demonstrates how the new hook system can be nicely used.
 +
 +	* erc.el 1.221:
 +	new hook: erc-default-server-hook. This one gets called if we dont have anything defined for a certain IRC server message.
 +	New function: erc-default-server-handler. (used by above hook).
 +	New function: erc-debug-missing-hooks: Used by above hook to save a list of unimplemented server messages.
 +	New function: erc-server-buffer, erc-server-buffer-p.
 +	Various places: use it.
 +	Minor fixup.
 +
 +	* erc-button.el 1.12: fix regexp to not buttonize ~user@host hostnames
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.5, erc.el 1.220: Eliminated erc-command-table
 +	Upcased the command defuns (erc-cmd-join is now erc-cmd-JOIN)
 +	Fixed erc-complete to not require erc-command-table.
 +	Implemented erc-cmd-HELP
 +	  (You have to try that, its tooo coool!)
 +	  e.g. /help auto-q
 +	fixed autoloads for erc-add-pal and so on to be interactive.
 +
 +2002-02-17  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.2:
 +	* Fix unfunctional code in `erc-get-parsed-vector-type'.
 +
 +	* erc-bbdb.el 1.13, erc-button.el 1.11, erc-match.el 1.1, erc.el 1.219:
 +	* Be careful: MANY changes ahead. I won't go into too much details.
 +
 +	* erc.el, new file erc-match.el: split out all pattern-matching code.
 +	* erc.el: removed all defcusts for erc-{...}-highlight-props. They are
 +	  quite useless, anyway.
 +	* moved erc-add-entry-to-list and -remove- over to erc-match. changed
 +	  their arg list.
 +	* erc.el: add autoloads for erc-{add,delete}-{keyword,pal,fool,dangerous-host}
 +	* erc.el: erc-server-PRIVMSG-or-NOTICE:
 +	  - remove all the highlighting crap
 +	  - add a (when (eq s nil) ...) so that untreated CTCP messages don't
 +	    get misdisplayed.
 +	* erc.el: erc-mark-message: removed this function, it's useless
 +	* erc.el: minor bugfixes.
 +
 +	* erc-match.el: first checkin. This file now contains all the pattern
 +	  matching stuff. there is now another defcust group, erc-match,
 +	  containing all match related stuff (erc-keywords, ...)
 +	* erc-match.el: added functionality to log matching lines. Quite
 +	  customizable, check out the docstring of defun erc-log-matches
 +	* erc-match.el: added functionality to make foolish messages
 +	  invisible/intangible. This could replace erc-ignore-list
 +	  sometime. it's more powerful right now, anyway.
 +	* erc-match.el erc-text-matched-hook: new hook. run when Text matches
 +	  anything (pal, fool, etc.).
 +
 +	* erc-button.el: Make nick buttonization customizable.
 +	* erc-button.el: Give nick buttonization a lower priority so that it
 +	  does not break url buttons.
 +
 +	* erc-bbdb.el: Add \n to the separators by which we split nicknames.
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* TODO 1.2: Added item
 +
 +2002-02-17  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.2, erc.el 1.218: Added invisible timestamp support.
 +
 +2002-02-16  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.13, debian/rules 1.7, debian/scripts/install 1.5:
 +	updated to new snapshot
 +
 +2002-02-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.217:
 +	Fixed channel limit format overflow in mode-line display.
 +	(Having to use floats if integers are to large is quite strange, isn't it?)
 +
 +	* TODO 1.1: TODO list created.
 +	Add comments and expand it.
 +
 +	* erc.el 1.216:
 +	Fixed bug in query buffer handling (only happend in mixed-case situations)
 +
 +	* erc.el 1.215: shapr checkdoc patch #1
 +	massive docfixes! yay, keep going!
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.214: various other fixes
 +	make s301 a catalog entry
 +
 +2002-02-15  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.213: * erc-server-NICK and erc-server-INVITE: fixed to use
 +	  `erc-display-message'. These I missed in the first checkin.  I
 +	  didn't say it in the last log message, but please test these.
 +
 +	* erc-fill.el 1.7, erc.el 1.212:
 +	* erc.el: updated many functions to use `erc-display-message'. Now, we
 +	  should go for getting highlighting out of
 +	  erc-server-PRIVMSG-or-NOTICE. The part I want to attack has been
 +	  marked.
 +	* erc-fill.el: updated static filling to leave the erc-parsed property alone.
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.211:
 +	first step, new function: erc-display-message
 +
 +	* erc.el 1.210: added numreply 379 and 405.
 +
 +	* erc.el 1.209: stupid typo fixed
 +
 +	* erc.el 1.208:
 +	Finally renamed erc-frame-dedicated-p to erc-frame-dedicated-flag
 +	Removed usage of erc-interpret-controls from info buffer drawing (major speedup)
 +	Other speedups based on the results from elp.
 +	ERC is now about 300%-500% faster in some situations with very full channels!!!!!
 +
 +2002-02-14  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.207:
 +	* erc-downcase now downcases {}|^ with []\~ -- 'stolen' from zenirc.
 +	* various checkdoc fixes. Just the upper third of the file, but that
 +	  should help a little, too. (-: Again, if you have any writing
 +	  skills, take out that dusty keyboard and tap it to the beat of M-x
 +	  checkdoc!
 +
 +2002-02-14  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.206 (erc-format-privmessage):
 +	fix it, so timestamp-coloring works again (patch from antifuchs)
 +
 +2002-02-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.205: Many fixes based on M-x checkdoc RET.
 +	If you have write access, and some english knowledge, help document erc too!
 +	M-x checkdoc RET, and follow the instructions.
 +
 +	* erc-button.el 1.10, erc-ibuffer.el 1.13: minor fixes
 +
 +	* erc.el 1.204: Use nreverse instead of reverse.
 +	Use eq instead of equal where possible.
 +	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isnt good ina  defun which is called so often)
 +
 +2002-02-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.9, erc.el 1.203:
 +	In erc.el, new hook: erc-channel-members-changed-hook.
 +	erc-button.el: Now highlight all nicknames. uses regexp-opt.
 +
 +2002-02-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nets.el 1.1:
 +	Database of irc networks. Use erc-server-select to interactively select one.
 +
 +	* erc.el 1.202: * erc-format-nick-function: New variable.
 +	* (erc-format-nick): The default for above var. Just return the nick.
 +	* (erc-format-@nick): Prefix NICK with @ or + if OP or VOICE.
 +	* Removed erc-track-modified-channels related code and moved into erc-tracke.l
 +	   Its auto-loaded now
 +
 +	* erc-track.el 1.1: Split code from erc.el
 +
 +2002-02-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.12:
 +	* erc-target now uses erc-port-to-string
 +
 +	* servers.pl 1.1:
 +	Script to convert mircs servers.ini to a elisp salist kind of thing.
 +	(development tool, it doesnt help you much as a user)
 +
 +	* erc.el 1.201:
 +	* erc-display-line-buffer: renamed to erc-display-line-1
 +	* erc-port-equal: New function.
 +	* erc-normalize-port: Used by erc-port-equal
 +	* minor docstring fixes
 +
 +2002-02-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.200:
 +	* erc-already-logged-in-p: compare ports is more robust now.
 +
 +	* erc-button.el 1.8: * Add buttonization to erc-send-modify-hook, too
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.199:
 +	Use insert-before-markers instead of insert in erc-display-line-buffer
 +	This fixed point@column 0 problem and gives us some speedup! yay
 +
 +	* erc-ibuffer.el 1.11, erc.el 1.198: minor fixes
 +
 +	* erc.el 1.197:
 +	* (erc-line-beginning-position): Renamed to erc-beg-of-input-line.
 +	* (erc-line-end-position): Renamed to erc-end-of-input-line.
 +	* erc-multiline-input-p: Variable removed.
 +
 +	* erc.el 1.196:
 +	Minor docstring fixes (using M-x checkdoc-current-buffer)
 +	  If you find time, and you are native english speaker, do that too!!
 +
 +	* erc.el 1.195: fixed macro-invokation
 +
 +2002-01-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.194: * erc-with-all-buffers-of-server: use erc-list-buffers
 +	* erc-process-away, erc-{save,kill}-query-buffers: use it.
 +	* erc-cmd-away-all: new command. Set away/back on all servers.
 +
 +	* erc.el 1.193:
 +	* Fix last multiline bug in erc-send-distinguish-noncommands.
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.10, erc.el 1.192: minor fixes
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.9, erc-menu.el 1.3, erc-speak.el 1.19, erc.el 1.191:
 +	Renamed erc-track-modified-channels-minor-mode to erc-track-modified-channels-mode (at least, its a bit shorter)
 +	Added docstring to erc-server-hooks (through the macro)
 +	Minor docfix in obsolete hook
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.190:
 +	* erc-send-current-line: fix behaviour where buffer changes.
 +	* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
 +
 +	* erc-ring.el 1.2, erc.el 1.189:
 +	* new hooks: erc-send-pre-hook, erc-send-modify-hook, erc-send-post-hook
 +	* erc-send-this: new variable
 +	* erc-noncommands-list: new constant.
 +	* erc-send-distinguish-noncommands: use it. (First filter function for sending! yay!)
 +	* erc-send-current-line: nearly completely rewritten.
 +	  - now handles multiline input. (yay!)
 +	  - now uses the three hooks from above.
 +	* erc-process-line: new arg, no-command: don't process this line as a command.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.12, erc-button.el 1.7, erc-speak.el 1.18, erc.el 1.188:
 +	hook handling rewrite phase 1.
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.187: * Rework erc-server-PRIVMSG-or-NOTICE
 +	* New function: erc-is-message-ctcp-p
 +	* New function: erc-format-privmessage
 +	* New function: erc-mark-message
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* CREDITS 1.1, HISTORY 1.1:
 +	Initial checkin.
 +
 +2002-01-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.186: * erc-put-text-properties: make OBJECT optional
 +	* erc-put-text-property: same
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +	* Make erc-display-line-buffer: add the "\n" even when the string would be invisible.
 +	* same: make the \n invisible, too (:
 +
 +2002-01-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.8, erc.el 1.185:
 +	Rewrote channel tracking using window-configuration-change-hook instead of defadvices.
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.6, erc.el 1.184:
 +	* Macro define-erc-highlight-customization: Ease up defining
 +	  erc-{fool,pal,..}-highlight-props defcusts.
 +	* defcusts:
 +	  - erc-fool-highlight-props
 +	  - erc-pal-highlight-props
 +	  - erc-dangerous-host-highlight-props
 +	  - erc-keyword-highlight-props
 +
 +	  Customizable to either nil or "Hide message".
 +	* erc-string-invisible-p: check for invisible chars in string
 +	* erc-display-line-buffer: use it.
 +	* erc-put-text-properties: put a list of props into a piece of text.
 +	* erc-server-PRIVMSG-or-NOTICE: use it; set appropriate
 +	  highlight-props for entire incoming message. This set of changes
 +	  allows you to e.g. auto-ignore fools.
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.7:
 +	Added highlight detection support to the Mark column.
 +	Now p, k, f, and d indicate pal, keyword, fool and dangerous-host related activity.
 +
 +	* erc.el 1.183:
 +	Highlight tracking finished. All necessary info should now be in erc-modified-channels.
 +
 +	* erc.el 1.182, erc-ibuffer.el 1.6, erc-speedbar.el 1.7:
 +	Added highlight tracking to track-modified-channels
 +	   no display code yet, the info is just kept in erc-modified-channels
 +	Added erc-modified column to ibuffer
 +	speedbar update
 +
 +	* erc-ibuffer.el 1.5: Added erc-members column
 +
 +	* erc-ibuffer.el 1.4: *** empty log message ***
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.11:
 +	* Fix a slight typo. The hook function should be called in
 +	  erc-server-376-hook (-:
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.3: *** empty log message ***
 +
 +2002-01-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.2: Fixup, it sort of works now. Try it
 +
 +	* erc-ibuffer.el 1.1: Initial version
 +
 +2002-01-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.181: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.10: * fix two bad things:
 +	  - fix the "proc trick": pass proc as an arg through
 +	    ...-insinuate-... to ...-show-entry
 +	  - hook highlighting into the 376 hook. This one is bound to get
 +	    called (-:
 +	* We now only append to hooks only.
 +	* Highlighting of changing records gets updated automatically.
 +
 +2002-01-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.180: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.9: * nearly complete rewrite of erc-bbdb:
 +	  -  Removed code duplication in erc-bbdb-NICK and -JOIN.
 +	  -  Made erc-bbdb-show-entry more general and intelligent.
 +	  -  erc-bbdb-insinuate-entry is now erc-bbdb-insinuate-and-show-entry
 +	     (note the different arglist!):
 +	  -  erc-search-name-and-create now creates "John Doe" users if name
 +	     is not specified.
 +	  -  No sign of "mail" anywhere anymore. It's all finger-host. (-:
 +	  -  erc-bbdb-popup-p is now called erc-bbdb-popup-type.
 +	  -  New customize values:
 +	     . erc-bbdb-irc-channel-field     channel field name
 +	     . erc-bbdb-irc-highlight-field   (see below)
 +	     . erc-bbdb-auto-create-on-nick-p auto-create record on join
 +
 +	* Highlighting based on BBDB is now here! Specify which type of
 +	  highlighting a person in the BBDB (whose nick you know) and have
 +	  fun! Read help to erc-bbdb-init-highlighting for details. Changes:
 +	  -  new function erc-bbdb-init-highlighting: gets called on server
 +	     connect.
 +	  -  new function erc-bbdb-highlight-record: highlights a person's
 +	     nick names.
 +
 +2002-01-24  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-button.el 1.6:
 +	* Fix the erc-button-alist regexp for EmacsWiki stuff. delYsid's version
 +	  is better (-:
 +
 +	* erc-button.el 1.5: * Added an Ewiki: specifier to the url-regexp.
 +	  <nickname> EmacsWiki: EmacsIRCClient tells you <bla>
 +	  should highlight "EmacsWiki: EmacsIRCClient" and allow you to
 +	  browse to the wiki when the button is activated.
 +	* new custom: erc-emacswiki-url.
 +	* new function: erc-browse-emacswiki: use it.
 +
 +2002-01-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.8:
 +	erc-bbdb-NICK: Added regexp-quote around fingerhost search.
 +
 +2002-01-10  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.179:
 +	* Channel saving/killing on quit from server implemented:
 +	 - defcust erc-save-queries-on-quit: Save server's channel buffers on quitting from server
 +	 - defcust erc-kill-queries-on-quit: Kill server's channel buffers on quitting from server
 +	 - Macro erc-with-all-buffers-of-server: Run a form inside all the server's query buffers
 +	 - Functions erc-{kill,save}-query-buffers: use it.
 +	* Added indent-tabs-mode: t to Local Variables section.
 +
 +2002-01-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-replace.el 1.2: * fix stupid documentation errors.
 +
 +2002-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.178:
 +	* (toplevel): Revert previous change. This resulted ina  recursive load...
 +	   You have to put (require 'erc-button) into your .emacs for now
 +
 +2002-01-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.177:
 +	* Added require for erc-button. This is devel. so I need testers :)
 +
 +	* erc-button.el 1.4: * Added proper file headers (GPL).
 +
 +2002-01-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.3: * erc-button-alist: Added entry for finger
 +
 +	* erc-button.el 1.2: * Removed bogus usage of :button-keymap.
 +	P
 +	   Does anyone know what this was supposed to do anyway?
 +
 +	* erc-button.el 1.1: * Initial version.
 +	* This module allows a way of buttonizing text in IRC buffers.
 +	  Default it is used for URLs, but other things could be added.
 +	  see if you can find another use, erc-button-alist
 +
 +See ChangeLog.01 for earlier changes.
 +
 +    Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
diff --cc ChangeLog.03
index cf0f4f7,0000000..aade9cd
mode 100644,000000..100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@@ -1,2151 -1,0 +1,2166 @@@
 +2003-12-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.595 (erc-cmd-HELP):
 +	Changed to prefer giving help for erc-cmd-* functions over
 +	   similarly-named Elisp functions (e.g., erc-cmd-LIST vs. list).
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.594 (erc-query-buffer-p): Added this function.
 +
 +2003-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.593 (erc-cmd-SV): Use erc-emacs-build-time.
 +
 +	* erc-compat.el 1.15: erc-emacs-build-time: New variable.
 +
 +	* erc.el 1.592 (erc-cmd-SAY):
 +	Reintroduced the feature where the spaces between
 +	"/SAY" and the rest of the line were being sent with the message.
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.591 (erc-server-buffer-p):
 +	Fixed a bug where this function sometimes would return
 +	    nil when it should return t.
 +
 +2003-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.590 (erc-generate-new-buffer-name):
 +	Really fixed a bug where ERC would reuse
 +	    a connected server buffer when erc-reuse-buffers is non-nil.
 +	(erc-cmd-JOIN): Now we tell the user when he attempts to join the same
 +	    channel twice on the same server.
 +
 +	* erc.el 1.589 (erc-generate-new-buffer-name):
 +	Fixed a bug where ERC would reuse a connected server buffer when erc-reuse-buffers is non-nil.
 +
 +	* erc.el 1.588 (erc-cmd-SAY):
 +	Fixed a bug where the spaces between "/SAY" and the rest of the
 +	    line were being sent with the message.
 +
 +	* erc-list.el 1.15: Fixed another typo.
 +
 +	* erc-list.el 1.14: Fixed a typo.
 +
 +	* erc-list.el 1.13:
 +	Added text to the top of the channel list buffer describing the keybinding for
 +	function erc-chanlist-join-channel.
 +
 +	* erc-list.el 1.12: Minor appearance changes.  No functional change.
 +
 +	* erc-list.el 1.11:
 +	Implemented function erc-chanlist-join-channel.  Added variable
 +	erc-chanlist-channel-line-regexp.  Got rid of function
 +	erc-chanlist-pre-command-hook.  Changed the logic for how channel lines are
 +	highlighted.
 +
 +2003-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-list.el 1.10:
 +	Removed a bunch of unused code.  No semantic change.
 +
 +	* erc-list.el 1.9: Added lots of functionality.
 +
 +2003-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.58, erc.el 1.587:
 +	New custom type erc-message-type, use it in erc-hide-list and erc-track-exclude-types
 +
 +2003-12-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.57 (track-when-inactive): New module.
 +	(erc-track-visibility): New option.
 +	(erc-buffer-activity): New variable.
 +	(erc-buffer-activity-timeout): New variable.
 +	(erc-user-is-active): New function.
 +	(erc-buffer-visible): New function.
 +	(erc-modified-channels-update): Replace get-buffer-window call
 +	with call to erc-buffer-visible.
 +	(erc-track-modified-channels): Ditto.
 +
 +2003-12-14  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-track.el 1.56 (erc-modified-channels-update):
 +	Force update of modeline.  Makes sure
 +	that the tracked channels disappear in other buffers too.
 +
 +2003-12-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.586 (define-erc-module):
 +	New optional argument LOCAL-P.  If non-nil, then
 +	mode will be created as buffer-local rather than a global mode.
 +	(erc-cmd-CTCP): Fix indentation from last commit.
 +
 +	* erc-compat.el 1.14 (erc-define-minor-mode):
 +	Deal with :global and :group keywords.
 +
 +	* erc-nickserv.el 1.13 (erc-current-network):
 +	Make server regex more permissive.
 +
 +	* erc.el 1.585 (erc-cmd-CTCP):
 +	Don't add a space to end of command when ARGS are
 +	empty.  This fixes a bug whereby requests of the form "VERSION " were
 +	being sent, and ignored.
 +
 +2003-11-27  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.9: From Adrian Aichner <adrian@xemacs.org>
 +	* erc-log.el (erc-log-file-coding-system): Use 'binary
 +	coding-system under XEmacs (instead of 'emacs-mule).
 +	* erc-log.el (erc-w32-invalid-file-characters): Removed as no
 +	longer needed.
 +	* erc-log.el (erc-generate-log-file-name-long): Use
 +	`convert-standard-filename', which exists in XEmacs too.
 +
 +2003-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-identd.el 1.1: Code provided by johnw, thanks!
 +
 +2003-11-09  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.584 (erc-latest-version): Clean up docstring.
 +	Remove requirement for w3, wrap REQUIRE statement in IGNORE-ERRORS.
 +	Update viewcvs url to correct location.
 +	(erc-ediff-latest-version): Make sure that we find the uncompiled
 +	erc.el, error if not.
 +
 +2003-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.583: Add more info to /sv
 +
 +2003-11-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.582: Added optional argument BUFFER to erc-server-buffer-p.
 +
 +2003-11-04  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.6: Add sachac
 +
 +2003-11-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.581 (erc-server-366):
 +	chnl is 4th element of parsed, not fifth.
 +	(erc-channel-end-receiving-names): Pass correct number of arguments
 +	to delete-if-not.
 +
 +	* erc.el 1.580 (erc-update-current-channel-member):
 +	 Use erc-downcase when comparing
 +	nick entries.  Cleanup indentation.
 +
 +2003-11-01  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-sound.el 1.4: Added a (provide 'erc-sound) line.
 +
 +	* erc.el 1.579 (erc-cmd-NAMES): send to TGT, not CHANNEL.
 +
 +2003-10-29  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.21, erc.el 1.578, CREDITS 1.6:
 +	Merged Jeremy Maitin-Shepard's patch for time-sensitive nick completion.
 +
 +2003-10-27  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.19, debian/changelog 1.24:
 +	New Debian package 4.0.cvs.20031027
 +
 +2003-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.577: Fix typo tuncate->rruncate
 +
 +2003-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.80: From Stephan Stahl <stl@isogmbh.de>:
 +	 * (erc-dcc-send-block): Kill buffer if transfer completed correctly.
 +
 +2003-10-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.55 (erc-track-disable):
 +	Do not deactivate all advices for `switch-to-buffer',
 +	just disable the erc specific one. (Bug#217022).
 +
 +2003-10-18  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.8 (erc-log-file-coding-system): New variable.
 +	(erc-save-buffer-in-logs): Use it.
 +
 +2003-10-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.576 (erc-interpret-mirc-color): New boolean defcustom
 +
 +	* erc.el 1.575: Do not use -nowait on darwin (thanks johnw)
 +
 +2003-10-15  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.574 (define-erc-module):
 +	Set erc-FOO-mode appropriately in erc-FOO-enable
 +	and erc-FOO-disable.
 +
 +2003-10-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.12 (erc-mode):
 +	Reset idletime on connect. Fixes an annoying bug which
 +	flooded the server with aways on reconnect.
 +	(erc-autoway-reset-idletime): Accept optional args so we can hook it
 +	onto erc-server-001-hook.
 +
 +2003-10-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.573 (erc-hide-list): Add a nice defcustom type
 +
 +2003-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.18, debian/changelog 1.23, debian/control 1.8:
 +	Debian snapshot 20031008
 +
 +	* erc-speedbar.el 1.11:
 +	Patch from Eric M. Ludlam <eric@siege-engine.com>:
 +	 - (erc-install-speedbar-variables): Add functions list (needs new speedbar?)
 +	 - (erc-speedbar-buttons): Add doc.  Clear the buffer
 +	 - (erc-speedbar-sort-channel-members): New function.
 +	 - (erc-speedbar-expand-channel): Call new sort function.  Change some visuals.
 +	 - (erc-speedbar-insert-user): Change some visuals based on channel data.
 +	 - (erc-speedbar-line-text, erc-speedbar-item-info): New functions
 +	Add proper elisp file header.
 +
 +2003-10-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.22 (erc-match-syntax-table): New variable.
 +	(erc-match-current-nick-p): Use it.
 +
 +	* erc.el 1.572 (erc-quit-reason-zippy, erc-part-reason-zippy): Use
 +	`erc-replace-regexp-in-string' rather than
 +	`replace-regexp-in-string'.
 +	(erc-command-indicator-face): New face, used to show commands if
 +	`erc-hide-prompt' is nil and `erc-command-indicator' is non-nil.
 +	(erc-command-indicator): Clean up doc-string.
 +	(erc-display-prompt): New optional argument FACE, use this rather
 +	than `erc-prompt-face' to fontify the prompt if non-nil.
 +	(erc-send-current-line): Pass in `erc-command-indicator-face' to
 +	`erc-display-prompt'.
 +
 +	* erc-compat.el 1.13 (erc-replace-regexp-in-string): New function.
 +	Alias for `replace-regexp-in-string' on Emacs 21.
 +	Argument massaging for `replace-in-string' for XEmacs.
 +
 +2003-09-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.571 (erc-keywords): Removed. Wasn't used by anything.
 +
 +2003-09-25  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.570: ERC-HIDE-PROMPT: add custom group
 +	ERC-COMMAND-INDICATOR: new variable.
 +	ERC-COMMAND-INDICATOR: new function.
 +	ERC-DISPLAY-PROMPT: new argument, PROMPT, used to override default
 +	prompt.
 +	ERC-SEND-CURRENT-LINE: pass ERC-COMMAND-INDICATOR to ERC-DISPLAY-PROMPT.
 +
 +2003-09-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.569 (erc-parse-line-from-server):
 +	Ignore empty lines as required by RFC.
 +
 +2003-09-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.568: Add lag time calculation
 +
 +2003-09-13  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.17, debian/README.Debian 1.7, debian/changelog 1.22:
 +	New debian release
 +
 +	* erc-notify.el 1.22:
 +	Call erc-notify-install-message-catalogs on load, not on module init
 +
 +	* erc.el 1.567 (erc-update-modules):
 +	Use `load' instead of `require'.  XEmacs appears
 +	to have the NOERROR arg only sometimes... Strange
 +
 +	* erc.el 1.566: No fboundp if we have a defvar
 +
 +	* erc.el 1.565: Properly defvar erc-ping-handler
 +
 +2003-09-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.564 (erc-setup-periodical-server-ping):
 +	check if erc-ping-handler is
 +	    bound before referencing it
 +
 +2003-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.563 (erc-cmd-NICK):
 +	Warn about exceeded NICKLEN if we know it.
 +
 +	* erc.el 1.562: Make erc-server-PONG obey erc-verbose-server-ping.
 +	Cancel old `erc-ping-handler' timer when restablishing connection in the same
 +	buffer.
 +
 +	* debian/changelog 1.21, Makefile 1.16: New debian snapshot
 +
 +	* erc-dcc.el 1.79, erc-xdcc.el 1.6:
 +	Use new function erc-dcc-file-to-name to convert spaces to underscores
 +
 +	* erc-xdcc.el 1.5: Add autoload for erc-xdcc-add-file
 +
 +2003-09-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.78: indent fixes and copyright update
 +
 +	* erc.el 1.561:
 +	erc-send-ping-interval: New defcustom which defaults to 60.
 +	Every 60 seconds, we send PING now.
 +	This should fix the "connection silently lost" bug.
 +	Please test this change extensively, and report problems.
 +
 +2003-09-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.560 (erc-default-coding-system):
 +	Test for undecided and utf-8
 +	before setting.
 +
 +2003-09-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.559 (erc-modules): Add some more symbols to the set
 +
 +	* erc.el 1.558 (erc-modules):	* erc.el 1.558 (erc-modules): Add :greedy t to the set in 
 +
 +	* erc-dcc.el 1.77:
 +	More autoloads which make dcc autoload upon ctcp dcc query received.
 +
 +	* erc-dcc.el 1.76 (erc-cmd-DCC): Add Autoload.
 +	(pcomplete/erc-mode/DCC): Ditto, makes DCC autoloadable just by using
 +	completion.
 +	Also only offer "send" if fboundp make-network-process.
 +
 +	* erc-autojoin.el 1.6: Update copyright
 +
 +	* erc-autojoin.el 1.5 (erc-autojoin-add):
 +	Only add the channel if it is not already there.
 +
 +	* erc-notify.el 1.21:
 +	Use `define-erc-module' instead of old `erc-notify-initialize'.
 +	Now defines the global minor mode erc-notify-mode, and should also
 +	be controllable via `erc-modules' with symbol `notify'.
 +
 +	* erc.el 1.557 (erc-modules):
 +	Fix paren-in-column-zero bug in docstring.
 +	Add a sort of bogus, but still better :type.
 +	Add autojoin and netsplit by default.
 +	(erc-update-modules): Dont barf with an error if `require' fails.
 +	We can still error out if the mode is not defined.
 +
 +2003-08-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.556:
 +	* make 353 (NAMES reply) output go into the appropriate channel buffer
 +	  (if it exists) or into the active erc buffer (if not).
 +
 +2003-08-29  mtoledo  <mtoledo@confusibombus>
 +
 +	* erc.el 1.555:
 +	Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today.
 +
 +2003-08-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.554: Fix typo in varname which led to a compiler warning
 +
 +	* AUTHORS 1.5: Added lawrence
 +
 +2003-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.75:
 +	Set process and file-coding system to 'binary (for Windows)
 +
 +	* erc-stamp.el 1.30: Rename custom group erc-timestamp to erc-stamp.
 +
 +2003-08-07  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-fill.el 1.23 (erc-fill-disable):
 +	Remove erc-fill, not erc-fill-static from
 +	erc-insert-modify-hook.
 +
 +2003-08-05  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.553 (erc-send-current-line):
 +	Now we display the prompt for previously entered commands
 +	    based on the value of customization variable erc-hide-prompt.  This change is
 +	    closely related to revision 1.552 by wencem.
 +
 +2003-08-04  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.552 (erc-send-current-line):
 +	If we're sending a command, don't display
 +	the prompt.
 +
 +2003-08-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.54: patch from David Edmondson (dme AT dme DOT org)
 +
 +	This patch makes button 3 on the erc-track buffer names in the
 +	modeline show the selected buffer in another window. It's analogous to
 +	button 2 which shows the buffer in the current window.
 +
 +2003-07-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.551 (erc-display-line-1):
 +	Fixed bad indentation on one line.  No semantic change.
 +
 +2003-07-29  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.21:
 +	Quote open paren in docstring of erc-text-matched-hook
 +
 +	* erc.el 1.550: Anchor match only at beginning in erc-ignored-user-p.
 +
 +	* erc-button.el 1.47: New variable erc-button-wrap-long-urls.
 +	Modified erc-button-add-buttons:
 +	  New optional argument REGEXP.
 +	  If we're buttonising a URL and erc-button-wrap-long-urls is
 +	  non-nil, try and wrap them
 +
 +	Modified erc-button-add-buttons-1:
 +	  Pass regexp to erc-button-add-buttons.
 +
 +2003-07-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.549 (erc-network-name):
 +	Improved docstring.  Removed an unnecessary call to erc-server-buffer.
 +
 +2003-07-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.548: By lawrence:
 +	(erc-ignored-user-p): Use anchored regexp.
 +	(smiley): Fix missing quote in `remove-hook' call.
 +
 +2003-07-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-nets.el 1.4, erc-nickserv.el 1.12, erc.el 1.547:
 +	Changed all references to Openprojects into references to Freenode.
 +
 +2003-07-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.546:
 +	Now variable erc-debug-irc-protocol is defvar'ed instead of defcustom'ed.
 +	Made the docstring clearer too.
 +
 +	* erc.el 1.545: Fixed a wrong-type-argument error from window-live-p.
 +
 +2003-07-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.7 (erc-log-setup-logging):
 +	set buffer-file-name to "", as (basic-save-buffer)
 +	    will prompt for a buffer name before invoking hooks. the buffer-file-name
 +	    will be overridden by (erc-save-buffer-in-logs) anyway - the main danger
 +	    of doing this is write-file-contents hooks. Let's see if anyone complains.
 +	(erc-save-buffer-in-logs): return t, so that further write hooks are not run
 +
 +2003-07-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.74 (erc-dcc-open-network-stream):
 +	-nowait still crashes emacs cvs - disable for now
 +
 +2003-07-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.544 (erc): Minor docstring modification.
 +
 +2003-07-01  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-match.el 1.20 (erc-match-current-nick-p):
 +	match only on word boundaries
 +
 +	* erc-log.el 1.6 (erc-log-setup-logging):
 +	not sure how this crept in again - make sure we set
 +	    buffer-file-name to nil, since otherwise it is not possible to open
 +	    previous correspondence in another buffer while a conversation is open
 +
 +2003-06-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.543 (erc-network-name):
 +	Now makes some intelligent guesses if the server didn't tell
 +	    us the network name.
 +
 +2003-06-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.542 (erc-default-coding-system): Use utf-8 as the default
 +	encoding for outgoing stuff and undecided as the default for
 +	incoming stuff.
 +	(erc-coding-sytem-for-target): New.
 +	(erc-encode-string-for-target): Use it.
 +	(erc-decode-string-from-target): Use it.  Removed the flet
 +	erc-default-target hack and documented the dynamically bound
 +	variable `target' instead.
 +
 +2003-06-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.541 (erc-log-irc-protocol):
 +	Now we keep point on the bottom line of the window
 +	    displaying the *erc-protocol* buffer if it is at the end of the
 +	    *erc-protocol* buffer.
 +
 +	* erc.el 1.540:
 +	Added some text to the docstring for variable erc-debug-irc-protocol.
 +
 +2003-06-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.73 (erc-dcc-auto-mask-p):
 +	Fixed a docstring typo that caused a load-time error.
 +
 +	* erc-dcc.el 1.72 (erc-dcc-auto-mask-p):
 +	Changed reference to undefined variable erc-dcc-auto-mask-list
 +	    to erc-dcc-auto-masks.
 +	Changed default value of variable erc-dcc-auto-masks to nil and added text to its
 +	    docstring.
 +
 +	* erc-notify.el 1.20 (erc-notify-timer and erc-notify-QUIT):
 +	Added network name to notify_off message.
 +
 +	* erc.el 1.539 (erc-network-name):
 +	Now returns the name of the IRC server if the network name
 +	    cannot be determined.
 +
 +	* erc-notify.el 1.19 (erc-notify-JOIN and erc-notify-NICK):
 +	Added argument ?m to call to erc-display-message.
 +
 +	* erc-dcc.el 1.71 (erc-dcc-do-LIST-command):
 +	Fixed a bug where I assumed (plist-get elt :type)
 +	    returns a string -- it really returns a symbol.
 +
 +	* erc-notify.el 1.18 (erc-notify-timer):
 +	Now we include the network name in the notify_on message.
 +
 +	* erc.el 1.538:
 +	New function: erc-network-name.  Returns the name of the network that the
 +	    current buffer is associate with.  Not every server sends the 005 messages
 +	    that enable the network name to be known.  If the network name is
 +	    not known, the string "UNKNOWN" is returned.
 +
 +	* erc-dcc.el 1.70 (erc-dcc-chat-setup):
 +	Added a comment.  Fixed a bug where a DCC CHAT buffer has no
 +	    prompt when it first appears.
 +
 +	* erc-dcc.el 1.69 (erc-dcc-chat-parse-output):
 +	Now a DCC chat buffer displays the nick using
 +	    erc-nick-default-face just like in a channel buffer.
 +
 +2003-06-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.537 (erc-display-prompt):
 +	Fixed incorrect indentation.  No semantic change.
 +
 +	* erc.el 1.536 (erc-strip-controls):
 +	Minor change to regexp that matches IRC color control
 +	    codes.  I was seeing usage as follows: ^C07colored text^C^C04other color.
 +	    Now we strip a ^C followed by zero, one, or two digits.  Before this change,
 +	    we stripped a ^C followed by one or two digits.
 +
 +	* erc-dcc.el 1.68 (erc-dcc-do-LIST-command):
 +	Improved format of output of /DCC LIST.  Now the
 +	    "Size" column for a DCC GET includes the percentage of the file that has
 +	    been retrieved.
 +	(erc-dcc-do-GET-command): Now it works if erc-dcc-default-directory is set.
 +
 +2003-06-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.5:
 +	* added quickstart information to the comments up the top
 +
 +2003-06-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.535:
 +	Default to open-network-stream on MS Windows. (thanks lawrence)
 +
 +2003-06-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.534 (erc-process-input-line):
 +	refactor so that wrong-number-of-arguments is
 +	    caught when using do-not-parse-args - this lets do-not-parse-args
 +	    commands display help messages on incorrect syntax in a uniform manner.
 +	    This no longer raises a bad-syntax error - was this a catch-all to stop a
 +	    backtrace? Does it belong?
 +	(erc-cmd-APPENDTOPIC): the correct way to display help when you want to
 +	    accept an abitrary string is to (signal 'wrong-number-of-arguments nil).
 +	    This fixes a bug where people could not /at topics with a space in them.
 +
 +2003-06-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.533:
 +	Re-add the last few changes which weren't merged for some reason.
 +
 +	* erc.el 1.532 (erc-cmd-APPENDTOPIC): show help when given no arguments
 +
 +	Patch from MrBump. Fixes problem with erc-set-topic inserting ^C characters
 +	into the topic. Also removes dependency on CL.
 +
 +2003-06-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.531:
 +	Added comment to explain (eval-after-load "erc" '(erc-update-modules)).
 +
 +2003-06-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.20: Add completion for /unignore
 +
 +2003-05-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.12 (erc-encode-coding-string): The default binding,
 +	if encode-coding-string was not available, must be a defun that
 +	takes multiple arguments.  Did that.
 +
 +2003-05-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.530:
 +	Add handlers for 313 and 330 (by arne@rfc2549.org, thanks)
 +
 +2003-05-30  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.529:
 +	patch from MrBump to make /mode #foo +b work again (erc-cmd-BANLIST only
 +	temporarily changes them now)
 +
 +2003-05-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.528 (erc-select):
 +	server is now defaulted with erc-compute-server.
 +	A few cosmetic fixes.
 +	(erc-default-coding-system): Renamed from erc-encoding-default.
 +	(erc-encoding-default): Renamed to erc-default-coding-system.
 +	(erc-encoding-coding-alist): Documentation updated to cover regexps.
 +	(erc-encode-string-for-target): Now considers keys of
 +	erc-encoding-coding-alist to be regexps.  Rely on erc-compat
 +	wrt. MULE support.
 +	(erc-decode-string-from-target): New function.
 +	(erc-send-current-line): eq -> char-equal fix.
 +	(erc-server-TOPIC): topic is now decoded with
 +	erc-decode-string-from-target.
 +	(erc-parse-line-from-server): Line from server is no longer decoded
 +	here.
 +	(erc-server-PRIVMSG-or-NOTICE): Message from a user is decoded here,
 +	sspec -> sender-spec for clarity.  Cosmetic if -> when fix.
 +	(erc-server-TOPIC): sspec -> sender-spec
 +	(erc-server-WALLOPS): Ditto.
 +
 +	* erc-compat.el 1.11 (erc-decode-coding-string):
 +	Now requires coding-system as an argument.
 +
 +2003-05-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.527:
 +	erc-part|quit-hook is only run on a part|quit directed to our nick, reflect that in the docstring to avoid confusion
 +
 +2003-05-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-truncate.el 1.3:
 +	* erc-truncate-buffer-to-size: use fboundp. Scheme takes its toll...
 +
 +2003-05-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el 1.2: remove require of erc-log
 +	(erc-truncate-buffer-to-size): use erc-save-buffer-in-logs when it's
 +	there, else, dont.
 +
 +2003-04-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.4, erc-truncate.el 1.1, erc.el 1.526: erc.el:
 +		* erc-cmd-QUIT: Remove references to code in erc-log.el, to
 +		  not force autoloading of erc-log.el
 +		* erc-server-PART: ditto.
 +		* erc-quit-hook: new hook, run when /quit command is
 +		  processed.
 +		* erc-cmd-QUIT: use it.
 +		* erc-part-hook: new hook, run then PART message is
 +		  processed.
 +		* erc-cmd-PART: use it.
 +		* erc-connect-pre-hook: new hook, run before connection to IRC
 +		  server is started.
 +		* erc: use it.
 +		* erc-max-buffer-size: Move truncation variables and functions
 +		  to erc-truncate.el
 +		* erc-truncate-buffer-on-save: moved to erc-log.el
 +		* erc-initialize-log-marker: new function.
 +	erc-log.el:
 +		* erc-truncate-buffer-on-save: New defcust here; from erc.el
 +		* erc-truncate-buffer-on-save: Put it in group `erc-log'
 +		* erc-log-channels-directory: Remove trailing slash from
 +		  default value.
 +		* Add functions to erc-connect-pre-hook, erc-part-hook and
 +		  erc-quit-hook to avoid getting autoloaded.
 +
 +	erc-truncate.el:
 +		* Contains the truncation functions and defcusts from erc.el.
 +		* define-erc-module clause added; new erc-truncate-mode.
 +
 +2003-04-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.525 (erc):
 +	Check wether erc-save-buffer-in-logs is bound, too
 +
 +	* erc.el 1.524 (erc):
 +	Check wether erc-logging-enabled is bound before using it - not
 +	everyone is using erc-log.el!
 +
 +2003-04-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.3:
 +	* while we're at it, remove the (declare (ignore ignore)) statements.
 +
 +	* erc-log.el 1.2:
 +	* add autoload statement for erc-log-mode/etc. Sorry for the delay.
 +
 +	* erc-log.el 1.1, erc.el 1.523: * erc.el:
 +		- move variables and functions to erc-log.el:
 +			 defgroup `erc-log'
 +	                 defcustom `erc-log-channels-directory'
 +			 defcustom `erc-log-insert-log-on-open'
 +			 defcustom `erc-generate-log-file-name-function'
 +			 defun `erc-save-buffer-in-logs' (autoloads from erc-log.el)
 +	 		 defuns `erc-generate-log-file-name-*'
 +			 defun `erc-current-logfile'
 +			 defun `erc-logging-enabled' (autoloads from erc-log.el)
 +		- erc-truncate-buffer-to-size: fix for double-saving bug when
 +		  writing out truncated buffer contents. Thanks, lawrence mitchell <wence@gmx.li>!
 +		- erc-remove-text-properties-region: Fix case for read-only text.
 +		- erc-send-current-line: update insert-marker before calling the hooks.
 +		                         also, wrap (erc-display-prompt) so that it doesn't toggle
 +					 buffer-modified-p.
 +		- erc-interpret-controls: remove /very/ old commented-out function
 +		- erc-last-saved-position: make it a marker
 +		- erc: use it.
 +
 +	* erc-log.el: (thanks, lawrence mitchell <wence@gmx.li>!)
 +		- Move logging code from erc.el here
 +		- define-erc-module log: add; minor mode erc-log-mode is the
 +		  same as adding the `erc-save-buffer-in-logs' to
 +		  erc-send-post-hook and `erc-insert-post-hook'.
 +		- erc-w32-invalid-file-characters: add.
 +		- erc-enable-logging: add.
 +		- erc-logging-enabled: use it.
 +		- erc-logging-enabled: autoload.
 +		- erc-save-buffer-in-logs: fix for truncating saved buffer with read-only text.
 +		- erc-save-buffer-in-logs: use erc-last-saved-position.
 +		- erc-save-buffer-in-logs: fix saving half-written messages on
 +		  the prompt when saving the log file. (simply uses
 +		  erc-insert-marker as an upper bound for saving).
 +
 +2003-04-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.522:	* erc.el 1.522: erc-modules: added 
 +
 +2003-04-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* Makefile 1.15 (UNCOMPILED): Added erc-compat.el.
 +	(clean): Remove .elc files, too.
 +	Patch by Hynek Schlawack <hynek+erc@hys.in-berlin.de>
 +
 +2003-04-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.46:
 +	erc-button-keymap: set the parent keymap to erc-mode-map
 +
 +2003-04-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.521:
 +	erc-official-location: shouldn't the official location be the base URL of erc?
 +
 +	* erc.el 1.520:
 +	erc-modules: updated the docstring to make the semantics clearer
 +
 +2003-04-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.519:
 +	Fix problem where % in NOTICE produced errors (from mmc)
 +
 +2003-04-18  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.518 (erc-toggle-debug-irc-protocol):
 +	moved a reference to 'buf' inside the let
 +	    statement which defines it. it's difficult to tell what the original
 +	    intentions were here - at the moment the debug window is displayed when
 +	    toggling either way.
 +
 +	* README 1.3, erc.el 1.517:
 +	(erc-update-modules: added a condition in for erc-nickserv -> erc-services
 +
 +	* erc-pcomplete.el 1.19:
 +	- that change to erc-update-modules making it require the modules first means
 +	  we don't need any special case handling here, so i reverted the previous
 +	  change
 +
 +	* erc.el 1.516:
 +	- don't require 'erc-auto, since windows users don't have access to make.
 +	  instead, we handle it in (erc-update-modules)
 +
 +2003-04-17  Damien Elmes  <erc@repose.cx>
 +
 +	* README 1.2, Makefile 1.14:
 +	Updated Makefile and documentation to reflect the new release
 +
 +	* erc.el 1.515:
 +	- note the previous change also updated the release number to erc 4.0!
 +	(erc-connect): fix a bug introduced by the previous release
 +
 +	* erc.el 1.514:
 +	fixed about 20 instances of (message (format ...)) which will break if the
 +	format returns a string with %s in it
 +
 +	* erc.el 1.513: erc-error-face: make it red, not pink
 +
 +	* erc-pcomplete.el 1.18:
 +	since pcomplete is autoloaded via erc-completion-mode, and completion is in
 +	erc-modules by default, we remove completion when pcomplete is added
 +
 +	* erc.el 1.512 (define-erc-module): no need for delete, use delq
 +
 +	* erc-members.el 1.5 (erc-nick-channels):
 +	(erc-person-channels) takes one arg
 +	(erc-format-user): again, they all take an arg
 +
 +	* erc.el 1.511:
 +	- require erc-auto when loading, so the default `erc-modules' can be loaded.
 +	  this makes erc-auto no longer a convenience but a necessity - all the name
 +	  of user friendliness.
 +	(define-erc-module): the enable and disable routines now update erc-modules
 +	    accordingly
 +	erc-modules: new variable controllig the modules which erc has loaded/will
 +	    load. when customising, it will automatically enable modules. it won't
 +	    automatically disable modules which are removed, yet.
 +	(erc-update-modules): enable all modules in `erc-modules'
 +
 +	* erc-dcc.el 1.67 (erc-dcc-open-network-stream):
 +	use the -nowait equiv if available
 +	erc-dcc-server-port: removed
 +	erc-dcc-port-range: allows a range of values, so you can have more than one
 +	    dcc
 +	(erc-dcc-server): support erc-dcc-port-range
 +	(erc-dcc-chat): use OCHAT for outgoing chat for now. we need to fix the
 +	    issues with allowing more than one chat with the same person
 +
 +	* erc.el 1.510:
 +	erc-log-channels: removed; set the directory to start logging
 +	(erc-directory-writeable-p): create directory if it doesn't exist, check if
 +	    it's writeable
 +	(erc-logging-enabled): don't reference erc-log-channels
 +
 +2003-04-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.509 (erc):
 +	but when inserting the contents of a previous logfile, use the logfile
 +	    name, not ""!
 +
 +	* erc.el 1.508 (erc):
 +	set buffer-file-name to "", since we have a custom saving function and
 +	    it's not needed. this enables one to open a log file with previous
 +	    correspondence, while talking to the person at the same time
 +
 +2003-03-29  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.507 (erc-prepare-mode-line-format):
 +	Now strips all text properties from the target before
 +	    putting it in the mode line.  Keeps the mode line looking consistent.
 +	(erc-channel-p): Improved docstring.
 +
 +2003-03-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.506 (erc-generate-log-file-name-with-date): New function.
 +	(erc-generate-log-file-name-function): Make it available.
 +
 +2003-03-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.505:
 +	Fix erc-prompt and erc-user-mode custom :type (Closes: #185794)
 +
 +2003-03-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.504:
 +	erc-server-hook-list: correct documentation of ordering of (proc parsed)
 +
 +2003-03-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.53 (erc-modified-channels-string):
 +	Make it a risky-local-variable.
 +
 +2003-03-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.52 (erc-track-modified-channels):
 +	Use (point-min) if we don't find a
 +	parsed-property, so it won't error out with nil...
 +
 +2003-03-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.51 (erc-track-switch-buffer):
 +	removed call to erc-modified-channels-update, as
 +	    this is done correctly on buffer switching in both emacs and xemacs now
 +
 +2003-03-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.50 (erc-find-parsed-property):
 +	simplified a little, so it shouldn't return nil anymore
 +
 +	* erc.el 1.503: erc-send-post-hook: document narrowing which occurs
 +
 +2003-03-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.49 (erc-find-parsed-property): New function.
 +	(erc-track-modified-channels): Use it instead of relying on
 +	point-min.
 +
 +2003-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.502:
 +	Fix erc-set-topic to accept a channel name as first word
 +
 +2003-03-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.66:
 +	Small patch (<10 lines, also slightly modified by Jorgen Schäfer) from
 +	David Spreen <netzwurm@debian.org> to add hostmask-authentication to
 +	DCC auto-accept.
 +
 +	erc-dcc-auto-mask-list: New variable
 +	(erc-dcc-handle-ctcp-send): Check erc-dcc-auto-mask-list
 +	(erc-dcc-auto-mask-p): New function
 +	erc-dcc-send-request: Docstring now mentions erc-dcc-auto-mask-list
 +
 +2003-03-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.11 (erc-clear-input-ring):
 +	New function.  Erases the contents of the input ring for
 +	   the current ERC buffer.
 +
 +2003-03-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.501:
 +	(erc-display-line-1) and (erc-send-current-line): Now these functions reset erc-insert-this
 +	    to t as soon as possible after consuming the value of that variable.  See the comments in
 +	    the code for the strange symptom this fixes.
 +	(erc-bol): Changed to call point-at-eol instead of line-end-position.  This increases XEmacs
 +	    portability, since XEmacs doesn't have line-end-position.  Patch suggested by Scott Evans
 +	    on the ERC mailing list.
 +
 +2003-03-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.500: banlist*: patch from mrbump to avoid using cl packages
 +
 +2003-03-04  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.499:
 +	Changed erc-noncommands-list from a constant to variable, so that users can
 +	    add their own erc-cmd-* functions to the list.  Improved the docstring too.
 +
 +2003-03-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.498 (erc-server-353):
 +	Now the output of "/NAMES #channel" appears in the currently
 +	    active ERC buffer, even if the user is not a member of #channel.
 +
 +	* erc.el 1.497 (erc-cmd-DEOP):
 +	Fixed a syntax error: invalid read syntax ")" caused by my last change.
 +
 +2003-03-01  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.496 (erc-cmd-DEOP):
 +	Fixed a wrong-type-argument error caused by calling split-string
 +	    on a list instead of on a string.  Removed the call to split-string entirely,
 +	    because it wasn't needed.
 +
 +	* erc.el 1.495 (erc-cmd-HELP):
 +	Changed to use intern-soft instead of intern.  Now "/HELP floob"
 +	    doesn't create a void function symbol erc-cmd-FLOOB.
 +
 +2003-02-25  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.494 (erc-cmd-SERVER):
 +	remove erroneous references to line, use server instead
 +
 +2003-02-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.493 (erc-toggle-debug-irc-protocol):
 +	Fixed a bug where the global value of
 +	    kill-buffer-hook was being modified instead of the buffer-local value.
 +
 +2003-02-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.492 (erc-cmd-KICK):
 +	Now supports any number of words in the REASON string.  Examples
 +	    of the /KICK command are:
 +	      /KICK franl You don't belong here
 +	      /KICK franl Bye
 +	      /KICK franl
 +	      /KICK #channel franl Go away now
 +	      /KICK #channel franl Bye
 +	      /KICK #channel franl
 +
 +2003-02-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.29 (erc-insert-timestamp-right):
 +	Make the timestamp rear-nonsticky, so
 +	C-e works at the beginning of the next line.
 +
 +2003-02-16  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.28:
 +	* s/choose/choice/ in customize options, as kensanata requested.
 +
 +2003-02-15  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.491 (erc-toggle-debug-irc-protocol):
 +	Now if the *erc-protocol* buffer is killed,
 +	    logging is turned off.  Prior to this change, the buffer would come back
 +	    into existence (generally unbeknownst to the user) after being killed.
 +
 +2003-02-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.490 (erc-send-current-line):
 +	we can't inhibit everything here when not connected,
 +	    as the user will expect commands like /server still to work. the
 +	    erc-cmd-handler should recover from errors instead
 +
 +2003-02-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.489:
 +	* we now run erc-after-connect on 422 (no motd) messages as well as the motd
 +	  messages
 +	(erc-login): revert the previous change
 +
 +	* erc.el 1.488 (erc-login): register that we're connected
 +
 +2003-02-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-members.el 1.4: * Provide erc-members
 +	* Fix excessive )
 +	* Comment out broken self-tests
 +
 +2003-02-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.487 (erc-connect):
 +	notify the user we're trying to connect when using asych
 +	    connections
 +
 +	* erc.el 1.486 (erc-connect): support an asyncronous connection
 +	(erc-process-sentinel): ditto
 +
 +	* erc-track.el 1.48:
 +	* advise switch-to-buffer in the case of xemacs, since it doesn't have
 +	  window-configuration-change-hook
 +
 +	* erc.el 1.485 (erc-send-current-line):
 +	if not connected, refuse to send either a message or
 +	    a command
 +
 +	* erc.el 1.484: (erc-save-buffer-in-logs):
 +	    - check for a sensibile region before saving the buffer. if the
 +	      connection process is killed early on, there is not a sensible region
 +	      to save
 +	    - don't set buffer-file-name on save. we don't need it, and it means we
 +	      can now find-file a log while an existing query is open with that
 +	      user
 +
 +	* erc.el 1.483 (erc-process-input-line):
 +	when displaying the help for a function, if no
 +	    documentation exists, don't fall over
 +	(erc-cmd-SAY): new function for quoting lines begining with /
 +	(erc-server-NICK):
 +	    - fix a bug where the "is now known as" message doesn't appear on newly
 +	      created /query buffers
 +	    - when a user changes their nick, update the query to point to the new
 +	      nick
 +
 +	* erc.el 1.482 (erc-send-current-command):
 +	don't reject multi-line commands. since
 +	    multiline-p is used as the no-command arg to erc-process-current-line,
 +	    multi-line text is never interpreted as a command. i believe this is the
 +	    correct behavior - it allows people to post the output of things like df
 +	    (sans header). if you want to change this, please provide a rationale
 +	    in the changelog
 +
 +	* erc.el 1.481 (erc-send-current-line):
 +	only match the first line when determining if a
 +	    multi-line command is allowed
 +
 +2003-02-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-bbdb.el 1.21 (erc-bbdb-highlight-record):
 +	Use alternate strings, not character
 +	classes to split the nick-field.
 +
 +2003-02-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.479 (erc-process-sentinel):
 +	Now we set erc-connected to nil every time we disconnect
 +	    from a server, not just when an unexpected disconnect happens.
 +
 +	* erc.el 1.478 (erc-connected):
 +	Removed redundant defvar of this variable.  Improved the
 +	    docstring.
 +	(erc-login): Changed to send a correct RFC2812 USER message (see section
 +	    3.1.3 of RFC2812 for the documentation of the semantics of each argument
 +	    of the USER message.
 +
 +2003-02-02  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.477 (erc-cmd-NOTICE): fix from mrbump
 +
 +2003-01-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.476 (erc-cmd-JOIN):
 +	Now we only send one JOIN command to the server when a channel
 +	    key is provided.
 +
 +2003-01-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.475 (erc-remove-channel-member):
 +	Fixed so that it runs erc-channel-members-changed-hook
 +	    with the channel buffer current, as is documented in the docstring for variable
 +	    erc-channel-members-changed-hook: "The buffer where the change happened is
 +	    current while this hook is called."
 +
 +2003-01-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.474:
 +	(erc-ignored-user-p),(erc-cmd-IGNORE),(erc-cmd-UNIGNORE): Now nicks are ignored
 +	    on a per-server basis.  Now, erc-ignore-list is only valid in server
 +	    buffers!  Do not reference it in channel buffers.
 +
 +	* erc.el 1.473 (erc-cmd-IGNORE):
 +	Now says "Ignore list is empty" if it erc-ignore-list is empty
 +	    instead of showing an empty list.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.11 (services): Defined a module
 +
 +2003-01-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.472 (erc-process-ctcp-query):
 +	Display recipient of CTCP query if it's not
 +	our current nick.
 +
 +	* erc.el 1.471 (erc-cmd-WHOIS):
 +	Accept an optional second argument SERVER.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.27 (stamp): erc-add-timestamp must always be added
 +	with the APPEND parameter -- not only when adding it on the right.
 +
 +2003-01-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-members.el 1.3 (erc-channel-members-changed-hook): Obsolete, use
 +	erc-members-changed-hook instead.  When it is set, add its content
 +	to erc-members-changed-hook.
 +	(erc-update-channel-member): Obsolete, use erc-update-member
 +	instead.  Defalias to that effect.
 +	(erc-remove-channel-member): New and already obsolete.  Use
 +	erc-remove-nick-from-channel instead.
 +	(erc-update-channel-info-buffer): Obsolete, use ignore instead.
 +	Yes, these have to go.
 +	(erc-channel-member-to-user-spec): Obsolete, use erc-format-user
 +	instead.
 +	(erc-format-user): New.
 +	(erc-ignored-reply-p): New, use it.
 +
 +	* erc-members.el 1.2:
 +	Further along the way.  Any function from erc.el that uses
 +	channel-members should end up in this file, rewritten to use
 +	erc-members.
 +
 +	(erc-person): Call erc-downcase before getting
 +	something from the hash.
 +	(erc-nick-in-channel): Checking wether erc-process must be used is
 +	unnecessary -- this will be done in erc-person.
 +	(erc-nick-channels): New.
 +	(erc-add-nick-to-channel, erc-update-member): Call erc-downcase
 +	before putting something into the hash.
 +	(erc-buffer-list-with-nick): New.
 +	(erc-format-nick, erc-format-@nick): New, backwards incompatible.
 +	Must check for other places that call these!
 +	(erc-server-PRIVMSG-or-NOTICE): Use the new version.
 +
 +	* erc-compat.el 1.10 (view-mode-enter): defalias to view-mode, if
 +	view-mode-enter is not fboundp and view-mode is -- as is the case
 +	in XEmacs.  We need view-mode-enter in erc-match.el.
 +
 +2003-01-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.470 (erc-default-server-handler):
 +	Minor performance improvement: allow the lambda
 +	    expression to be byte-compiled.
 +
 +2003-01-23  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.469 (erc-cmd-BANLIST):
 +	in the absence of a fill-column, use the screen width
 +
 +2003-01-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.468:
 +	patch from MrBump to delay fetching the banlist until /bl is run, so we don't
 +	fetch it when joining a channel anymore
 +
 +	* erc-ring.el 1.10:
 +	* instead of adjusting hooks when loaded, provide (erc-ring-mode). you'll
 +	  need to run (erc-ring-mode 1) now to get the ring
 +	* (erc-previous-command), (erc-next-command):
 +	    - check if the ring exists and create it if necessary
 +	    - don't do anything if the ring is empty
 +
 +	* erc-pcomplete.el 1.17:
 +	Put "how to use" documentation in the comments up the top
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.4 (erc-autojoin-version): New.
 +
 +	* erc-autojoin.el 1.3 (erc-autojoin-add): Added body.
 +	(erc-autojoin-remove): Added body.
 +	(erc-autojoin): Provide it.
 +
 +2003-01-21  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.467: erc-cmd-*: removed a bunch of references to force
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.2 (erc-autojoin-channels-alist): More doc.
 +
 +2003-01-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.1:
 +	new, based on resolve's mail, and the stuff on the wiki
 +
 +	* erc-members.el 1.1: new
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.6, debian/changelog 1.20, debian/scripts/install 1.11, 
 +	  debian/scripts/startup.erc 1.4, Makefile 1.13:
 +	Prepare for 20030119 debian package
 +
 +	* erc-dcc.el 1.65: <rant>
 +	* (erc-decimal-to-ip): Since XEmacs decides that return a completely
 +	and utterly wrong number from string-to-number if it is larger than
 +	the integer boundary, instead of sanely converting the thing to
 +	a float, we now (concat dec ".0").
 +	</rant>
 +
 +	* erc.el 1.466:
 +	* (erc-log-irc-protocol): Use erc-propertize, not propertize
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.45 (erc-button-add-buttons): Added regexp-quote for
 +	the list case, too.
 +
 +2003-01-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.64 (erc-dcc-member): fix for case where a prop is nil
 +
 +	* erc-dcc.el 1.63 (erc-dcc-member):
 +	fix for xemacs's version of plist-member
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.17: Delete empty strings from the ison-list
 +
 +	* erc-track.el 1.47:
 +	* (erc-track-switch-buffer): Call erc-modified-channels-update here.
 +
 +	* erc-track.el 1.46: * toplevel: require 'erc-match
 +
 +	* erc-track.el 1.45: * (erc-track-mode): Make autoload interactive
 +
 +	* erc-button.el 1.44: * (button): Make the autoload interactive
 +
 +	* erc.el 1.465:
 +	* (erc-mode): Comment out the case-table stuff, breaks xemacs
 +	* (erc-downcase): Revert.
 +
 +	* erc-dcc.el 1.62:
 +	* (erc-dcc-handle-ctcp-send): Use erc-decimal-to-ip on the ip we get...
 +
 +	* erc-speak.el 1.25:
 +	Eliminate reference to erc-nick-regexp, which no longer exists
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.26 (erc-timestamp-right-column): New, default nil.
 +	(erc-insert-timestamp-right): Use it, if non-nil.  Verbose
 +	doc string.
 +
 +2003-01-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.464 (erc-downcase): Use the old behavior in non-CVS Emacs.
 +
 +	* erc.el 1.463 (erc-cmd-QUIT): Remove &rest. The correct fix follows.
 +	(erc-cmd-GQUIT): Pass "" to erc-cmd-QUIT.
 +	(erc-mode): Use the case-table only in CVS Emacs. See comment.
 +
 +	* erc.el 1.462 (erc-cmd-QUIT): make reason optional.
 +
 +	* erc.el 1.461 (erc-cmd-GQUIT): Fixed typo.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.460:
 +	* (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
 +
 +	* erc.el 1.459: * (erc-mode): Define a proper case-table.
 +	* (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
 +
 +	* erc-button.el 1.43: * (erc-button-add-buttons): regex-quote the nick
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.42 (button): erc-channel-members-changed-hook no
 +	longer has erc-recompute-nick-regexp.
 +	(erc-button-alist): Use channel-members instead of
 +	erc-nick-regexp.
 +	(erc-button-add-buttons): Split some code into
 +	erc-button-add-buttons-1, and now handle strings, lists, and
 +	alists.  Regular expressions in lists and alists are enclosed in
 +	< and >.
 +	(erc-button-add-buttons-1): New.
 +	(erc-nick-regexp): Deleted.
 +	(erc-recompute-nick-regexp): Deleted.
 +
 +	* erc-button.el 1.41: Remove require cl again.
 +	(erc-mode-map): No longer bind widget-backward and widget-forward.
 +	(erc-button-alist): Explain why byte-compiling makes no sense, and
 +	remove all calls to byte-compile.
 +	(erc-button-keymap): Define it the standard way, without exposing
 +	the list nature of the keymap.
 +	(erc-button-marker-list): Deleted.
 +	(erc-button-add-buttons): Simplify.  In particular, create the
 +	button using the real callback, instead of using the intermediate
 +	erc-button-push, and only store the data as described for
 +	erc-button-alist.
 +	(erc-button-remove-old-buttons): Simplify.  No more list munging.
 +	Instead, just remove all the properties that we add in
 +	erc-button-add-button.
 +	(erc-widget-press-button): Deleted.
 +	(erc-button-click-button): New, for mouse clicks.  Moves point to
 +	where the mouse is, and calls erc-button-push.
 +	(erc-button-push): Instead of matching again, just use the
 +	erc-callback and erc-data properties at point to do the right
 +	thing.
 +	(erc-button-entry): Deleted.
 +	(erc-button-next): Use error instead of the beep plus message
 +	combo.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.11 (erc-autoaway-set-back):
 +	Don't pass a force argument to erc-cmd-GAWAY.
 +
 +	* erc.el 1.458 (erc-cmd-AWAY): Removed usage of the force variable.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.40 (button):
 +	erc-recompute-nick-regexp is no longer added to
 +	erc-channel-members-changed-hook unconditionally, but only if
 +	erc-button-mode is enabled, and if it is disabled, it is removed
 +	again.
 +	(erc): Require cl for delete-if.
 +	(erc-button-remove-old-buttons): Rewrote using delete-if to
 +	prevent exceesive consing.  Having the marker list is still ugly,
 +	so another solution needs to be found.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.457 (erc-banlist-store):
 +	Don't assume there's always a setter in the banlist reply.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.39 (erc-button-url-regexp): Changed regexp according
 +	to a suggestion by Max Froumentin <mf@w3.org>.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.456:
 +	fix erc-remove-channel-member again to not error out on nil as first arg...
 +
 +	* erc.el 1.455: * (erc-occur): New function
 +
 +2003-01-17  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.454: erc-banlist-*: return nil so further hooks are called
 +
 +	* erc.el 1.453 (erc-server-368):
 +	supress "end of ban list" messages - use /listbans now
 +
 +	* erc.el 1.452 (erc-send-current-line):
 +	removed the check for leading whitespace again - the
 +	    only time we want to prohibit multi-line commands is if / is the first
 +	    thing on the line
 +	(erc-get-arglist): new defun for reading a function's arglist which should
 +	    work with older copies of emacs. we use help-function-arglist if it's
 +	    available, though, since that has support for reading subrs, etc
 +
 +	* erc.el 1.451 (erc-cmd-JOIN): fixed (again)
 +
 +	* erc.el 1.450: * fixed call to erc-cmd-NICK when connecting
 +	* support for listing bans and mass unbanning, again thanks to MrBump
 +
 +	* erc.el 1.449 (erc-set-topic):
 +	patch from MrBump (Mark Triggs, mst@dishvelled.net) to strip
 +	    control chars and topic attribution in C-c C-t
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.448:
 +	* (erc-remove-channel-member): Do not use delq, modify the list using setcdr like delq does.
 +	In theory, this should be way faster since the list doesnt get traverse two times.
 +	Measurement didn't show any real difference though :(, this system is flawed for channels with >300 users it seems...
 +	Also moved some defcustoms up.
 +
 +2003-01-16  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.447: moved misplaced paren
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.446 (erc-cmd-UNIGNORE):
 +	reference argument directly - no string matching
 +
 +	* erc.el 1.445 (erc-extract-command-from-line):
 +	hmm, thinko in the canonicalisation. should
 +	    be fixed
 +
 +2003-01-16  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.444 (erc-send-current-line):
 +	Changed the regexp used to match /COMMANDs so that leading
 +	    whitespace is taken into account.
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.61: * (erc-dcc-do-SEND-command): Fix it
 +
 +	* erc-ezbounce.el 1.4, erc-lang.el 1.2: Arglist changes...
 +
 +	* erc.el 1.443: Various docstring fixes and additions.
 +
 +	* erc-notify.el 1.16:
 +	* (erc-cmd-NOTIFY): Change the function arglist to (&rest args)
 +
 +	* erc-netsplit.el 1.8: * (erc-cmd-WHOLEFT): Has no args...
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-fill.el 1.22:
 +	erc-fill-column: default to 78, so things like docstrings don't get wrapped
 +	    in an ugly manner
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.442:
 +	* (erc-cmd-default): Take a substring, now /mode works again.
 +	* (erc-cmd-AWAY): Put do-not-parse-args t
 +	* (erc-cmd-GAWAY): Ditto, and fix it.
 +	* (erc-cmd-CTCP): Switch to argument system.
 +	* (erc-cmd-KICK): Do the same.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.60:
 +	* (erc-cmd-DCC): Fixed for the new scheme, simplified.
 +	* (erc-dcc-do-CHAT-command): Ditto.
 +	* (erc-dcc-do-CLOSE-command): Ditto.
 +	* (erc-dcc-do-LIST-command): Ditto.
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.441:
 +	erc-error-face: setting a background doesn't work so well with multi-line
 +	    messages, so we don't. fg colour is negotiable ;-)
 +	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
 +	(erc-send-current-line): allow multi-line messages provided they don't start
 +	    with a slash - there's no need to prohibit them if the slash isn't the
 +	    first character
 +
 +	* erc.el 1.440: * bad-syntax now reports like incorrect-args
 +	* bunch of extra cmds fixed, nick, sv etc.
 +
 +	* erc.el 1.439 (erc-cmd-HELP): fixed
 +	(erc-extract-command-from-line): when deterimining canon-defun, make sure we
 +	    have a valid symbol
 +	(erc-cmd-KICK): fixed
 +
 +	* erc.el 1.438:
 +	* removed duplicate do-no-parse-args properties for the defaliased defuns
 +	(erc-process-input-line): show function signature when incorrect args
 +	(erc-extract-command-from-line): canonicalise defaliases before extracting
 +	    plist
 +	(erc-cmd-CLEAR): fixed
 +	(erc-cmd-UNIGNORE): fixed again
 +
 +	* erc.el 1.437 (erc-cmd-SET): fixed
 +	(erc-cmd-UNIGNORE): fixed
 +	(erc-process-input-line): report when incorrect arguments are provided to a
 +	    command, and show the command's docstring
 +
 +	* erc.el 1.436 (erc-cmd-APPENDTOPIC): fixed
 +	(erc-process-input-line): more informative error message than 'bad syntax'
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.435: * (erc-cmd-IGNORE): fixed
 +
 +	* erc.el 1.434: * (erc-cmd-NAMES): fixed
 +
 +	* erc.el 1.433:
 +	* (erc-cmd-CLEARTOPIC): Simplify, fix doc, make interactive
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.432 (erc-cmd-JOIN):
 +	correct invite behavior, and document it.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.431: * (erc-cmd-PART): Put 'do-not-parse-args t
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.430 (erc-cmd-JOIN): new cmd argument syntax
 +	(erc-process-input-line): check if (erc-extract-command-from-line) returned a
 +	    list, and apply if that's the case
 +
 +	* erc.el 1.429:
 +	erc-cmd-*: remove optional force and references to `force' in the code
 +	(erc-cmd-AMSG): call erc-trim-string, not trim-string
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.428:
 +	* (erc-cmd-CLEARTOPIC): LINE is now ARGS and already parsed.
 +	Set erc-cmd-TOPIC to 'do-not-parse-args for now.
 +	(comment: I think we should have 'first, so that only first word is parsed...
 +	 Or we could autodetect erc-channel-p in the parser before that somehow...)
 +
 +	* erc.el 1.427: * (erc-cmd-OP): LINE is PEOPLE now, and already parsed.
 +
 +	* erc-notify.el 1.15:
 +	* (erc-cmd-NOTIFY): Arg LINE is now ARGS, and already parsed.
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.25 (erc-insert-timestamp-right):
 +	Prefer erc-fill-column to window-width,
 +	because on wide screens the timestamp could wander off too far to the
 +	right.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.426: This is the "everything is suddenly broken!" release
 +	You know, this is CVS, you can still go back, and wait until the transition
 +	is finished, but here is patch one, which basicly breaks every command
 +	which is typed on the prompt.
 +	Hit me, we can still revert, but something needs to be done about this.
 +	* (erc-extract-command-from-line): intern-soft the function here.
 +	If the function symbol has a property 'do-not-parse-args, operate as before,
 +	otherwise, split the arguments prior to calling the command handler.
 +	* (erc-process-input-line): Updated to accomodate the change above.
 +	* (erc-send-distinguish-noncommands): Ditto.
 +	* (erc-cmd-NAMES): Ditto.
 +	* (erc-cmd-ME): Put 'do-not-parse-args property.
 +
 +	* erc-dcc.el 1.59:nick:	* erc-dcc.el 1.59: * erc-dcc-list: Renamed 
 +	* (erc-dcc-member). Treat :nick as either a nick!user@host or nick,
 +	do appropriate comparisons, simplified.
 +	* (erc-dcc-list-add): New functions
 +	various callers of (cons (list ...) erc-dcc-list) updated.
 +	Other stuff I'm to bored to document now
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.24 (erc-insert-timestamp-right):
 +	Removed redundant code that overrid the
 +	window-width. Now substracts (length string) from every found
 +	indentation positions.
 +
 +2003-01-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.425:
 +	* (erc-cmd-AMSG): Remove useless call to erc-display-message.
 +
 +	* erc-dcc.el 1.58:
 +	* erc-dcc-chat/send-request: New variables, control how to treat
 +	incoming dcc chat or send requests. Can be set to 'ask, which behaves
 +	like it did before, 'auto, which accepts automatically, and
 +	'ignore, which ignores those type of requests completely.
 +	* (erc-cmd-CREQ): New user-level command.
 +	* (erc-cmd-SREQ): Ditto.
 +
 +	* erc.el 1.424: * (erc-cmd-AMSG). New command.
 +
 +	* erc-xdcc.el 1.4: * (erc-xdcc): delete empty strings from ARGS
 +
 +	* erc-dcc.el 1.57: * erc-dcc-ipv4-regexp: New constant
 +	* (erc-ip-to-decimal): Use it.
 +	* erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:	* erc-dcc-host: :type
 +	* (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
 +	* Some docstring/comment fixes.
 +
 +	* erc-stamp.el 1.23:
 +	* (erc-insert-timestamp-right): Subtract (length string) from
 +	POS in any case, otherwise, linewrap occurs.
 +
 +	* erc-dcc.el 1.56:
 +	* Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
 +	  and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
 +	* Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
 +	* Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
 +
 +2003-01-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-xdcc.el 1.3:
 +	* erc-xdcc-help-text: New variable which makes replies to the originator
 +	much more flexible.
 +	* erc-xdcc-help-format: Removed.
 +	* (erc-xdcc-help): Handle the new variable.
 +	* (erc-xdcc): Simplified
 +
 +	* erc-xdcc.el 1.2: * erc-xdcc-handler-alist: New variable.
 +	* (erc-xdcc): Move code for list and send sub-commands into
 +	* (erc-xdcc-help): New function.
 +	* (erc-xdcc-list): New function.
 +	* (erc-xdcc-send): New function.
 +
 +2003-01-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.423 (erc-server-JOIN):
 +	Oops, send MODE command only when *we* joined a channel.
 +
 +	* erc.el 1.422:
 +	Fixing ERCs behavior wrt IRCnet's !channels have a different name for
 +	JOIN than in reality (e.g. you can join !forcertest or !!forcertest
 +	and really get to !ABCDEforcertest)
 +
 +	(erc-cmd-JOIN): Removed erc-send-command MODE.
 +	(erc-server-JOIN): Ask for MODE now.
 +
 +2003-01-12  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.55:
 +	(erc-dcc-get-filter), (erc-dcc-get-file): store size as a string, not an
 +	    integer. check size > 0 for the case where a size wasn't provided, since
 +	    string-to-int will return 0 on an empty string
 +
 +2003-01-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.54: * Use RAWFILE arg with find-file-noselect
 +	* Fix alist/plist conversion left-over
 +	* Add verbose-info about sending blocks.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.53: * (pcomplete-erc-mode/DCC): Fixes
 +
 +	* erc-xdcc.el 1.1: Initial version.
 +
 +	* erc-pcomplete.el 1.16:
 +	* (erc-pcomplete): Fix so that cycle-completion works again.
 +	* (pcomplete-parse-erc-arguments): If there is a space after the last word
 +	before point, we need to return a "" arg, and it's position.
 +
 +	* erc-dcc.el 1.52: Fix to pcomplete/erc-mode/DCC
 +
 +	* erc-dcc.el 1.51: * (pcomplete/erc-mode/DCC): New function
 +
 +	* erc-dcc.el 1.50: *** empty log message ***
 +
 +	* erc-dcc.el 1.49: Move code around, just basic changes
 +
 +2003-01-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.22 (erc-insert-timestamp-right):
 +	Check wether erc-fill-column is
 +	available before using it. Else default to fill-column or if
 +	everything else fails, the window width of the current window. For the
 +	fill-columns, use them directly as the starting position for the
 +	timestamp.
 +
 +2003-01-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.21:
 +	erc-insert-timestamp-right: use correct window's window-width. If
 +	                  buffer is not in a window, use erc-fill-column.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.48:	* erc-dcc.el 1.48: * (erc-dcc-do-LIST-command): Fix 
 +
 +	* erc-dcc.el 1.47:
 +	* buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
 +	  Keep This info in erc-dcc-member :sent and :confirmed plist values
 +	* :	* :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
 +	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-conntected, which now prints a msg...
 +
 +	* erc-dcc.el 1.46:
 +	* (erc-dcc-chat-accept): Renamed from erc-dcc-chat. Callers updated.
 +	* (erc-dcc-chat): Renamed from erc-dcc-chat-request.
 +	Callers updated, and interactive form added.
 +	* (erc-dcc-server-accept): No longer do any type-specific stuff.
 +	* (erc-dcc-chat-sentinel): Call erc-dcc-chat-setup if event is "open from "
 +	from here, otherwise call erc-dcc-chat-close.
 +
 +	* (
 +
 +	* erc-dcc.el 1.45: *** empty log message ***
 +
 +	* erc-dcc.el 1.43: Moved some functions around.
 +	Doc string fixes.
 +	"/dcc send nick filename" works now
 +
 +2003-01-11  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.421 (erc-send-command): Fixed flood protect message.
 +
 +	* erc-button.el 1.38 (erc-button-syntax-table): Make `-' a legal nick
 +	constituent.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.42: Some more steps toward dcc send.
 +
 +2003-01-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.14 (erc-notify-timer):
 +	Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-JOIN): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-NICK): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-QUIT): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-cmd-NOTIFY): Now "/notify -l" lists the nicks on your notify list.  Now
 +	    when you remove a nick from your notify list, you no longer recieve a spurious
 +	    signoff notification for that nick.  Changed to make it IRC-case-insensitive when
 +	    comparing nicks.
 +
 +	* erc.el 1.420 (erc-ison-p):
 +	Fixed so it calls erc-member-ignore-case instead of member.
 +
 +	* erc.el 1.419 (erc-member-ignore-case):
 +	New function.  Just like member-ignore-case, but obeys
 +	    the IRC protocol case matching rules.
 +
 +2003-01-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.41:
 +	(erc-dcc-do-GET-command), (erc-dcc-get-file): use the plist syntax, this
 +	    fixes dcc get again
 +
 +2003-01-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.418: erc-complete-functions: New variable.
 +	erc-mode-map: Bind \t to 'erc-complete-word
 +	erc-complete-word: New function.
 +
 +	* erc-pcomplete.el 1.15 (erc-pcomplete-mode):
 +	Use new erc-complete-functions
 +	(erc-pcomplete): Check that we're in the input line, else return nil.
 +
 +	* erc-button.el 1.37 (erc-button-mode): Use new erc-complete-functions
 +	erc-button-old-tab-command: Removed.
 +	(erc-button-next-or-old): Removed
 +	(erc-button-next): check that we're not in the input line, else just return nil.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.40: cleanup
 +
 +	* erc-dcc.el 1.39:
 +	* (erc-dcc-chat-request): No longer use erc-send-ctcp-message.
 +
 +	* erc-dcc.el 1.38:
 +	* (erc-dcc-no-such-nick): Also call delete-process if we have a peer already
 +
 +	* erc-dcc.el 1.37:
 +	* (erc-dcc-no-such-nick): New function, server event handler for event 401.
 +	If we send a CTCP message requesting something dcc related, we set up an
 +	entry in erc-dcc-list before sending the request (for the server proc object
 +	for listening conns for example).  But if that nick does not exist
 +	on that server, we now nicely cleanup erc-dcc-list again.
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.36: Moved code around a bit, and doc fixes
 +
 +	* erc-dcc.el 1.35: *** empty log message ***
 +
 +	* erc-dcc.el 1.34: Rename erc-dcc-plist to erc-dcc-list
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.33 (erc-dcc-server (erc-dcc-chat-setup):
 +	use erc's (erc-setup-buffer) to determine how to
 +	    display new DCC windows
 +	(erc-dcc-chat-buffer-killed): buffer-local hook for DCC buffers to close the
 +	    process
 +	(erc-dcc-chat-close): code common to a killed buffer or a disconnection from
 +	    the other side
 +	(erc-dcc-chat-sentinel): use (erc-dcc-chat-close)
 +	(erc-dcc-server-accept): use (erc-log) instead of (message)
 +
 +	* erc.el 1.417:
 +	(erc), (erc-setup-buffer): factor out window generation code so DCC can use
 +	    it too
 +
 +	* erc-dcc.el 1.32:
 +	(erc-dcc-do-CLOSE-command), (erc-dcc-do-LIST-command): work with erc-dcc-plist
 +
 +	* erc-dcc.el 1.31:
 +	erc-dcc-alist: became erc-dcc-plist, so we can more easily grab particular
 +	    properties
 +	dcc catalog: unify use of DCC: and [dcc] (either's fine, but let's be
 +	    consistent)
 +	(erc-dcc-member): takes an arbitrary list of constraints now
 +	(erc-dcc-proc-member): removed, as (erc-dcc-member) can be used for this
 +	(erc-dcc-do-CHAT-command): use the catalog to show the user what's going on
 +	(erc-dcc-chat-server): removed
 +	(erc-dcc-server): takes name sentinel and filter arguments, can be used for
 +	    both send and chat now
 +
 +	.. this release means all send/get support is broken until we fix up the
 +	things that still expect to be using an alist. this include /dcc list, /dcc
 +	close
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.9 (erc-previous-command):
 +	If you have a partially typed input line and press M-p,
 +	    you lose what you typed.  Now we save it so you can come back to it.
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-ring.el 1.8 (erc-add-to-input-ring): s/nullp/null/
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-ring.el 1.7 (erc-add-to-input-ring):
 +	set up the ring if it's not already setup
 +
 +	* erc-dcc.el 1.30 (erc-dcc-member): case insensitive match of nicknames
 +	(erc-dcc-do-CHAT-command): echo what we're doing (at least for now)
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.29: (temporarily) fix erc-process setting...
 +
 +	* erc-dcc.el 1.28: * (erc-dcc-chat-send-line): Removed
 +
 +	* erc.el 1.416:
 +	Check if target is stringp (we can now also have 'dcc as value...)
 +
 +	* erc-dcc.el 1.27 (erc-dcc-chat-send-input-line):
 +	New function, used for
 +	erc-send-input-line-function.
 +	Use erc-send-current-line now.
 +
 +	* erc-dcc.el 1.26: evt to elt...
 +
 +	* erc-dcc.el 1.25: Remove () from a var (how silly!)
 +
 +	* erc-dcc.el 1.24: * (erc-dcc-get-host): Use format-network-address.
 +	* (erc-dcc-host): Change semantic.  If erc-dcc-host is set, use it.
 +	Otherwise, try to figure out the host by calling erc-dcc-get-host.
 +	* (erc-dcc-server-port): New variable.
 +	* erc-dcc-chat-log: Renamed to erc-dcc-server-accept
 +
 +	* erc-dcc.el 1.23 (erc-dcc-do-CHAT-command):
 +	Change arg of call to erc-dcc-chat-request from elt to nick
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.415 (erc-send-current-line):
 +	Now rejects multi-line commands (i.e., lines that
 +	    start with "/" and contain newlines).
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-button.el 1.36:
 +	Functionality to use TAB to jump to the next button:
 +
 +	(erc-button-next-or-old): New function.
 +	(erc-button-next): New function.
 +	erc-button-keymap: added erc-button-next
 +	erc-button-old-tab-command: New variable.
 +	define-erc-module button: Add and remove 'erc-button-next-or-old as
 +	appropriate.
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.414:
 +	New variable: erc-auto-reconnect (defaults to t).  If non-nil, ERC will
 +	    automatically reconnect to a server after an unexpected disconnection.
 +	(erc-process-sentinel): Changed to refer to variable erc-auto-reconnect.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.413:
 +	* erc-send-input-line-function: New variable, used for dispatch...
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.22 (erc-dcc-chat-sentinel):
 +	check event type before killing process
 +	(erc-dcc-chat-log): new, handles the setup of dcc chats for incoming
 +	    connections
 +	(erc-dcc-chat): use (erc-dcc-chat-setup)
 +	(erc-dcc-chat-setup): code common to incoming and outgoing DCC chats
 +	(erc-dcc-chat-request): request a DCC chat with another user
 +	(erc-dcc-proc-member): locate a member in erc-dcc-alist by process
 +
 +	The very first ERC to ERC DCC chat was held between delysid and resolve today!
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.44 (erc-all-buffer-names):
 +	Check for erc-dcc-chat-mode too
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.6, erc.el 1.412 (erc-kill-input):
 +	Resets erc-input-ring-index to nil, so that invoking this
 +	    command conceptually puts you after your most recent input in the input
 +	    history.
 +	(erc-previous-command and erc-next-command): Changed so that history movement
 +	    is more intuitive.  Also preserves the blank input line that marks the
 +	    place after the newest command in the history ring (i.e., you'll see a
 +	    blank command once every trip around the ring in either direction).
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.21 (erc-dcc-chat): Add docstring
 +	Add self-test.
 +	Fix error if /dcc chat nick doesnt find the nick
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.12:
 +	Changed so that "make" works correctly under Cygwin.  Before this change, the
 +	pathname passed to Emacs on the command line under Cygwin had the form
 +	"/cygwin/c/...", which prevented emacs from finding the file.  Now the pathname
 +	has the form "c:/...".  This works for any drive letter.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.35: reindent some code, and add TODO to comments
 +
 +	* erc-dcc.el 1.20: *** empty log message ***
 +
 +	* erc-dcc.el 1.19: Make dcc-chat-ended a notice
 +	Remove now bogus comment
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.18 (erc-pack-int): from erc-packed-int
 +	(erc-unpack-int): new
 +
 +	* erc-dcc.el 1.17 (erc-unpack-str): added
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.411 (erc-server-482):
 +	New handler, handles KICK reply if you're not channel-op
 +
 +	* erc-dcc.el 1.16: Document SEND in erc-dcc-alist.
 +	Move sproc, parent-proc and file into erc-dcc-alist
 +
 +	* erc-dcc.el 1.15: stubs
 +
 +	* erc-dcc.el 1.14 (erc-dcc-get-host):
 +	Change :iface to :local since Kim committed it now to CVS emacs
 +
 +	* erc-dcc.el 1.13 (erc-dcc-get-host):
 +	New function, requires the not-yet-in-CVS-emacs local-address.patch to process.c.
 +	Some other minor additions
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.410 (erc-cmd-IGNORE):
 +	Now returns t to prevent "Bad syntax" error.
 +	(erc-cmd-UNIGNORE): Now returns t to prevent "Bad syntax" error.
 +	(erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
 +
 +	* erc.el 1.409 (erc-scroll-to-bottom):
 +	Temporarilly bind resize-mini-windows to nil so that
 +	    users who have it set to a non-nil value will not suffer from premature
 +	    minibuffer shrinkage due to the below recenter call.  I have no idea why
 +	    this works, but it solves the problem, and has no negative side effects.
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.12:
 +	erc-dcc-ctcp-query-chat-regexp: The IP is not really an IP, but a
 +	number (no . allowed there).
 +	(erc-dcc-send-ctcp-string): use let* here to avoid cluttering up the
 +	match data.
 +	Also, use erc-decimal-to-ip to get the IP.
 +	(erc-ip-to-decimal): Removed some pasted ERC timestamps
 +	(erc-decimal-to-ip): New function.
 +	erc-dcc-chat-mode-map: Return map in the initialization.
 +
 +2003-01-07  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-match.el 1.19 (erc-match-fool-p):
 +	Changed to call erc-match-directed-at-fool-p instead of
 +	     erc-directed-at-fool-p.
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.11 (erc-cmd-DCC):
 +	Change (cond ... (t nil)) to (when ...)
 +
 +	* erc-dcc.el 1.10: Use erc-current-nick-p
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.408:
 +	erc-join-buffer: Added 'window-noselect to docstring and :type.
 +	erc-auto-query: Added 'window-noselect to :type.
 +	(erc): Treat erc-join-buffer being 'window-noselect appropriately.
 +
 +	* erc.el 1.407 (erc-current-nick-p): New function.
 +	(erc-nick-equal-p): New function.
 +	(erc-already-logged-in), (erc-server-JOIN), (erc-auto-query),
 +	(erc-server-PRIVMSG-or-NOTICE): Use erc-current-nick-p.
 +	(erc-update-channel-member): Use erc-nick-equal-p.
 +
 +	* erc-match.el 1.18 (erc-match-current-nick-p):
 +	Renamed from erc-current-nick-p
 +	(erc-match-pal-p): Renamed from erc-pal-p
 +	(erc-match-fool-p): Renamed from erc-fool-p
 +	(erc-match-keyword-p): Renamed from erc-keyword-p
 +	(erc-match-dangerous-host-p): Renamed from erc-dangerous-host-p
 +	(erc-match-directed-at-fool-p): Renamed from erc-directed-at-fool-p
 +	(erc-match-message): Use erc-match-TYPE-p instead of erc-TYPE-p
 +
 +	* erc.el 1.406:
 +	Support for IRCnets' "nick/channel temporarily unavailable"
 +
 +	(erc-nickname-in-use): New function (mostly copied from erc-server-433).
 +	(erc-server-433): Use erc-nickname-in-use
 +	(erc-server-437): New function.
 +	erc-server-hook-list: Added (437 erc-server-437).
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.21: Add autoload cookie
 +
 +	* erc-notify.el 1.13:
 +	Now also pass SERVER argument to signon/off hooks, and provide a erc-notify-signon/off function for echo-area printing
 +
 +	* erc-notify.el 1.12 (erc-notiy-QUIT):
 +	Change use of delq to delete, delq does not work with strings
 +
 +2003-01-06  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.405 (erc-ctcp-query-VERSION):
 +	v%s -> %s, so we are no longer vVersion...
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.404: Small change to erc-ison-p, and fixme tag
 +
 +2003-01-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.403 (erc):
 +	Fixed bug where variable "away" would be nil in new channel buffers
 +	       even if the user is away when joining the channel.
 +	(erc-strip-controls): Fixed a bug where erc-strip-controls accidentally
 +	       removed all text properties from the string.
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.9:
 +	Some stub functions, some code, nothing really works yet
 +
 +	* erc.el 1.402 (erc-ison-p): New function
 +
 +	* erc-dcc.el 1.8: Some functions which will be needed for dcc send
 +
 +	* erc-dcc.el 1.7 (erc-ip-address-to-decimal):
 +	New function, thanks lawrence
 +
 +	* erc-dcc.el 1.6: Again, simplify code, fix stuff, DCC CHAT works now
 +
 +	* erc-dcc.el 1.5: Many fixes, chat nearly works now
 +
 +	* erc-netsplit.el 1.7: Also detect fast netsplit/joins
 +
 +	* erc-dcc.el 1.4: some more fixes
 +
 +	* erc-dcc.el 1.3: Fixup stage 1, now dcc get works
 +
 +	* erc-dcc.el 1.2: make /dcc LIST work
 +
 +	* erc-dcc.el 1.1:
 +	Initial checkin, dont use it!  its really far from complete.  Hackers: help!
 +
 +	* erc-notify.el 1.11:
 +	New function erc-notify-NICK, and added signon/off hooks which were missing
 +
 +2003-01-05  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.401 (erc-truncate-buffer-to-size):
 +	set inhibit-read-only to t for the
 +	deletion. This is usually done by the function calling the hook, but
 +	not if it's called interactively. Also, rewrote some weird if/if
 +	combination.
 +
 +	* erc-track.el 1.43 (erc-track-shortennames):
 +	Documentation fix (erc-all-buffers is really
 +	erc-all-buffer-names)
 +
 +	These changes make server buffers be tracked as well, as there are
 +	quite a few interesting things going on there (e.g. CTCP etc.)
 +	(erc-all-buffer-names): Check for (eq major-mode 'erc-mode) instead of
 +	erc-default-recipients.
 +	(erc-track-modified-channels): Don't require a default target (e.g.,
 +	this-channel being non-nil)
 +
 +2003-01-03  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.400:
 +	erc-auto-query: can now be set to a symbol to control how new messages should
 +	    be popped up (or not popped up, as the case may be)
 +	(erc-query): new function which handles the bulk of what (erc-cmd-QUERY) did
 +	    previously
 +	(erc-cmd-QUERY): use (erc-query)
 +	(erc-auto-query): use (erc-query)
 +
 +	* erc.el 1.399 (erc-current-logfile):
 +	Downcase result of log generation function, as IRC is
 +	case insensitive. Fixes problems where "/query user" results in a different
 +	log file to a query from "User". Avoided adding an extra flag to control this
 +	behavior - if you think this was the wrong decision, please correct it and
 +	I'll remember it for next time.
 +
 +See ChangeLog.02 for earlier changes.
 +
 +    Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
diff --cc ChangeLog.04
index 75c2b71,0000000..feaead1
mode 100644,000000..100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@@ -1,2080 -1,0 +1,2095 @@@
 +2004-12-29  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-interpret-controls-p): Changed docstring to
 +	reflect the new meaning if this is set to 'remove.
 +	(erc-controls-interpret): Rephrased docstring to be more accurate.
 +	(erc-controls-strip): New function that behaves like the
 +	recently-removed erc-strip-controls -- it removes all IRC color
 +	and highlighting control characters.
 +	(erc-controls-highlight): Changed to support the new 'remove value
 +	that variable erc-interpret-controls-p might have.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-ibuffer.el, erc-list.el, erc-page.el, erc-speedbar.el:
 +	Changed all calls to erc-interpret-controls (which no longer
 +	exists) to call erc-controls-interpret (the new name of the same
 +	function).
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-interpret): Added this function to
 +	replace the recently-removed erc-interpret-controls.  Also added
 +	a (require 'erc) to solve a byte-compile problem.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-controls-interpret): Added this function to replace
 +	the recently-removed erc-interpret-controls.
 +
 +2004-12-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Check for
 +	logging even better (via lawrence).
 +
 +2004-12-26  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Much saner
 +	logging detection (via lawrence).
 +
 +2004-12-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-highlight): Treat single C-c
 +	correctly.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: Deleted IRC control character processing
 +	and implemented a sane version in erc-goodies.el as a module.
 +
 +	* erc.el (erc-merge-controls, erc-interpret-controls,
 +	erc-decode-controls, erc-strip-controls, erc-make-property-list,
 +	erc-prepend-properties): Removed.
 +
 +	(erc-interpret-controls-p, erc-interpret-mirc-color, erc-bold-face
 +	erc-inverse-face, erc-underline-face, fg:erc-color-face0,
 +	fg:erc-color-face1, fg:erc-color-face2, fg:erc-color-face3,
 +	fg:erc-color-face4, fg:erc-color-face5, fg:erc-color-face6,
 +	fg:erc-color-face7, fg:erc-color-face8, fg:erc-color-face9,
 +	fg:erc-color-face10, fg:erc-color-face11, fg:erc-color-face2,
 +	fg:erc-color-face13, fg:erc-color-face14, fg:erc-color-face15,
 +	bg:erc-color-face1, bg:erc-color-face2, bg:erc-color-face3,
 +	bg:erc-color-face4, bg:erc-color-face5, bg:erc-color-face6,
 +	bg:erc-color-face7, bg:erc-color-face8, bg:erc-color-face9,
 +	bg:erc-color-face10, bg:erc-color-face11, bg:erc-color-face2,
 +	bg:erc-color-face13, bg:erc-color-face14, bg:erc-color-face15,
 +	erc-get-bg-color-face, erc-get-fg-color-face,
 +	erc-toggle-interpret-controls): Moved.
 +
 +	* erc-goodies.el (erc-beep-p, irccontrols, erc-controls-highlight,
 +	erc-controls-propertize): New.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit.
 +	 Moved some functions from erc.el to erc-goodies.el, and
 +	transformed them to erc modules in the process.
 +	- imenu autoload stuff moved. I don't know why it is here at all.
 +	- Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
 +	smiley,   unmorse, erc-occur (the last isn't a module, but still
 +	moved)
 +	(erc-input-line-position, erc-add-scroll-to-bottom,
 +	erc-scroll-to-bottom, erc-make-read-only, erc-noncommands-list,
 +	erc-send-distinguish-noncommands, erc-smiley, erc-unmorse,
 +	erc-occur): Moved from erc.el to erc-goodies.el.
 +	(smiley): Module moved from erc.el to erc-goodies.el.
 +	(scrolltobottom, readonly, noncommands, unmorse): New modules.
 +
 +2004-12-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-away-status): Use `a', not `away' - that's
 +	why it's there.
 +	(erc-update-mode-line-buffer): The values of `mode-line-process'
 +	and `mode-line-buffer-identification' are normally lists.
 +	Conform.
 +
 +2004-12-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-ctcp-query, erc-process-ctcp-reply): Display
 +	message in the active window, not the server window.
 +
 +2004-12-16  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Check for
 +	'erc-track-mode variable with boundp. From Adrian Aichner
 +	<adrian@xemacs.org>.
 +
 +2004-12-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-upcase-first-word): New function. The old way used
 +	in erc-send-ctcp-message would eat consecutive whitespace etc.
 +	(erc-send-ctcp-message, erc-send-ctcp-notice): Use it.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Fix braino with my previous
 +	patch. It always helps to C-x C-s before `cvs commit'.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Only upcase the ctcp command,
 +	and not the entire message. Revision 1.707 had broken /me.
 +	Shouting is bad! :)
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-networks-alist): Change undernet to Undernet as
 +	is used in `erc-server-alist', so that completion works when using
 +	`erc-server-select'.  This should fix Debian bug #282003 (erc:
 +	cannot connect to Undernet).
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el: (def-edebug-spec): Only run this if 'edebug is
 +	available.
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: The last change to `erc-mode-line-format' introduced a
 +	bug in Xemacs - it can't handle the #(" "...) strings at all.  The
 +	following changes fix the bug and simplify the mode-line handling
 +	considerably.  (erc-mode-line-format): Now defined as a string
 +	which will be formatted using `format-spec' and take the place of
 +	`mode-line-buffer-identification' in the mode line.
 +	(erc-header-line-format): Now defined as a string to be formatted
 +	using `format-spec'.
 +	(erc-prepare-mode-line-format): Removed.
 +	(erc-format-target, erc-format-target-and/or-server,
 +	erc-format-away-status, erc-format-channel-modes): New functions.
 +	Basically the old `erc-prepare-mode-line-format' split apart.
 +	(erc-update-mode-line-buffer): Set
 +	`mode-line-buffer-identification' to the formatted
 +	`erc-mode-line-format', set `mode-line-process' to ": CLOSED" if
 +	the connection has been terminated, and set `header-line-format'
 +	(if it is bound) to the formatted `erc-header-line-format', then
 +	do a `force-mode-line-update'.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Disable modules removed with `customize'.
 +	(erc-update-modules): Try to give a more descriptive error
 +	message.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-complete.el, erc.el, erc-list.el, erc-nets.el,
 +	erc-nicklist.el, erc-pcomplete.el, erc-replace.el, erc-speak.el,
 +	erc-truncate.el: (erc-buffers, erc-coding-systems, erc-display,
 +	erc-mode-line-and-header, erc-ignore, erc-query,
 +	erc-quit-and-part, erc-paranoia, erc-scripts, erc-old-complete,
 +	erc-list, erc-networks, erc-nicklist, erc-pcomplete, erc-replace,
 +	erc-truncate): New customization groups.  (erc-join-buffer,
 +	erc-frame-alist, erc-frame-dedicated-flag, erc-reuse-buffers): Use
 +	'erc-buffers as `:group'.  (erc-default-coding-system,
 +	erc-encoding-coding-alist): Use 'erc-coding-systems as `:group'.
 +	(erc-hide-prompt, erc-show-my-nick, erc-prompt,
 +	erc-input-line-position, erc-command-indicator, erc-notice-prefix,
 +	erc-notice-highlight-type, erc-interpret-controls-p,
 +	erc-interpret-mirc-color, erc-minibuffer-notice,
 +	erc-format-nick-function): Use 'erc-display as `:group'.
 +	(erc-mode-line-format, erc-header-line-format,
 +	erc-header-line-uses-help-echo-p, erc-common-server-suffixes,
 +	erc-mode-line-away-status-format): Use 'erc-mode-line-and-header
 +	as `:group'.
 +	(erc-hide-list, erc-ignore-list, erc-ignore-reply-list,
 +	erc-minibuffer-ignored): Use 'erc-ignore as `:group'.
 +	(erc-auto-query, erc-query-on-unjoined-chan-privmsg,
 +	erc-format-query-as-channel-p): Use 'erc-query as `:group'.
 +	(erc-kill-buffer-on-part, erc-kill-queries-on-quit,
 +	erc-kill-server-buffer-on-quit, erc-quit-reason-various-alist,
 +	erc-part-reason-various-alist, erc-quit-reason, erc-part-reason):
 +	Use 'erc-quit-and-part as `:group'.
 +	(erc-verbose-server-ping, erc-paranoid, erc-disable-ctcp-replies,
 +	erc-anonymous-login, erc-show-channel-key-p): Use 'erc-paranoia as
 +	`:group'.
 +	(erc-startup-file-list, erc-script-path, erc-script-echo): Use
 +	'erc-scripts as `:group'.
 +	(erc-nick-completion, erc-nick-completion-ignore-case,
 +	erc-nick-completion-postfix): Use 'erc-old-complete as `:group'.
 +	(erc-chanlist-progress-message, erc-no-list-networks,
 +	erc-chanlist-frame-parameters, erc-chanlist-hide-modeline,
 +	erc-chanlist-mode-hook): Use 'erc-list as `:group'.
 +	(erc-server-alist, erc-networks-alist): Use 'erc-networks as
 +	`:group'.
 +	(erc-settings): Use `defvar' instead of `defcustom' since this is
 +	only a draft which doesn't work.
 +	(erc-nicklist-window-size): Use 'erc-nicklist as `:group'.
 +	(erc-pcomplete-nick-postfix,
 +	erc-pcomplete-order-nickname-completions): Use 'erc-pcomplete as
 +	`:group'.
 +	(erc-replace-alist): Use 'erc-replace as `:group'.
 +	(erc-speak-filter-timestamp): Use 'erc-speak as `:group'.
 +	(erc-max-buffer-size): Use 'erc-truncate as `:group'.
 +
 +2004-12-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Go to the end of the buffer
 +	before recentering. This allows editing multiple lines more
 +	conveniently in CVS Emacs. This also undos a change by antifuchs
 +	who said this goto-char would mess up redisplay. Extensive testing
 +	couldn't reproduce that problem.
 +
 +2004-12-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-send-ctcp-message): upcase the ctcp message (so that
 +	version becomes VERSION, for example).
 +	(erc-iswitchb): Make the argument optional in non-interactive
 +	invocation, so erc-iswitchb can be substituted directly for
 +	iswitchb in code.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Allow for the
 +	fact that `erc-track-mode' isn't bound when file is loaded.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): New customizable
 +	variable.  (erc-track-remove-from-mode-line): New function.
 +	Remove `erc-modified-channels-string' from the mode-line.
 +	(erc-track-add-to-mode-line): New function.  Add
 +	`erc-modified-channels-string' to the mode-line using the value of
 +	`erc-track-position-in-mode-line' to determine whether to add it
 +	to the beginning or the end of `mode-line-modes' (only available
 +	with GNU Emacs versions above 21.3) or to the end of
 +	`global-mode-string'.
 +	(erc-track-mode, erc-track-when-inactive-mode): Use the new
 +	functions.
 +
 +2004-12-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use (buffer-name) and not
 +	(erc-default-target) for the buffer name - buffer names are case
 +	sensitive.
 +
 +2004-12-11  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-message-type): Added the message "MODE" to the known
 +	erc-message-type widget, so that (for example) people can tell
 +	erc-track-exclude-types to ignore mode changes. The others tag
 +	also needed to be made an inline list, so that it's merged with
 +	the given constants, instead of being inserted as a list.
 +
 +2004-12-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el, erc.el: Update to get ERC look nicely in CVS Emacs.
 +
 +	* erc.el (erc-mode-line-format): When on CVS emacs, use the new
 +	format.
 +
 +	* erc-track.el (track module): When on CVS emacs, modify
 +	mode-line-modes instead of global-mode-string. The latter is way
 +	to far too the right.
 +
 +2004-11-18  Mario Lang <mlang@delysid.org>
 +
 +	* Makefile, debian/changelog: debian release 20041118-1
 +
 +2004-11-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-buttonize-nicks): Set default value to
 +	`t'.  Updated documentation and customization `:type' to reflect
 +	usage.
 +
 +2004-10-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* AUTHORS: Added self.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Added local variables for this file.
 +	(erc-list-version): New.
 +	(erc-cmd-LIST): Take &rest rather than &optional arguments, as was
 +	done in revision 1.21.  Allow for input when called interactively.
 +	(erc-prettify-channel-list, erc-chanlist-toggle-sort-state): Use
 +	`unless' instead of when not.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): Fixed so
 +	that the contents are only shown once. (MOTD): Display lines in
 +	the server buffer if it's the first MOTD sent upon connection.
 +	This is to avoid the problem of having the MOTD of one server
 +	showing up in another server's buffer if it took a while to get
 +	connected.
 +	(004): Fixed to show the user modes and channel modes correctly.
 +	(303): Now displays the nicknames returned by ISON instead of the
 +	user's nickname.
 +	(367, 368): Moved up into 300's section of the code.  Added
 +	documentation.  Use `multiple-value-bind' to set variables in 367.
 +	(391): Fixed so that the server name is shown correctly.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Use CPROC instead of
 +	`erc-process' in debug message.  Should fix a bug where an error
 +	saying "Buffer *scratch* has no process" would occur when
 +	disconnected.
 +	(erc-cmd-SV): Check for X toolkit after checking for more specific
 +	features.  (erc--kill-server): Set `quitting' to non-nil so that
 +	we don't automatically reconnect.
 +
 +2004-10-05  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-ignored-user-p): Don't require regexes to match the
 +	beginning.
 +
 +2004-09-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: group erc: Moved to 'applications (patch by bojohan)
 +
 +2004-09-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: (erc-button-remove-old-buttons): Remove 'keymap
 +	not 'local-map.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Typo fix of the last
 +	commit.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Run `erc-join-hook'
 +	without arguments as specified in the docstring.
 +
 +2004-08-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-current-line): Removed unused variable SENTP.
 +
 +2004-08-19  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: ERC-SEND-COMPLETED-HOOK used to be run when the prompt
 +	was already displayed. We restore this behavior (thanks to bojohan
 +	and TerryP for noticing). We also fix the docstring of
 +	ERC-SEND-COMPLETED-HOOK, since the hook is (and used to be) called
 +	even if nothing was sent to the server.
 +	(erc-send-completed-hook): Fixed docstring.
 +	(erc-send-current-line): Add incantation for
 +	erc-send-completed-hook.
 +	(erc-send-input): Remove incantation for erc-send-completed-hook.
 +
 +2004-08-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: response-handler 368: Use s368, not s367.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Don't scroll when we're not
 +	connected anymore.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: Handle /mode #emacs b output without
 +	errors and such. First, handle unknown format specs gracefully
 +	(that is, give a useful error). Then, provide handlers for the
 +	banlist replies.
 +
 +	* erc-backend.el: New handler for 367 and 368. Removed from default
 +	handler.
 +
 +	* erc.el: Provide english catalog for s367 and s368.
 +	(erc-format-message): Give an error message when we don't find an
 +	entry.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: erc-fill-variable could be confused about really
 +	long nicks. We put an upper limit on the length of the fill prefix.
 +	(erc-fill-variable): Adjust fill-prefix.
 +	erc-fill-variable-maximum-indentation: New variable.
 +
 +2004-08-17  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-send-input): Fixed a bug where this function
 +	referenced variable "input" instead of variable "str".
 +
 +2004-08-16  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-highlight-line): Fixed a bug where
 +	this function failed to set the correct face for highlighting the
 +	current line.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el (erc-fill-variable): Don't fuck up when the
 +	looking-at didn't work.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-single-line): Call the hooks to change the
 +	appearance for something only if we actually inserted something,
 +	doh.
 +	(erc-display-command): Display the prompt outside of the area that
 +	set the text properties on.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: Refactored erc-send-current-line. This should fix some
 +	dormant bugs, and make the whole thing actually readable. Yay.
 +	Some changes in behavior were made. Whitespace at the end of lines
 +	sent is not removed anymore, but that shouldn't bother anyone.
 +	Additionally, errors in commands or hooks shouldn't prevent the
 +	prompt from showing up again now.
 +	(erc-parse-current-line): Removed.
 +	(erc-send-current-line): Refactored.
 +	(erc-send-input): New function.
 +	(erc-send-single-line): New function.
 +	(erc-display-command): New function.
 +	(erc-display-msg): New function.
 +	(erc-user-input): New function.
 +
 +2004-08-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SERVER): Use newer keyword call interface to
 +	erc-select, and handle the error if it can't resolve the host.
 +
 +2004-08-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: erc-backend.el (404 response handler):
 +	New function. We now support "cannot send to channel".
 +
 +	* erc.el (erc-define-catalog call): Added s404. erc.el
 +	(erc-ctcp-ECHO-reply, erc-ctcp-CLIENTINFO-reply,
 +	erc-ctcp-FINGER-reply, erc-ctcp-PING-reply, erc-ctcp-TIME-reply,
 +	erc-ctcp-VERSION-reply): Display reply in the active window, not
 +	the server window.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Actually make it left
 +	to right, doh.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Evaluate left-to-right
 +	so we don't surprise a user.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Parentophobia! Another
 +	paren-fix.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: PRIVMSG NOTICE response handler: Killed one paren
 +	too much. Poor paren. Got resurrected.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el: Make server buffers showing up in the mode line
 +	optional. Thanks to Daniel Knapp on the EmacsWiki for this patch.
 +
 +	erc-track-exclude-server-buffer: New variable.
 +	(erc-track-modified-channels): Return a server buffer only if
 +	erc-track-exclude-server-buffer is nil.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-DESCRIBE): Don't parse arguments.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el: (erc-truncate-buffer-to-size): Use
 +	erc-insert-marker, not (point-max), to decide the length of the
 +	buffer. A long input line shouldn't make the buffer smaller.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-macs.el, erc-members.el: The change to hashes for channel
 +	members has been made some time ago.  Clean up the various tries to
 +	do this in the past.
 +
 +	erc-macs.el: Removed.  erc-members.el: Removed.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc-ibuffer.el, erc-members.el, erc.el: Nothing
 +	big changed here. Really. Uhm, maybe the info-buffers are gone or
 +	so.  Can't really remember. Don't worry, nothing important is
 +	missing.
 +
 +	erc-speedbar.el looks nice btw, did you know?
 +
 +	Adjusted various places in erc.el, erc-backend.el, erc-ibuffer.el
 +	and erc-members.el - too numerous to list here, sorry.
 +
 +	* erc.el: erc-use-info-buffers: Removed.  erc-info-mode-map:
 +	Removed.
 +	(erc-info-mode): Removed.
 +	(erc-find-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffers): Removed.
 +
 +	* erc-members.el: erc-update-member renamed to
 +	erc-update-channel-member for better clarity.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: This change improves the help output on a bogus command
 +	invocation. We display the command as it would be typed by the
 +	user, not as it is seen by Emacs.
 +
 +	(erc-get-arglist): Is now called erc-function-arglist, and returns
 +	now an arglist without the enclosing parens.
 +	(erc-command-name): New function.
 +	(erc-process-input-line): Pass the command name, not the function
 +	name.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-input-line): Fix bug when the command
 +	doesn't have an arglist or no documentation. Thanks bojohan again
 +	:)
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list),
 +	(erc-remove-entry-from-list): Update docstring, a TEST argument is
 +	not given.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Really fix this docstring.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Fix double evaluation in macro, and
 +	fix docstring.
 +
 +2004-08-10  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-cmd-JOIN): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-backend.el: Define an "Edebug specification" for the
 +	`define-erc-response-handler' macro. This means that one can step
 +	through response handlers defined by this macro with edebug. Maybe
 +	more macros would benefit from this?
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/CTCP): New function.
 +	Completion for the /CTCP command.  (erc-pcomplete-ctcp-commands):
 +	New variable. List of ctcp commands.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-list.el: Clean up docstrings.
 +	(erc-prettify-channel-list): Extend properties to cover the entire
 +	line, including the newline, to make it look
 +	better.
 +	(erc-chanlist-highlight-line): Ditto.
 +	(erc-chanlist-mode-hook): Make it a defcustom.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-compute-full-name): Typo fix, should be full-name,
 +	not name.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc): Setup the buffer to be shown in a window at the
 +	end of this function. This enables 'window-noselect to work
 +	properly.
 +	(erc, erc-send-current-line): Fix some
 +	goto-char/open-line/goto-char to goto-char/insert.
 +
 +2004-08-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-parse-user): Live with bogus info from bouncers.
 +
 +2004-07-31  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select): Change the docstring to reflect the new
 +	arguments; include the arguments in the docstring for non-cvs
 +	emacs. Change the parameters to call erc-compute-* instead of
 +	using the erc-* variables directly.
 +	(erc-compute-server): Made argument optional.
 +	(erc-compute-nick): ditto.
 +	(erc-compute-full-name): ditto.  (erc-compute-port): ditto.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where channel-banlist was
 +	not reset to nil before fetching an updated banlist from the
 +	server.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where the
 +	'received-from-server property on variable channel-banlist was not
 +	being reset to nil.  This fixes the symptom where one types
 +	/BANLIST and sees "No bans for channel: #whatever" when you know
 +	there are bans.
 +
 +2004-07-23  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-select-read-args): Use erc-compute-nick to
 +	calculate the default nickname
 +
 +2004-07-20  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-process-sentinel-1): New function. This is an
 +	auxiliary function refactored out of erc-process-sentinel to
 +	decide a server buffer's fate (whether it should be killed, and
 +	whether erc should attempt to auto-reconnect).  Michael Olson
 +	<mwolson@gnu.org> helped with this.
 +	(erc-kill-server-buffer-on-quit): New variable. Used in
 +	erc-process-sentinel-1 to decide whether to kill a server buffer
 +	when the user quit normally.
 +	(erc-process-sentinel): Auxiliary function erc-process-sentinel-1
 +	split out.  The function body has `with-current-buffer' wrapped
 +	around it, to ensure separation of messages if multiple
 +	connections were being made.  Use `if' instead of `cond' in places
 +	where the decision is binary.  The last (useless, since the server
 +	connection is closed) prompt in the server buffer is removed.
 +	Color "erc terminated" and "erc finished" messages with
 +	erc-error-face.  Mark the buffer unmodified so that, if not killed
 +	automatically, the user is not prompted to save it.
 +
 +2004-07-16  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select-read-args): New function. Prompts the user
 +	for arguments to pass to erc-select and erc-select-ssl.
 +	(erc-select): Use (erc-select-read-args) when called interactively
 +	to get its arguments.  When non-interactively, use keyword
 +	arguments.
 +	(erc-select-ssl): Ditto.
 +	(erc-compute-port): New function. Parallel to erc-compute-server,
 +	but comes up with a default value for an IRC server's port.
 +
 +2004-07-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Quote the current nickname.
 +
 +2004-07-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-mode): Remove explicit invocation of
 +	erc-chanlist-mode-hook, since it's automatically invoked by
 +	define-derived-mode
 +
 +2004-07-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-current-nick-p): Quote current nick for
 +	regexp parsing.
 +
 +2004-06-27  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-nickserv.el (erc-nickserv-identify-mode): Fix erroneous
 +	parentheses in call to `completing-read'.
 +
 +2004-06-23  Alex Schroeder <alex@gnu.org>
 +
 +	* Makefile (release): Depend on autoloads, and copy erc-auto.el
 +	into the tarball.
 +
 +2004-06-14  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed minor bug where each line
 +	received from a server was logged as two lines (one with text and
 +	one blank).
 +
 +2004-06-08  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-frame-parameters): Made customizable.
 +	(erc-chanlist-header-face): Changed to use defface with some
 +	reasonable defaults instead of make-face, and removed the
 +	associated -face variable.
 +	(erc-chanlist-odd-line-face): Ditto.
 +	(erc-chanlist-even-line-face): Ditto.
 +	(erc-chanlist-highlight-face): New variable. Holds a face used for
 +	highlighting the current line.
 +	(erc-cmd-LIST): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +	(erc-chanlist-post-command-hook): Change to move the highlight
 +	overlay instead of refontifying the entire buffer.
 +	(erc-chanlist-dehighlight-line): Added to detach the highlight
 +	overlay from the buffer.
 +
 +2004-05-31  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-mode-line-format: Add column numbers.
 +
 +2004-05-31  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-autojoin.el: Typo fix.
 +
 +	* erc-dcc.el (erc-dcc-do-GET-command): Use expand-file-name.
 +	(erc-dcc-get-file): XEmacs set-buffer-multibyte compatibility.
 +
 +	* erc-log.el: Append `erc-log-setup-logging' to
 +	`erc-connect-pre-hook' so that `erc-initialize-log-marker' is run
 +	first (markers are needed by `erc-log-setup-logging').
 +	(erc-enable-logging): Docstring fix.
 +	(erc-log-setup-logging): Move `erc-log-insert-log-on-open' to (1-
 +	(point-max)) when doing `erc-log-insert-log-on-open'.  Modified
 +	version of a patch by Lawrence Mitchell.
 +	(erc-log-all-but-server-buffers): Do `save-excursion' as well.
 +	(erc-current-logfile): Pass buffer name as target
 +	argument to `erc-generate-log-file-name-function' if
 +	`erc-default-target' is nil.
 +	(erc-generate-log-file-name-with-date): Use expand-file-name.
 +	(erc-generate-log-file-name-short): Ditto.
 +	(erc-save-buffer-in-logs): Do `save-excursion' and test whether
 +	erc-last-saved-position is a marker.
 +
 +	* erc-members.el: Avoid miscompiling macro `erc-log' and
 +	`with-erc-channel-buffer' by requiring 'erc at compile time.
 +
 +	* erc-sound.el: Use expand-file-name.
 +
 +	* erc.el (erc-debug-log-file): Ditto.
 +	(erc-find-file): Ditto.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-BANLIST): Added a missing "'"
 +	that was preventing /BANLIST from working.  In erc-backend.el,
 +	added server repsonse handler for 367 and 368 reponses to get
 +	/BANLIST working.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Removed an eval-when-compile that was preventing the
 +	byte-compiled version of this file from loading.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Undid part of my last change.  I suspect it was wrong.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Silenced several byte-compiler warnings.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed problem where this function
 +	misformatted IRC protocol text if multiple lines were received from
 +	the server at one time.
 +
 +2004-05-25  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Cosmetic changes to the
 +	informational text in the *erc-protocol* buffer.
 +
 +2004-05-24  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol, erc-process-filter): Now the lines
 +	inserted in the *erc-protocol* buffer are prefixed with the name
 +	of the network to/from which the data is going/coming.  This makes
 +	reading the *erc-protocol* buffer much easier when connected to
 +	multiple networks.
 +
 +2004-05-23  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-backend.el: Fixes server message parsing so that command
 +	arguments specified after the colon are not treated specially. All
 +	arguments are added to the `command-args' field, and the
 +	`contents' points to the last element in the `command-args' list.
 +	This allows ERC to connect to networks such as Undernet.  Although
 +	keeping `contents' allows many of the response handlers to
 +	continue to work as-is, many other are probably broken by this
 +	patch.
 +
 +2004-05-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Add comment that C-c C-a can be useful if you write
 +	ChangeLog entries using Emacs' standard functions.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Ignore errors when attempting to require dframe
 +	(there are a couple implementations of speedbar, one of which uses
 +	of dframe).
 +	(erc-speedbar-version): New.
 +	(erc-speedbar-goto-buffer): Use dframe functions if dframe is
 +	available.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autojoin.el: Added local variables for this file.
 +	(erc-autojoin-add): The channel name is in `erc-response.contents'.
 +
 +2004-05-17  Mario Lang <mlang@delysid.org>
 +
 +	* erc-log.el: Dont autoload a define-key statement, erc-mode-map
 +	might not be known yet
 +
 +2004-05-16  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-parse-server-response): Revert to original
 +	`erc-parse-line-from-server' version, since new version breaks for
 +	a number of edge cases.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): New
 +	function.  Added to `erc-default-server-functions'.  Display
 +	unknown responses to the user.
 +	(221): Don't show nickname in modes list.
 +	(254): Fixed to use 's254.
 +	(303): Added docstring.
 +	(315, 318, 323, 369): Ignored responses grouped together.
 +	(391): New.
 +	(406, 432): Use ?n, not ?c in `erc-display-message'.
 +	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
 +	502): All error responsess with no arguments grouped together.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-message-type-member): Use `erc-response.command'.
 +	`erc-track-exclude-types' should be respected again.
 +	(erc-cmd-TIME): Fixed to work with and without server given as
 +	argument.
 +	(erc-define-catalog): Added, s391, s431, s445, s446, s451, s462,
 +	s463, s464, s465, s483, s484, s485, s491, s501, s502.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Typo fix.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* Makefile (erc-auto.el): Pass -f flag to rm so that we don't fail
 +	if erc-auto.elc doesn't exist.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-with-buffer): Autoload.
 +	(erc-parse-server-response): XEmacs' `replace-match' only replaces
 +	subexpressions when operating on buffers, not strings, work around
 +	it.
 +	(461): Command with invalid arguments is `second', not `third'.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-notify.el (erc-notify-NICK): Use `erc-response.contents' to
 +	get nickname.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-track.el: Indentation fixes.
 +	(track-when-inactive): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-notify.el (notify): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-notify-timer, erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (services, erc-nickserv-identify-mode): Use
 +	`erc-server-FOO-functions', not `erc-server-FOO-hook.
 +	(erc-nickserv-identify-autodetect): Use new accessors for PARSED
 +	argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-netsplit.el (netsplit): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-netsplit-JOIN, erc-netsplit-MODE, erc-netsplit-QUIT): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-menu.el (erc-menu-definition): Only allow listing of
 +	channels if `erc-cmd-LIST' is fboundp.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-match.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-get-parsed-vector-nick, erc-get-parsed-vector-type): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-chanlist, erc-chanlist-322): Use new accessors
 +	for PARSED argument.  Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-ezbounce.el (erc-ezb-notice-autodetect): Use new accessors
 +	for PARSED argument.
 +	(erc-ezb-initialize): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-dcc-no-such-nick): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-bbdb.el (erc-bbdb-whois, erc-bbdb-JOIN, erc-bbdb-NICK): Use
 +	new accessors for PARSED argument.
 +	(BBDB): Use `erc-server-FOO-functions', not `erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autojoin.el (autojoin): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-autojoin-add, erc-autojoin-remove): Use new accessors for
 +	PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autoaway.el (autoaway): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-backend): Require.
 +	(erc-disconnected-hook, erc-join-hook, erc-quit-hook)
 +	(erc-part-hook, erc-kick-hook): Docstring fix, we now use
 +	`erc-server-FOO-functions', rather than `erc-server-FOO-hook'.
 +	(erc-event-to-hook-name, erc-event-to-hook): Remove.
 +	(erc-once-with-server-event)
 +	(erc-once-with-server-event-global): Use `erc-get-hook'
 +	(erc-process-filter): Use `erc-parse-server-response'.
 +	(erc-cmd-IDLE, erc-cmd-BANLIST, erc-cmd-MASSUNBAN): New accessors
 +	for PARSED argument.  Rename all `erc-server-FOO-hook' to
 +	`erc-server-FOO-functions'.
 +	(erc-server-364-hook, erc-server-365-hook, erc-server-367-hook)
 +	(erc-server-368-hook, erc-server-KILL-hook)
 +	(erc-server-PONG-hook, erc-server-200-hook, erc-server-201-hook)
 +	(erc-server-202-hook, erc-server-203-hook, erc-server-204-hook)
 +	(erc-server-205-hook, erc-server-206-hook, erc-server-208-hook)
 +	(erc-server-209-hook, erc-server-211-hook, erc-server-212-hook)
 +	(erc-server-213-hook, erc-server-214-hook, erc-server-215-hook)
 +	(erc-server-216-hook, erc-server-217-hook, erc-server-218-hook)
 +	(erc-server-219-hook, erc-server-241-hook, erc-server-242-hook)
 +	(erc-server-243-hook, erc-server-244-hook, erc-server-249-hook)
 +	(erc-server-261-hook, erc-server-262-hook, erc-server-302-hook)
 +	(erc-server-323-hook, erc-server-342-hook, erc-server-351-hook)
 +	(erc-server-381-hook, erc-server-382-hook, erc-server-391-hook)
 +	(erc-server-392-hook, erc-server-393-hook, erc-server-394-hook)
 +	(erc-server-395-hook, erc-server-402-hook, erc-server-404-hook)
 +	(erc-server-407-hook, erc-server-409-hook, erc-server-411-hook)
 +	(erc-server-413-hook, erc-server-414-hook, erc-server-415-hook)
 +	(erc-server-422-hook, erc-server-423-hook, erc-server-424-hook)
 +	(erc-server-431-hook, erc-server-436-hook, erc-server-437-hook)
 +	(erc-server-441-hook, erc-server-443-hook, erc-server-444-hook)
 +	(erc-server-445-hook, erc-server-446-hook, erc-server-451-hook)
 +	(erc-server-462-hook, erc-server-463-hook, erc-server-464-hook)
 +	(erc-server-465-hook, erc-server-467-hook, erc-server-471-hook)
 +	(erc-server-472-hook, erc-server-473-hook, erc-server-483-hook)
 +	(erc-server-491-hook, erc-server-502-hook): Remove.
 +	(erc-call-hooks, erc-parse-line-from-server): Remove
 +	(erc-server-hook-list): Remove.  Remove top-level call too.
 +	(erc-server-ERROR, erc-server-INVITE, erc-server-JOIN)
 +	(erc-server-KICK, erc-server-MODE, erc-server-NICK)
 +	(erc-server-PART, erc-server-PING, erc-server-PONG)
 +	(erc-server-PRIVMSG-or-NOTICE, erc-server-QUIT)
 +	(erc-server-TOPIC, erc-server-WALLOPS, erc-server-001)
 +	(erc-server-004, erc-server-005, erc-server-221, erc-server-252)
 +	(erc-server-253, erc-server-254, erc-server-301, erc-server-303)
 +	(erc-server-305, erc-server-306, erc-server-311-or-314)
 +	(erc-server-312, erc-server-313, erc-server-317, erc-server-319)
 +	(erc-server-320, erc-server-321, erc-server-322, erc-server-324)
 +	(erc-server-329, erc-server-330, erc-server-331, erc-server-332)
 +	(erc-server-333, erc-server-341, erc-server-352, erc-server-353)
 +	(erc-server-366, erc-server-MOTD, erc-server-379)
 +	(erc-server-401, erc-server-403, erc-server-405, erc-server-406)
 +	(erc-server-412, erc-server-421, erc-server-432, erc-server-433)
 +	(erc-server-437, erc-server-442, erc-server-461, erc-server-474)
 +	(erc-server-475, erc-server-477, erc-server-481, erc-server-482)
 +	(erc-server-501): Move to erc-backend.el
 +	(erc-auto-query, erc-banlist-store, erc-banlist-finished)
 +	(erc-banlist-update, erc-connection-established)
 +	(erc-process-ctcp-query, erc-display-server-message): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el: (erc-parse-server-response)
 +	(erc-handle-parsed-server-response, erc-get-hook)
 +	(define-erc-response-handler): New functions.
 +	(erc-response): New struct for server responses.
 +	(erc-server-responses): New variable.
 +	(erc-call-hooks): Move from erc.el and rework.
 +	(ERROR, INVITE, JOIN, KICK, MODE, NICK, PART, PING, PONG)
 +	(PRIVMSG, NOTICE, QUIT, TOPIC, WALLOPS, 001, MOTD, 376, 004)
 +	(252, 253, 254, 250, 301, 303, 305, 306, 311, 312, 313, 315)
 +	(317, 318, 319, 320, 321, 322, 324, 329, 330, 331, 332, 333)
 +	(341, 352, 353, 366, 369, 379, 401, 403, 405, 406, 412, 421)
 +	(432, 433, 437, 442, 461, 474, 477, 481, 482, 501, 323, 221)
 +	(002, 003, 371, 372, 374, 375, 422, 251, 255, 256, 257, 258)
 +	(259, 265, 266, 377, 378, 314, 475, 364, 365, 367, 368, 381)
 +	(382, 391, 392, 393, 394, 395, 200, 201, 202, 203, 204, 205)
 +	(206, 208, 209, 211, 212, 213, 214, 215, 216, 217, 218, 219)
 +	(241, 242, 243, 244, 249, 261, 262, 302, 342, 351, 402, 404)
 +	(407, 409, 411, 413, 414, 415, 423, 424, 431, 436, 441, 443)
 +	(444, 445, 446, 451, 462, 463, 464, 465, 467, 471, 472, 473)
 +	(483, 491, 502, 005, KILL): Move from erc.el and rework using
 +	`define-erc-response-handler' and erc-response struct.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: A few bug fixes to avoid errors after disconnect,
 +	including the "Selecting deleted buffer" bug.
 +	(erc-channel-user-op-p, erc-channel-user-voice-p): Make sure NICK
 +	is non-nil (`erc-current-nick' can return nil).
 +	(erc-server-buffer): Make sure the buffer isn't a #<killed
 +	buffer>.
 +	(erc-server-buffer-live-p): New function.
 +	(erc-display-line, erc-join-channel, erc-prepare-mode-line-format,
 +	erc-away-p): Use `erc-server-buffer-live-p' to make sure process
 +	buffer exists.
 +	(erc-send-current-line): If there is no server buffer, let the
 +	user know.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-log.el: C-c C-l keybinding now defined in
 +	erc-log.el.
 +	(erc-log-version): New.
 +	(erc-cmd-JOIN): Fix applied for bug where /join -invite causes
 +	errors when there's no `invitation'.
 +
 +2004-05-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-JOIN): Make sure `chnl' is non-nil before trying
 +	to join anything (chnl is not set if /join -invite is used but
 +	there's no `invitation').
 +
 +2004-05-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Define C-c C-l keybinding outside of `erc-log-mode',
 +	making it available all the time; autoload definition.
 +	(erc-log-version): New.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, Makefile, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-chess.el, erc-dcc.el, erc-ezbounce.el,
 +	erc-fill.el, erc-ibuffer.el, erc-imenu.el, erc-lang.el,
 +	erc-list.el, erc-log.el, erc-macs.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-nets.el, erc-netsplit.el, erc-nickserv.el,
 +	erc-notify.el, erc-page.el, erc-ring.el, erc-speak.el,
 +	erc-speedbar.el, erc-stamp.el, erc-track.el, erc-truncate.el,
 +	erc-xdcc.el, erc.el: Applied all relevant bug fixes and code
 +	cleanup made between the time of the ERC_4_0_RELEASE tag until now.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-info-buffer): Correct bug in sorting
 +	of channel users.  Tiny change from Andreas Schwab
 +	<schwab@suse.de>.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-fill.el (erc-fill-variable): Fix docstring.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-button.el (erc-button-add-button): Use 'keymap
 +	text-property, rather than 'local-map, since it's cross-emacs
 +	compatible.  Pass :mouse-down-action into `widget-convert-button'
 +	as 'erc-button-click-button, to make XEmacs happy.  Replace bogus
 +	reference to erc-widget-press-button with erc-button-press-button.
 +	(erc-button-click-button): New (ignored) first argument, to make
 +	XEmacs behave when pressing buttons.
 +	(erc-button-press-button): New (ignored) &rest argument.
 +
 +2004-05-09  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-log.el (erc-conditional-save-buffer): Fix docstring
 +	reference to erc-save-queries-on-quit.
 +	(erc-conditional-save-queries): Ditto.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Updated copyright years.  Added local variables
 +	for this file; fixed indenting.
 +	(erc-speedbar): New group.
 +	(erc-speedbar-sort-users-type): New variable.
 +	(erc-speedbar-buttons): Handle query buffers (fixes a bug where an
 +	error would be thrown if the current buffer was a query).  Ignore
 +	unknown buffers.
 +	(erc-speedbar-expand-channel): Show limit and key with channel
 +	modes. Sort users according to `erc-speedbar-sort-users-type'.
 +	(erc-speedbar-insert-user): Fixed bug where only nicks with more
 +	info were being listed, and those were shown twice.
 +	(erc-speedbar-goto-buffer): Don't use dframe functions, as dframe
 +	isn't available with the default speedbar.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-sort-channel-users-alphabetically): New function.
 +	(erc-server-412, erc-server-432, erc-server-475): New functions.
 +	(erc-server-412-hook, erc-server-432-hook, erc-server-475-hook):
 +	Use them.
 +	(erc-server-401, erc-server-403, erc-server-405)
 +	(erc-server-421, erc-server-474, erc-server-481): Use catalog
 +	messages.
 +	(erc-define-catalog): Added s401, s403, s405, s412, s421, s432,
 +	s474, s475, and s481.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Added documentation to Commentary, Usage.
 +	Removed `outline-mode' from file local variables.
 +	(erc-services-mode): Use `erc-nickserv-identify-mode' to add
 +	hooks.
 +	(erc-nickserv-identify-mode): New function.
 +	(erc-nickserv-identify-mode): New variable.
 +	(erc-prompt-for-nickserv-password, erc-nickserv-passwords):
 +	Changed docstring.
 +	(erc-nickserv-identify-autodetect): Use
 +	`erc-nickserv-call-identify-function'. Docstring change.
 +	(erc-nickserv-identify-on-connect,
 +	erc-nickserv-identify-on-nick-change,
 +	erc-nickserv-call-identify-function): New functions.
 +	(erc-nickserv-identify): PASSWORD is not optional.  Autoload
 +	function.
 +
 +2004-05-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-hook, erc-quit-hook, erc-part-hook,
 +	erc-kick-hook, erc-connect-pre-hook): Now customizable.
 +	(erc-nick-changed-functions): New hook.
 +	(erc-server-NICK): Run `erc-nick-changed-functions' with the
 +	arguments NEW-NICK and OLD-NICK.
 +	(erc-channel-user-voice-p, erc-channel-user-voice-p): Shortened
 +	docstring.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: New section on function/variable naming and coding
 +	conventions.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-wash-quit-reason): Quote regexp special characters
 +	in NICK, LOGIN and HOST.
 +
 +2004-05-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-server-parameters): Typo fix in docstring.
 +	(erc-input-line-position): `:type' is now a choice between integer
 +	and nil.  (erc-mode-map): Bind `erc-get-channel-mode-from-keypress'
 +	to C-c C-o instead of C-c RET (C-c C-m).  (erc-cmd-GQUIT): Use
 +	REASON as argument when calling `erc-cmd-QUIT'.
 +
 +2004-05-03  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nicklist.el: Initial version.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Added local variables for file, fixed indenting.
 +	(erc-menu-version): New variable.
 +	(erc-menu-definition): "List channels": New.  "Join channel": Use
 +	`erc-connected' as test.  "Start a query": New.  "List channel
 +	operators": New.  "Input action": Moved up.  "Set topic": Fixed
 +	test so it's only active in channels.  "Leave this channel": Moved
 +	down.  "Track hidden channel buffers": Removed.  "Enable/Disable
 +	ERC Modules": New.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-mode-map): Removed binding for
 +	`erc-save-buffer-in-logs' (moved to erc-log.el).
 +	(erc-cmd-QUERY, erc-cmd-OPS): Now interactive.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Added local variables for this file.
 +	(erc-log-channels-directory): Added directory as a choice in
 +	`:type'.
 +	(define-erc-module): Define and undefine key binding (C-c
 +	C-l) for `erc-save-buffer-in-logs' here.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added local variables for this file.
 +	(erc-networks-alist): Fixed `:type' to work better in
 +	customization.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added local variables for file.  (erc-keywords):
 +	Use `list' instead of `cons' in `:type'.  Fixes bug where mismatch
 +	was shown in customization.  (erc-current-nick-highlight-type):
 +	Escape parentheses in docstring.  Added keyword, nick-or-keyword as
 +	options in `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Added local variables for file.
 +	(erc-away-timestamp-format): Allow nil as a choice in `:type'.
 +	(erc-timestamp-intangible): Changed `:type' to boolean.
 +	(erc-timestamp-right-column): Added `:group' and `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Added bbdb, log, match, sound, and stamp
 +	as `:type' options; changed documentation for autojoin, fill,
 +	pcomplete, track.  (erc-prompt-for-channel-key): New variable.
 +	(erc-join-channel): Only prompt for key if
 +	`erc-prompt-for-channel-key' is non-nil.  (erc-format-my-nick): New
 +	function.  (erc-send-message, erc-send-current-line): Use it.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-track.el: (erc-track-modified-channels): Fix indentation.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-hide-fools): Docstring fix.
 +	(erc-log-matches-types-alist): Added `current-nick' to valid
 +	choices.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-page.el, erc-ezbounce.el, erc-speak.el, erc-match.el,
 +	erc-track.el (erc-ezbounce, erc-page, erc-speak): Groups defined.
 +	(erc-match, erc-track): `erc' is parent group.
 +	(erc-ezb-regexp, erc-ezb-login-alist): Added `:group'.
 +
 +2004-04-20  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: Fixed erc-fill-static so it breaks the lines at the
 +	right column and respects timestamps. Patch by Simon Siegler
 +	<simon@trz-kril.de>
 +	(erc-fill-static): Major rewrite and split up into some functions.
 +	(erc-count-lines): Removed.
 +	(erc-fill-regarding-timestamp): New function.
 +	(erc-timestamp-offset): New function.
 +	(erc-restore-text-properties): New function.
 +	(erc-fill-variable): Respect leftbound timestamp.  This is still
 +	broken if someone has both erc-timestamp-only-if-changed-flag set
 +	and erc-insert-timestamp-function set to
 +	'erc-insert-timestamp-left, but otherwise it works now.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-SV): Show features gtk, mac-carbon, multi-tty.
 +	Fixed so that arguments fit the format (build date was not being
 +	shown).
 +
 +2004-04-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-channel-topic); Error if `channel-topic' is
 +	unbound.  Remove %-sign substitution.
 +	(erc-update-mode-line-buffer): Escape %-signs in `channel-topic'
 +	here.
 +
 +2004-04-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-send-action, erc-ctcp-query-ACTION,
 +	erc-ctcp-reply-ECHO-hook): Let `erc-display-message-highlight'
 +	propertize the message.
 +	(erc-display-message-highlight): Allow for any erc-TYPE-face.
 +	(erc-cmd-JOIN): Display error message instead of throwing an error
 +	if there's no `invitation'.
 +	(erc-cmd-PART): Allow for no reason if channel is provided.  Fixes
 +	bug where user would part the current channel with the other
 +	channel's name as reason when no reason was given.
 +	(erc-server-vectors, erc-debug-missing-hooks): Added docstring.
 +	(erc-server-JOIN): Moved `erc-join-hook' to JOIN-you section.
 +	`erc-join-hook' called by `run-hook-with-args', sending the ARGS
 +	`chnl' and the channel's buffer.  Changed an instance of if
 +	without else to when.
 +	(erc-server-477): New function.
 +	(erc-server-477-hook): Use `erc-server-477'.
 +	(erc-define-catalog): Added `no-invitation'.
 +
 +2004-04-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Local variables for file added.
 +	(erc-nickserv-passwords): Customization: Network symbols updated
 +	to reflect `erc-nickserv-alist'.  Allow user to type in network
 +	symbol.
 +	(erc-nickserv-alist): Now customizable variable.
 +
 +2004-04-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Make sure `line'
 +	is a string to avoid errors upon startup.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-version): New variable.
 +	(erc-auto-discard-away): Updated docstring.
 +	(erc-autoaway-no-auto-back-regexp): New variable.
 +	(erc-autoaway-reset-idletime): Use it.	Hopefully a better solution
 +	which allows for aliases to "/away" and any other text that the
 +	user wants to ignore when `erc-auto-discard-away' is non-nil.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Forgot /gaway in
 +	regexp.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): If the user sends
 +	an "/away" command, don't call `erc-autoaway-set-back', fixes bug
 +	where ERC would send "/away" when user was already away and sent an
 +	"/away reason".  Changed `l' to `line' for better understanding.
 +	(erc-autoaway-set-back): Changed `l' to `line' for better
 +	understanding.
 +
 +2004-04-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-set-channel-key): Now able to remove key.
 +	(erc-set-channel-limit): Now able to remove limit.
 +	(erc-get-channel-mode-from-keypress): Fixed docstring.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-channel): Allow for optional channel key.
 +	(erc-set-modes): Need to set `channel-key' to nil in case of mode
 +	changes during split.
 +	(erc-show-channel-key-p): New variable.
 +	(erc-prepare-mode-line-format): Only show key if
 +	`erc-show-channel-key-p' is non-nil.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 + 	* erc.el (channel-key): New variable.
 +	(erc-update-channel-key): New function.
 +	(erc-set-modes, erc-parse-modes, erc-update-modes, erc,
 +	erc-update-channel-info-buffer): Deal with channel keys.
 +	(erc-prepare-mode-line-format): Show channel key in header-line.
 +	(erc-server-NICK): Show nick change in server buffer as well.
 +	(erc, erc-send-command, erc-banlist-store, erc-banlist-update,
 +	erc-load-irc-script-lines,
 +	erc-arrange-session-in-multiple-windows, erc-handle-login,
 +	erc-find-channel-info-buffer): Changed when not to unless.
 +	(erc-server-MODE): Changed if without else to when.
 +
 +2004-03-27  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use `truncate-string-to-width'
 +	instead of `truncate-string' alias.
 +	(erc-nickname-in-use): Ditto.
 +
 +2004-03-27  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-list): Fixed error caused by erc-cmd-LIST
 +	passing a non-sequence to erc-chanlist.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Add new hook `erc-join-hook', which is run when we join a
 +	channel.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Replaced existing notice user notification system and
 +	the configuration options, which consisted of
 +	`erc-echo-notices-in-minibuffer-flag' and
 +	`erc-echo-notices-in-current-buffer' with two new hooks,
 +	`erc-echo-notice-hook' and `erc-echo-notice-always-hook'.
 +
 +	When user notification is needed, `erc-echo-notice-always-hook' is
 +	first run using `run-hook-with-args', then `erc-echo-notice-hook'
 +	is run using `run-hook-with-args-until-success'.
 +
 +	In addition to these hooks, a large number of functions, which are
 +	described in the documentation strings of those hooks, were added
 +	which can be used to achieve a large variety of different
 +	behaviors.
 +
 +	The current default behavior, which is identical to the existing
 +	default behavior, is for `erc-echo-notice-always-hook' to be set to
 +	`(erc-echo-notice-in-default-buffer).
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: (erc-modified-channels-display): Added a space
 +	before opening bracket.
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-query-as-channel-p): New variable.
 +	(erc-server-PRIVMSG-or-NOTICE): If `erc-format-query-as-channel-p'
 +	is nil, messages in the query buffer are formatted like private
 +	messages.
 +
 +	(erc-server-252-hook, erc-server-253-hook, erc-server-254-hook,
 +	erc-server-256-hook, erc-server-257-hook, erc-server-258-hook,
 +	erc-server-259-hook, erc-server-371-hook, erc-server-372-hook,
 +	erc-server-374-hook, erc-server-374-hook, erc-server-442-hook,
 +	erc-server-477-hook): Removed, now defined in
 +	`erc-server-hook-list'.
 +	(erc-display-server-message): New function.
 +	(erc-server-252, erc-server-253, erc-server-254, erc-server-442):
 +	New functions.
 +	(erc-server-hook-list): Added 250, 256, 257, 258, 259, 265, 266,
 +	377, 378, 477 - using `erc-display-server-message'.  251, 255 now
 +	use `erc-display-server-message'.  Added 252, 253, 254, 442 -
 +	using respective erc-server-* functions.  371, 372, 374, 375 now
 +	defined here.
 +	(erc-define-catalog): Added s252, s253, s254, s442.
 +	(erc-server-001, erc-server-004, erc-server-005): Fixed
 +	documentation.
 +
 +2004-03-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Commentary: Changed `erc-stamp-mode' to
 +	`erc-timestamp-mode'.
 +	(erc-insert-timestamp-left): Use `erc-timestamp-face' on filler
 +	spaces as well.
 +
 +2004-03-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-send-action): Use `erc-input-face'.
 +	(erc-display-message-highlight): If the requested highlighting
 +	type doesn't match, just display the string with no highlighting
 +	and warn about it with `erc-log'.. (erc-cmd-JOIN): If user is
 +	already on the requested channel, switch to that channel's buffer.
 +	(erc-ctcp-query-ACTION): Use `erc-action-face' for nick as well.
 +	(erc-header-line-use-help-echo-p): New variable.
 +	(erc-update-mode-line-buffer): Use `help-echo' for header-line if
 +	`erc-header-line-use-help-echo-p' is non-nil.
 +
 +2004-03-18  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-nets.el: Use two arguments version of `make-obsolete', if
 +	third argument is not supported (for XEmacs).
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* CREDITS: added CREDITS entry for Adrian Aichner
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* erc-xdcc.el, erc.el, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-dcc.el, erc-ezbounce.el, erc-imenu.el,
 +	erc-list.el, erc-log.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-netsplit.el, erc-notify.el, erc-speedbar.el,
 +	erc-stamp.el, erc-track.el, erc-truncate.el:
 +	(erc-coding-sytem-for-target): Removed.
 +	(erc-coding-system-for-target): New.
 +	(erc-autoaway-use-emacs-idle): Typo fix.
 +	(erc-auto-set-away): Ditto.
 +	(erc-auto-discard-away): Ditto.
 +	(autojoin): Ditto.
 +	(erc-button-alist): Ditto.
 +	(erc-dcc-auto-masks): Ditto.
 +	(erc-dcc-chat-send-input-line): Ditto.
 +	(erc-ezb-get-login): Ditto.
 +	(erc-unfill-notice): Ditto.
 +	(erc-save-buffer-in-logs): Ditto.
 +	(match): Ditto.
 +	(erc-log-matches-types-alist): Ditto.
 +	(erc-match-directed-at-fool-p): Ditto.
 +	(erc-match-message): Ditto.
 +	(erc-update-member): Ditto.
 +	(erc-ignored-reply-p): Ditto.
 +	(erc-menu-definition): Ditto.
 +	(erc-netsplit-QUIT): Ditto.
 +	(erc-notify-list): Ditto.
 +	(erc-speedbar-update-channel): Ditto.
 +	(erc-speedbar-item-info): Ditto.
 +	(erc-stamp): Ditto.
 +	(erc-timestamp-intangible): Ditto.
 +	(erc-add-timestamp): Ditto.
 +	(erc-timestamp-only-if-changed-flag): Ditto.
 +	(erc-show-timestamps): Ditto.
 +	(erc-track-priority-faces-only): Ditto.
 +	(erc-modified-channels-alist): Ditto.
 +	(erc-unique-substrings): Ditto.
 +	(erc-find-parsed-property): Ditto.
 +	(erc-track-switch-direction): Ditto.
 +	(erc-truncate-buffer-to-size): Ditto.
 +	(erc-xdcc): Ditto.
 +	(erc-auto-reconnect): Ditto.
 +	(erc-startup-file-list): Ditto.
 +	(erc-once-with-server-event): Ditto.
 +	(erc-once-with-server-event-global): Ditto.
 +	(erc-mode): Ditto.
 +	(erc-generate-new-buffer-name): Ditto.
 +	(erc): Ditto.
 +	(erc-open-ssl-stream): Ditto.
 +	(erc-default-coding-system): Ditto.
 +	(erc-encode-string-for-target): Ditto.
 +	(erc-decode-string-from-target): Ditto.
 +	(erc-scroll-to-bottom): Ditto.
 +	(erc-decode-controls): Ditto.
 +	(erc-channel-members-changed-hook): Ditto.
 +	(erc-put-text-property): Ditto.
 +	(erc-add-default-channel): Ditto.
 +
 +2004-03-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Cancel ping timer upon
 +	disconnect.
 +	(erc-cmd-PART): Use same regexp as `erc-cmd-QUIT' when no #channel
 +	is provided.
 +	(erc-nick-uniquifier, erc-manual-set-nick-on-bad-nick-p): `:group'
 +	was missing, added.
 +	(erc-part-reason-zippy, erc-part-reason-zippy): Removed FIXME
 +	comments.  I see no problem allowing typed in reasons.
 +
 +2004-03-16  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: (erc-insert-timestamp-left): Added support for
 +	`erc-timestamp-only-if-changed-flag' and added docstring.
 +	(erc-timestamp-only-if-changed-flag): Updated documentation.
 +
 +2004-03-13  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-network-name): No longer marked as obsolete.
 +	Why was this function made obsolete?  There is no other function
 +	that performs this task.  Some of us use these functions in our
 +	personal ERC configs.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-buffer-filter): Use `with-current-buffer'.
 +	(erc-process-input-line): Append newline to documentation.  Fixes a
 +	bug whereby the prompt would be put on the same line as the output.
 +	(erc-cmd-GQUIT): Only try and send QUIT if the process is alive.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-log.el: Only add top-level hooks if `erc-enable-logging' is
 +	non-nil.
 +
 +2004-03-10  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nets.el: From Adrian Aichner (adrian /at/ xemacs /dot/ org)
 +	* erc-nets.el: XEmacs make-obsolete only takes two arguments.
 +
 +2004-03-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-determine-network): Use `erc-session-server' if
 +	`erc-announced-server' is nil to avoid error if server does not
 +	send 004 (RPL_MYINFO) message.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-server-alistm erc-settings): Use lowercase
 +	"freenode", as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Use lowercase "freenode",
 +	as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el (pcomplete/erc-mode/DCC): Append "send" as a list.
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-networks-alist): Changed "Freenode" to
 +	"freenode".
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Improved the docstring.	Made
 +	message to user more accurate	depending on whether a single
 +	channel is being listed or not.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-determine-network): Make matching logic simpler
 +	(suggested by Damian Elmes).
 +	(erc-current-network, erc-network-name): Add `make-obsolete' form.
 +	(erc-set-network-name): Indentation fix.
 +	(erc-ports-list): Add docstring.  Rework function body to use
 +	`nconc'.
 +
 +2004-03-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el, erc-notify.el: (require 'erc-nets): added
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-network-name): Function definition moved to
 +	erc-nets.el.  The functions `erc-determine-network' and
 +	`erc-network' in erc-nets.el do what this did before.  Deprecated.
 +	Use (erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Changed copyright notice.  Now require
 +	erc-nets.  erc-nets.el now takes care of network-related functions
 +	and variables.
 +	(erc-nickserv-alist): Changed network symbols to match those in
 +	`erc-networks-alist' in erc-nets.el.
 +	(erc-nickserv-identify-autodetect): Use `erc-network'.
 +	(erc-nickserv-identify): Use `erc-network'.  Changed wording for
 +	interactive use, now shows current nick.
 +	(erc-networks): Removed.  Use `erc-networks-alist' as defined in
 +	erc-nets.el.
 +	(erc-current-network): Function definition moved to erc-nets.el.
 +	The functions `erc-determine-network' and `erc-network' in
 +	erc-nets.el do what this did before.  Deprecated.  Use
 +	(erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added commentary, `erc-nets-version'.
 +	(erc-server-alist): Changed Brasnet to BRASnet.
 +	(erc-networks-alist): All networks (except EFnet and IRCnet) now
 +	have a MATCHER.  (erc-network): New variable.
 +	(erc-determine-network): New function. Determine the network the
 +	user is on.  Use the server parameter NETWORK, if provided, else
 +	parse the server name and search for a match (regexp and loop by
 +	wencem) in `erc-networks-alist'.  Return the name of the network
 +	or "Unknown" as a symbol.
 +	(erc-network): New function.  Returns value of `erc-network'.  Use
 +	this when the current buffer is not the server process buffer.
 +	(erc-current-network): Returns the value of `erc-network' as
 +	expected by users who used the function as it was defined in
 +	erc-nickserv.el.  Deprecated.
 +	(erc-network-name): Returns the value of `erc-network' as expected
 +	by users who used the function as it was defined in erc.el.
 +	Deprecated.
 +	(erc-set-network-name): New function.  Added to
 +	`erc-server-375-hook' and `erc-server-422-hook'.
 +	(erc-unset-network-name): New function.  Added to
 +	`erc-disconnected-hook'.
 +	(erc-server-select): Small documentation word change.
 +
 +2004-03-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS: disumu info updated
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-cmd-LIST): Take &rest rather than &optional
 +	arguments.
 +	(erc-chanlist): Construct correct LIST command from list of
 +	channels.
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line-buffer): Add 'help-echo property to
 +	header-line text.  This allows header lines longer than the width
 +	of the current window to be seen.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-directed-at-fool-p): Also check for
 +	"FOOL, "
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Only use nick-or-keyword if
 +	we're matching our nick.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: The highlight type for the current nickname can
 +	now also be 'nick-or-keyword, to highlight the nick of the sender
 +	if that is available, but fall back to highlighting your nickname
 +	in the whole message otherwise.
 +	(erc-current-nick-highlight-type): Adapted docstring accordingly.
 +	(erc-match-message): Added new condition. Also added some comments
 +	to this monster of a function.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-is-valid-nick-p): Don't check for length less or
 +	equal to 9.
 +
 +2004-03-06  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nickserv.el (erc-current-network): the last change resulted
 +	in this function failing when a network identifies itself as
 +	anything other than var.netname.com, so for instance
 +	'vic.au.austnet.org' fails. This version is only a marginal
 +	improvement over the original, but if we want to be more flexible
 +	we'll probably have to do the iteration ourselves instead of using
 +	assoc.
 +
 +2004-03-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: Added erc-server-001 which runs when the server sends
 +	its welcome message.  It sets the current-nick to reflect the
 +	server's settings. This fixes a bug where nicks that were too long
 +	and got truncated by ther server were still set to the old value.
 +	(nickname-in-use): If user wants to try again manually, let user
 +	know that the nick is taken.  If not, go through erc-default-nicks
 +	until none are left, and then try one last time with
 +	erc-nick-uniquifier.  If it's still a bad-nick, make the user
 +	change nick manually.  When applying uniquifier, use NICKLEN if
 +	it's in the server parameters, otherwise use what RFC 2812 says is
 +	the max nick length (9 chars).  Added custom variable
 +	erc-manual-set-nick-on-bad-nick-p, which is set to nil and
 +	erc-nick-change-attempt-count.  Reset erc-default-nicks and
 +	erc-nick-change-attempt-count when the nick has been changed
 +	successfully.  This fixes the bug where ERC would get caught in a
 +	neverending loop of trying to set the same nick if the nick was
 +	too long and the uniquified nick was not available.
 +
 +	* added erc-cmd-WHOAMI
 +
 +	* added custom variable erc-mode-line-away-status-format, use this
 +	instead of   the previous hard-coded setting
 +
 +	* erc-server-315|318|369-hook defvar lines removed - they're
 +	already defined in erc-server-hook-list
 +
 +2004-03-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Initial commit.  Some thoughts on coding standards.
 +
 +2004-03-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: added the variable erc-track-priority-faces-only
 +	which adds the option to ignore changes in a channel unless there
 +	are faces from the erc-track-faces-priority-list in the message
 +	options are nil, 'all, or a list of channel name strings
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el: Changed erc-is-channel-op
 +	and erc-is-channel-voice to erc-channel-user-op-p and
 +	erc-channel-user-voice-p to better match erc-channel-user
 +	structure (and emacs lisp usage)
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el:
 +	erc-track-modified-channels-mode is now erc-track-mode
 +
 +2004-02-29  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added 'keyword option to
 +	erc-current-nick-highlight-type highlights all instances of
 +	current-nick in the message ('nickname option in cvs revisions 1.9
 +	- 1.11 had same effect)
 +
 +2004-02-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: Add Lisp: prefix for the EmacsWiki Elisp area.
 +	(erc-button-alist): Added Lisp: prefix.
 +	(erc-emacswiki-lisp-url): New variable.
 +	(erc-browse-emacswiki-lisp): New function.
 +
 +2004-02-27  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-get-arglist): Use `substitute-command-keys', rather
 +	than hard-coding C-h f for `describe-function'.
 +
 +2004-02-26  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): bind `inhibit-read-only'
 +	to t around call to `erase-buffer'.
 +
 +2004-02-23  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-chess.el, erc-dcc.el, erc-ezbounce.el, erc-list.el,
 +	erc-macs.el, erc-ring.el, erc-stamp.el, erc.el: Normalized buffer
 +	local variable creation.
 +
 +2004-02-17  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-scroll-to-bottom, erc-add-scroll-to-bottom): Mention
 +	`erc-input-line-position' in docstring.
 +
 +2004-02-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-kick-hook): Typo fix.
 +
 +2004-02-13  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Added `erc-kick-hook', which is called when the local
 +	user is kicked from a channel.  Fixed a bug in `erc-cmd-OPS', such
 +	that the command now works.  Added `erc-remove-channel-users', in
 +	order to fix a number of significant bugs relating to channel
 +	parting.
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove last change. This caused a
 +	lot of trouble :(
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Also set 'field property, so C-j
 +	works on an empty prompt.
 +
 +2004-02-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-topic): Ensure that `channel-topic'
 +	does not contain any bare format controls.
 +
 +2004-02-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el (erc-timestamp-intangible): New variable (user
 +	feature request)
 +	(erc-format-timestamp): Use erc-timestamp-intangible.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-button.el: Fixed bug related to nickname buttonizing and text
 +	fields due to erc-stamp.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* CREDITS: Added mention of my change of ERC to use hash tables.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* AUTHORS: Added myself to the list.
 +
 +2004-02-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Jeremy Maitin-Shepard <jbms@attbi.com>:
 +	(erc-remove-channel-user): Use `delq' not `delete'.
 +	(erc-get-buffer): Pass PROC through to `erc-buffer-filter'.
 +	(erc-process-sentinel): Use `erc' rather than `erc-reconnect' for
 +	auto-reconnection.
 +
 +2004-02-02  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-buffer-list-with-nick): Apply `erc-downcase' NICK.
 +
 +2004-01-30  Alex Schroeder <alex@gnu.org>
 +
 +	* erc.el: (erc-get-buffer): Use erc-buffer-filter.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: (erc-get-channel-nickname-list): New function.
 +	(erc-get-server-nickname-list): New function.
 +	(erc-get-server-nickname-alist): New function.
 +	(erc-get-channel-nickname-alist): New function.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list,
 +	erc-remove-entry-from-list): Use `erc-member-ignore-case' to
 +	compare entries.
 +	(erc-add-pal, erc-add-fool): Fix type bug. Use
 +	`erc-get-server-nickname-alist'.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: Adds xemacs compatibility to hash table
 +	channel-members patch.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: (erc-update-undo-list): Rewritten. Update
 +	buffer-undo-list in place.  Deal with XEmacsesque
 +	entries (extents) in the list.
 +	(erc-channel-users): Fix unescaped open-paren in left column in
 +	docstring.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-ring.el: (erc-replace-current-command): Exclude the prompt
 +	from the deleted region and don't redisplay the prompt (because
 +	`erc-display-prompt' flushes `buffer-undo-list').
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list): Use `symbol-value' instead
 +	of `eval'.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-kill-buffer-function): maphash was missing an
 +	argument.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* Makefile, erc-autoaway.el, erc-button.el, erc-ibuffer.el,
 +	erc-lang.el, erc-list.el, erc-match.el, erc-menu.el, erc-page.el,
 +	erc-pcomplete.el, erc-speedbar.el, erc.el: HUGE change by jbms.
 +	This makes channel-members a hash, erc-channel-users.
 +
 +	Modified files: Makefile erc-autoaway.el erc-button.el
 +	erc-ibuffer.el erc-lang.el erc-list.el erc-match.el erc-menu.el
 +	erc-page.el erc-pcomplete.el erc-speedbar.el erc.el
 +
 +	The changes are too numerous to document properly. Have fun with
 +	the breakage.
 +
 +2004-01-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-send-input-line): Add a space to empty lines so the
 +	server likes them.
 +
 +2004-01-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-send-whitespace-lines: New variable.
 +	(erc-send-current-line): Use erc-send-whitespace-lines. Also,
 +	removed superflous test for empty line in the mapc, since the
 +	blank line test should find all. I do like to be able to send an
 +	empty line when i want to!
 +	(erc-send-current-line): Check for point being in input line
 +	before checking for blank lines.
 +
 +2004-01-21  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-display-line-1): Move `erc-update-undo-list' outside
 +	`save-restriction'.  Removing need for temporary variable.
 +	(erc-send-current-line): Fix bug introduced by last change, remove
 +	complement in blank line regexp.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-undo-list): Add logic to catch the case when
 +	`buffer-undo-list' is t, indentation cleanup.
 +	(erc-send-current-line):  Reverse logic for matching blank lines.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-input-line-position): New variable.  If non-nil,
 +	specifies the argument to `recenter' in `erc-scroll-to-bottom'.
 +	(erc-scroll-to-bottom): Use it.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Johan Bockgård <bojohan+news@dd.chalmers.se>:
 +	(erc-update-undo-list): New function.  Update `buffer-undo-list'
 +	so that calling `undo' in an ERC buffer doesn't mess up the
 +	existing text.
 +	(erc-display-line-1): Use it.
 +
 +2004-01-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-beg-of-input-line): Use `forward-line' rather than
 +	`beginning-of-line'.  Docstring fix.
 +	(erc-end-of-input-line): Docstring fix.
 +
 +2004-01-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove the undo list after
 +	displaying the prompt, so the user can't undo ERC changes, which
 +	breaks some stuff anyways. This way the user can still undo his
 +	editing, but not ours.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Should recenter on the bottom
 +	line, not the second-to-last one.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-bol): Fix bug introduced in revision 1.601.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Brian Palmer <bpalmer@gmail.com>
 +	(erc-cmd-JOIN): Use `erc-member-ignore-case', rather than
 +	`member-ignore-case'.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: There was an inconsistency where the values of op and
 +	voice in channel-names could be 'on or 'off after an update, t and
 +	nil before.  The intended version was to have t or nil, so i fixed
 +	it to do so.
 +	(channel-names): Updated docstring.
 +	(erc-update-current-channel-member): Clarified docstring, fixed so
 +	it sets t or nil on an update as well, not only on an add.
 +	(erc-cmd-OPS): Updated not to check for 'on (the only function that
 +	did this!)
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-part-reason-various-alist,
 +	erc-update-mode-line-buffer): Fix docstring
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line): Fix typo.
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-prompt-interactive-input): Removed.
 +	(erc-display-prompt): Removed `erc-prompt-interactive-input'
 +	option.  (erc-interactive-input-map): Removed.
 +
 +	Major docstring fixes.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-OPS): Added this function.
 +	(erc-cmd-IDLE): Switched from using erc-display-message-highlight
 +	to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Switched from using
 +	erc-display-message-highlight to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event): Added a sentence to the
 +	docstring.  Now returns the uninterned symbol that is added to the
 +	server hook.
 +	(erc-cmd-IDLE): Changed to use erc-once-with-server-event instead
 +	of erc-once-with-server-event-global.
 +
 +2004-01-06  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-hide-modeline): New variable.
 +	(erc-chanlist): Now displays message as a notice.  Also hides the
 +	modeline if erc-chanlist-hide-modeline is non-nil.
 +
 +2004-01-05  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-server-PRIVMSG-or-NOTICE): Now nicks appear as
 +	<nick> in query buffers, instead of as *nick*.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): Changed to return
 +	the uninterned symbol that it creates.
 +	(erc-cmd-LIST): Changed to clean up hooks that don't run.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/IDLE): Added to support new
 +	/IDLE command.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): New function.  Like
 +	erc-once-with-server-event, except it modifies the global value of
 +	the event hook.
 +	(erc-cmd-IDLE): New function.  Implements the new /IDLE command.
 +	Usage: /IDLE NICK (erc-seconds-to-string): New function.  Converts
 +	a number of seconds to an Engligh phrase.
 +
 +2004-01-02  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el: Added variable erc-chanlist-mode-hook.
 +
 +See ChangeLog.03 for earlier changes.
 +
 +    Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
diff --cc ChangeLog.05
index e73045c,0000000..0d2ff8a
mode 100644,000000..100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@@ -1,1228 -1,0 +1,1243 @@@
 +2005-11-23  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SAY): Strip leading space in input line.
 +
 +2005-10-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: Add stuff that needs to be done before the 5.1
 +	release.  Longer-term items can be added to the 5.2 section.
 +
 +	* Makefile (SITEFLAG): New variable that indicates what variant of
 +	"--site-flag" to use.  XEmacs needs "-site-flag".
 +	(INSTALLINFO): New variable indicating how we should call
 +	install-info when installing documentation.
 +	(erc-auto.el, .elc.el): Use $(SITEFLAG).
 +
 +	* NEWS: Note that last release was 5.0.4.
 +
 +	* erc.texi: Initial and incomplete draft of ERC documentation.
 +	Commence collaborate-documentation-hack-mode :^) .
 +
 +2005-10-29  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el (erc-replace-current-command): Revert last change
 +	since it made the prompt disappear when using `erc-next-command'
 +	and `erc-previous-command'.
 +
 +2005-10-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-input-marker): New variable that indicates the
 +	position where text from the user begins, after the prompt.
 +	(erc-mode-map): Bind <HOME> to erc-bol, just like C-a.
 +	(erc): Initialize erc-input-marker.
 +	(erc-display-prompt): Even in case where no prompt is desired by
 +	the user, clear the undo buffer and set the input marker.
 +	(erc-bol, erc-user-input): Simplify by using erc-input-marker.
 +
 +	* erc-pcomplete.el (pcomplete-parse-erc-arguments): Use
 +	erc-insert-marker.
 +
 +	* erc-ring.el (erc-previous-command)
 +	(erc-replace-current-command): Use erc-insert-marker.
 +
 +	* erc-spelling.el (erc-spelling-init): Make sure that even Emacs21
 +	obeys erc-spelling-flyspell-verify.
 +	(erc-spelling-flyspell-verify): Use erc-input-marker.  This should
 +	make it considerably faster when switching to a buffer that has
 +	seen a lot of activity since last viewed.
 +
 +2005-10-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-server-version, 004): Re-added setting of
 +	`erc-server-version'.  It doesn't hurt to set, and it could be
 +	used in modules or users' settings.
 +
 +	* NEWS: Added descriptions of some new features.
 +
 +2005-10-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
 +	as default.
 +	(erc-beep-match-types): New variable.
 +	(erc-text-matched-hook): Doc fix.  Added `erc-beep-on-match' to
 +	customization options.
 +	(erc-beep-on-match): New function.  If the MATCH-TYPE is found in
 +	`erc-beep-match-types', beep.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	New functions to deal with the difference in the number of
 +	arguments accepted by `make-obsolete' and `make-obsolete-variable'
 +	in Emacs and XEmacs.
 +
 +	* erc.el, erc-nets.el: Use `erc-make-obsolete' and
 +	`erc-make-obsolete-variable'.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	Handle `wrong-number-of-arguments' error instead of checking for
 +	xemacs feature as future versions of XEmacs might accept three
 +	arguments.
 +
 +2005-10-18  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
 +	docstrings.
 +
 +2005-10-08  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
 +	Updated my email address.
 +
 +2005-10-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-send-input-line, erc-cmd-KICK, erc-cmd-PART)
 +	(erc-cmd-QUIT, erc-cmd-TOPIC, erc-kill-server, erc-kill-channel):
 +	Adapt to new TARGET parameter of erc-server-send.
 +
 +	* erc-backend.el (erc-server-connect): Don't specify encoding for
 +	erc-server-process, since we set this each time we send a line to
 +	the server.
 +	(erc-encode-string-for-target): Remove.
 +	(erc-server-send): Allow TARGET to be specified.  This was how it
 +	used to be before my more-backend work.  Set encoding of server
 +	process just before sending text to it.  Associate encoding with
 +	text if we are using the queue.
 +	(erc-server-send-queue): Pull encoding from queue.
 +	(erc-message, erc-send-ctcp-message, erc-send-ctcp-notice): Adapt
 +	to new TARGET parameter of erc-server-send.
 +
 +2005-10-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Use erc-view-mode-enter
 +	rather than view-mode.
 +
 +	* erc-backend.el (erc-encode-string-for-target): If given a nil or
 +	empty string, return "".
 +	(erc-server-send-queue): XEmacs fix: Use erc-cancel-timer rather
 +	than cancel-timer.
 +
 +	* erc-compat.el (erc-view-mode-enter): New function that is
 +	aliased to the correct way of entering view-mode.
 +
 +	* erc-match.el (erc-log-matches-make-buffer): Use
 +	erc-view-mode-enter rather than view-mode-enter.
 +
 +2005-10-05  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-backend.el (erc-encode-string-for-target): If str is nil,
 +	pass the empty string to erc-encode-coding-string instead, which
 +	allows one to /part and /quit without providing a reason again.
 +
 +2005-10-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-message, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Encode string for target before sending.
 +
 +	* erc.el (erc-cmd-KICK, erc-cmd-PART, erc-cmd-QUIT, erc-cmd-TOPIC)
 +	(erc-kill-server, erc-kill-channel): Ditto.
 +
 +2005-09-05  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc-page.el (erc-ctcp-query-PAGE): (message text) -> (message
 +	"%s" text).
 +	(erc-cmd-PAGE): Simplify regexp. Put `do-not-parse-args' t.
 +
 +2005-09-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-flood-limit, erc-flood-limit2): Remove since they
 +	are no longer needed.
 +	(erc-send-input): Detect whether we want flood control to be
 +	active.  The previous behavior was to always force the message.
 +	(erc-toggle-flood-control): Adapt to new flood control method.  No
 +	more 'strict.
 +	(erc-cmd-SV): Use concat rather than
 +	format-time-string.
 +	(erc-format-target, erc-format-target-and/or-server): Shorten
 +	logic statements.
 +
 +	* erc-compat.el (erc-emacs-build-time): Use a string
 +	representation rather than trying to coerce a time out of a string
 +	on XEmacs.
 +
 +	* erc-identd.el (erc-identd-start): Use make-network-process
 +	instead of open-network-stream.  Error out if this is not defined.
 +
 +	* erc-backend.el (erc-send-line): New command that sends a line
 +	using flood control, using a callback for display.  It isn't used
 +	yet.
 +
 +2005-09-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias and make-obsolete-variable for
 +	erc-default-coding-system.
 +	(channel-topic, channel-modes, channel-user-limit, channel-key,
 +	invitation, away, channel-list, bad-nick): Rename globally to
 +	erc-{name-of-variable}.
 +
 +2005-09-03  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-message): Simplify regexp.
 +	(erc-cmd-DEOP, erc-cmd-OP): Simplify.
 +
 +2005-08-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Alias erc-send-command to erc-server-send.  ErBot needs
 +	this to work without modification.  Add defvaralias for
 +	erc-process.  Make this and the other backwards-compatibility
 +	functions and variables be marked obsolete as of ERC 5.1.
 +
 +	* erc-backend.el: Add autoload for erc-log macro.
 +	(erc-server-connect): Set some variables before defining process
 +	handlers.  It probably doesn't make any difference.
 +
 +2005-08-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias for erc-announced-server-name, since
 +	this seems to be widely used.
 +
 +2005-08-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc): Remove unnecessary boundp check.
 +
 +	* erc-autoaway.el: Fix compiler warning.
 +
 +	* erc-backend.el (erc-server-version): Since this isn't used by
 +	any code, and isn't generally useful, remove it.
 +	(erc-server-send-queue): Use erc-current-time rather than
 +	float-time.
 +	(004): Don't set erc-server-version.
 +
 +	* erc-dcc.el (erc-dcc-chat-request, erc-dcc-get-parent): Move to
 +	fix a compiler warning.
 +
 +	* erc-ibuffer.el (erc-server): Remove unnecessary boundp check.
 +
 +	* erc-identd.el (erc-identd-start): Use read-string instead of
 +	read-input.
 +
 +	* erc-imenu.el (erc-unfill-notice): Use a while loop instead of
 +	replace-regexp.
 +
 +	* erc-nicklist.el: Add conditional dependency on erc-bbdb.
 +	(erc-nicklist-insert-contents): Tighten some regexps.
 +
 +	* erc-notify.el (erc-notify-list): Docfix.
 +
 +	* erc-spelling.el (erc-spelling-dictionaries): Add :type and
 +	:group to silence a compiler warning.
 +
 +2005-08-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-session-server, erc-session-port)
 +	(erc-announced-server-name, erc-server-version)
 +	(erc-server-parameters): Moved here from erc.el.
 +	(erc-server-last-peers): Moved, renamed from last-peers.
 +	(erc-server-lag): Moved, renamed from erc-lag.
 +	(erc-server-duplicates): Moved, renamed from erc-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server): New customization group hosting all options from
 +	this file.
 +	(erc-server-prevent-duplicates): Moved, renamed from
 +	erc-prevent-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server-auto-reconnect, erc-split-line-length)
 +	(erc-server-coding-system, erc-encoding-coding-alist)
 +	(erc-server-connect-function, erc-server-flood-margin)
 +	(erc-server-flood-penalty): Change group to 'erc-server.
 +	(erc-server-send-ping-interval): Moved, renamed from
 +	erc-ping-interval.
 +	(erc-server-ping-handler): Moved, renamed from erc-ping-handler.
 +	(erc-server-setup-periodical-server-ping): Moved, renamed from
 +	erc-setup-periodical-server-ping.
 +	(erc-server-connect): Add to docstring.  Move more initialization
 +	here.
 +	(erc-server-processing-p): Docfix.
 +	(erc-server-connect): Use 'raw-text like in the original version.
 +	(erc-server-filter-function): Don't reset process coding system.
 +
 +	* erc-stamp.el (erc-add-timestamp): If the text at point is
 +	invisible, don't insert a timestamp.  Thanks to Pascal
 +	J. Bourguignon for the suggestion.
 +
 +	* erc-match.el (erc-text-matched-hook): Don't hide fools by
 +	default, but include it in the available options.
 +
 +2005-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-*.el: s/erc-send-command/erc-server-send/g.
 +	s/erc-process/erc-server-process/g (sort of).  Occasional
 +	whitespace and indentation fixes.
 +
 +	* erc-backend.el: Specify a few local variables for indentation.
 +	Take one item off of the TODO list.
 +	(erc-server-filter-data): Renamed from erc-previous-read.  From
 +	circe.
 +	(erc-server-processing-p): New variable that indicates when we're
 +	currently processing a message.  From circe.
 +	(erc-split-line-length): New option that gives the maximum line
 +	length of a single message.  From circe.
 +	(erc-default-coding-system): Moved here from erc.el.
 +	(erc-split-line): Renamed from erc-split-command and taken from
 +	circe.
 +	(erc-connect-function, erc-connect, erc-process-sentinel-1)
 +	(erc-process-sentinel, erc-flood-exceeded-p, erc-send-command)
 +	(erc-message, erc-upcase-first-word, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Moved here from erc.el.
 +	(erc-server-filter-function): Renamed from erc-process-filter.
 +	From circe.
 +	(erc-server-process): Renamed from `erc-process' and moved here
 +	from erc.el.
 +	(erc-server-coding-system): Renamed from
 +	`erc-default-coding-system'.
 +	(erc-encoding-coding-alist): Moved here from erc.el.
 +	(erc-server-flood-margin, erc-server-flood-penalty):
 +	(erc-server-flood-last-message, erc-server-flood-queue):
 +	(erc-server-flood-timer): New options from circe that allow
 +	tweaking of flood control.
 +	(erc-server-connect-function): Renamed from erc-connect-function.
 +	(erc-flood-exceeded-p): Removed.
 +	(erc-coding-system-for-target)
 +	(erc-encode-string-for-target, erc-decode-string-from-target):
 +	Moved here from erc.el
 +	(erc-server-send): Renamed from erc-send-command.  Adapted from
 +	the circe function by the same name.
 +	(erc-server-send-queue): New function from circe that implements
 +	handling of a flood queue.
 +	(erc-server-current-nick): Renamed from current-nick.
 +	(erc-server-quitting): Renamed from `quitting'.
 +	(erc-server-last-sent-time): Renamed from `last-sent-time'.
 +	(erc-server-last-ping-time): Renamed from `last-ping-time'.
 +	(erc-server-lines-sent): Renamed from `lines-sent'.
 +	(erc-server-auto-reconnect): Renamed from `erc-auto-reconnect'.
 +	(erc-server-coding-system): Docfix.
 +	(erc-server-connect): Renamed from `erc-connect'.  Require SERVER
 +	and PORT parameters.  Initialize several variables here.  Don't
 +	set `erc-insert-marker'.  Use a per-server coding system via
 +	erc-server-default-encoding.
 +
 +	* erc.el (erc-version-string): Changed to indicate we are running
 +	the `more-backend' branch.
 +	(erc-send-single-line): Implement flood control using
 +	erc-split-line.
 +	(erc-send-input): Move functionality of erc-send-single-line in
 +	here.
 +	(erc-send-single-line): Assimilated!
 +	(erc-display-command, erc-display-msg): Handle display hooks.
 +	(erc-auto-reconnect, current-nick, last-sent-time)
 +	(last-ping-time, last-ctcp-time, erc-lines-sent, erc-bytes-sent)
 +	(quitting): Moved to erc-backend.el.
 +	(erc): Docfix.  Don't initialize quite so many things here.
 +
 +2005-08-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/copyright (Copyright): Remove notices for 4 people, since
 +	they didn't contribute legally-significant changes, or have had
 +	these changes overwritten.
 +
 +	* erc-log.el: Remove copyright notice.
 +
 +	* erc.el: Remove 3 copyright notices.
 +
 +2005-08-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-3 package.  This doesn't serve
 +	any purpose other than to thank Romain Francoise for some advice.
 +
 +	* Makefile (debrelease): Allow last upload and extra build options
 +	to be specified.
 +
 +2005-08-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-2 package.
 +
 +	* debian/control (Uploaders): Add Romain Francoise.
 +	(Standards-Version): Update to 3.6.2.
 +	(Depends): Add `emacsen'.
 +
 +	* debian/scripts/startup.erc (load-path): Minor whitespace fixup.
 +
 +	* Makefile (clean): Split target from realclean and make it remove
 +	files that aren't packaged in releases.
 +	(clean, release): Minor cleanups.
 +	(debrelease): Use debuild rather than dpkg-buildpackage since the
 +	former calls lintian.  Minor cleanups.
 +	(debrelease-mwolson): New target that removes old Debian packages,
 +	calls debrelease, and copies the resulting package to my dist dir.
 +	(upload): New target that automates the process of uploading an
 +	ERC release to sourceforge.
 +
 +	* erc.el (erc-mode): Use `make-local-variable' instead of
 +	`make-variable-buffer-local'.
 +
 +2005-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Build 5.0.4-1.
 +
 +	* Makefile (release): Prepare zip file in addition to tarball.
 +
 +	* NEWS: Add item for the undo fix.
 +
 +2005-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Check
 +	erc-announced-name before erc-session-server.  Make sure that we
 +	can never get a stringp (nil) error.
 +	(erc-nicklist-call-erc-command): If given no command, do nothing.
 +	This fixes an error that used to occur when a stray mouse click
 +	was made outside of the popup window, but on the erc-nicklist
 +	menu.
 +
 +	* erc-bbdb.el (erc-bbdb-search-name-and-create): Get rid of the
 +	infinite input loop when you want to create a new record.  Replace
 +	most of that with a completing read of existing nicks.  If no nick
 +	is chosen, create a new John Doe record.  The net effect of this
 +	is that the old behavior is re-instated, with the addition of one
 +	completing read that happens when you do a /whois.
 +
 +2005-07-09  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Docfix.
 +	(erc-update-mode-line-buffer): Use `erc-propertize' instead of
 +	`propertize'.
 +	(erc-propertize): Move to erc-compat.el.
 +
 +	* erc-compat.el (erc-propertize): Move here from erc.el. Always
 +	return a copy of the string (like `propertize' in GNU Emacs).
 +
 +	* erc-nicklist.el (erc-nicklist-icons-directory)
 +	(erc-nicklist-voiced-position)
 +	(erc-nicklist-insert-medium-name-or-icon): Docfix.
 +	(erc-nicklist-insert-contents): Simplify.
 +	(erc-nicklist-mode-map): Bind RET instead of `return'. Bind
 +	`down-mouse-3' instead of `mouse-3'.
 +	(erc-nicklist-kbd-cmd-QUERY): Cleanup regexp.
 +	(erc-nicklist-channel-users-info): Docfix. Simplify.
 +
 +2005-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* images: New directory containing the images that are used by
 +	erc-nicklist.el.  These are from Gaim, and are thought to be
 +	available under the terms of the GPL.
 +
 +	* erc-bbdb.el: Add local variables section to preserve tabs, since
 +	that is the style used throughout this file.  Apply patch from
 +	Edgar Gonçalves as follows.
 +	(erc-bbdb-bitlbee-name-field): New variable that indicates the
 +	field name to use for annotating the "displayed name" of a bitlbee
 +	contact.
 +	(erc-bbdb-irc-highlight-field): Docfix.
 +	(erc-bbdb-search-name-and-create): Prompt the user for the name of
 +	a contact if none was found.  Merge the new entries into the
 +	specified contact.  If new arg SILENT is non-nil, do not prompt
 +	the user for a name or offer to merge the new entry.
 +	(erc-bbdb-insinuate-and-show-entry): New arg SILENT is accepted,
 +	which is passed on to erc-bbdb-search-name-and-create.
 +	(erc-bbdb-whois): Tell erc-bbdb-search-name-and-create to prompt
 +	for name if necessary.
 +	(erc-bbdb-JOIN, erb-bbdb-NICK): Forbid
 +	erc-bbdb-search-name-and-create from prompting for a name.
 +
 +	* erc-nicklist.el: Add local variables section to preserve tabs,
 +	since that is the style used throughout this file.  Apply patch
 +	from Edgar Gonçalves as follows.
 +	(erc-nicklist-use-icons): New option; if non-nil, display an icon
 +	instead of the name of the chat medium.
 +	(erc-nicklist-icons-directory): New option indicating the path to
 +	the PNG files that are used for chat icons.
 +	(erc-nicklist-use-icons): New option indicating whether to put
 +	voiced nicks on top, bottom, or not to differentiate them.  The
 +	default is to put them on the bottom.
 +	(erc-nicklist-bitlbee-connected-p): New variable that indicates
 +	whether or not we are currently using bitlbee.  An attempt will be
 +	made to auto-detect the proper value.  This is bound in the
 +	`erc-nicklist-insert-contents' function.
 +	(erc-nicklist-nicklist-images-alist): New variable that maps a
 +	host type to its icon.  This is set by `erc-nicklist'.
 +	(erc-nicklist-insert-medium-name-or-icon): New function that
 +	inserts an icon or string that identifies the current host type.
 +	(erc-nicklist-search-for-nick): New function that attempts to find
 +	a BBDB record that corresponds with this contact given its
 +	finger-host.  If found, return its bitlbee-nick field.
 +	(erc-nicklist-insert-contents): New function that inserts the
 +	contents of the nick list, including text properties and images.
 +	(erc-nicklist): Populate `erc-nicklist-images-alist'.  Move
 +	nicklist content generation code to
 +	`erc-nicklist-insert-contents'.
 +	(erc-nicklist-mode-map): Map C-j to erc-nicklist-kbd-menu and RET
 +	to erc-nicklist-kbd-cmd-QUERY.
 +	(erc-nicklist-call-erc-command): Make use of
 +	`switch-to-buffer-other-window'.
 +	(erc-nicklist-cmd-QUERY): New function that opens a query buffer
 +	for the given contact.
 +	(erc-nicklist-kbd-cmd-QUERY): Ditto; contains most of the code.
 +	(erc-nicklist-kbd-menu): New function that shows the nicklist
 +	action menu.
 +	(erc-nicklist-channel-users-info): Renamed from
 +	`erc-nicklist-channel-nicks'.  Implement sorting voiced users.
 +
 +2005-06-29  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Fix regexp for Azzurra.
 +
 +2005-06-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autojoin.el (erc-autojoin-add, erc-autojoin-remove): Use
 +	`erc-session-server' if `erc-announced-server-name' is nil.  This
 +	happens when servers don't send a 004 message.
 +
 +	* erc.el (erc-quit-server): Ditto.
 +
 +	* erc-ibuffer.el (erc-server, erc-server-name): Ditto.
 +
 +	* erc-notify.el (erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Ditto.
 +
 +2005-06-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-default-coding-system)
 +	(erc-handle-user-status-change): Docstring fix.
 +	(with-erc-channel-buffer): Removed.
 +	(erc-ignored-reply-p): Replace `with-erc-channel-buffer' with
 +	`erc-with-buffer'.
 +	(erc-display-line-1): Revision 1.730 broke undo. Fix it.
 +
 +2005-06-23  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add entries for Luigi Panzeri and Andreas Schwab.
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Add entries for Azzurra
 +	and OFTC.  Thanks to Luigi Panzeri and Andreas Schwab for
 +	providing these.
 +
 +2005-06-16  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add John Paul Wallington.
 +
 +	* erc.el: Thanks to John Paul Wallington for the following.
 +	(erc-nickname-in-use): Use `string-to-number' instead of
 +	`string-to-int'.
 +
 +	* erc-dcc.el (erc-dcc-handle-ctcp-send)
 +	(erc-dcc-handle-ctcp-chat, erc-dcc-get-file)
 +	(erc-dcc-chat-accept): Ditto.
 +
 +	* erc-identd.el (erc-identd-start): Ditto.
 +
 +2005-06-16  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-mode-map): Suppress `font-lock-fontify-block' key
 +	binding since it destroys face properties.
 +
 +2005-06-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-UNIGNORE): Use `erc-member-ignore-case' instead
 +	of `member-ignore-case'.  Thanks to bpalmer for the heads up.
 +
 +2005-06-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Fix a mistake I made when editing this a
 +	few days ago.  Modes should now be disabled properly.
 +	(erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Remove unnecessary call to
 +	`format'.  Thanks to Andreas Schwab for reporting this.
 +
 +	* debian/changelog: Close "README file missing" bug.
 +
 +	* debian/rules (binary-erc): Install README file.
 +
 +2005-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-with-buffer): Set `lisp-indent-function' so Emacs
 +	Lisp mode knows how to indent erc-with-buffer blocks.
 +	(with-erc-channel-buffer): Ditto.
 +	(erc-with-all-buffers-of-server): Ditto.
 +	(erc-modules): Use pcomplete by default, not completion, since
 +	erc-complete.el is deprecated.  Use `fboundp' instead of
 +	`symbol-value' to check for existence of a function before calling
 +	it.  This was causing an error when untoggling the `completion'
 +	option and trying to save via the customize interface.
 +
 +	* erc-track.el (erc-modified-channels-update): If a buffer is not
 +	currently connected, remove it from the modified channels list.
 +	This should fix the problem where residue was left on the mode
 +	line after quitting ERC.
 +
 +	* erc-list.el (erc-prettify-channel-list): Docfix; thanks to John
 +	Paul Wallington for reporting this.
 +
 +2005-05-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: First draft of entries for the 5.0.3 release.
 +
 +	* debian/README.Debian: Note that ERC will now install correctly
 +	on versions of Emacs or XEmacs that do not have the `format-spec'
 +	library.  Correct some grammar and prune the content a bit.
 +
 +	* debian/scripts/install (emacs20): Remove line since we no longer
 +	need to deal with format-spec.el.
 +
 +	* NEWS: Add entries for the upcoming 5.0.3 release.
 +
 +	* erc.el: Don't require format-spec since this is provided in
 +	erc-compat.el now.
 +	(erc-process-sentinel, erc-setup-periodical-server-ping): Use
 +	`erc-cancel-timer' instead of `cancel-timer'.
 +	(erc-version-string): Update to 5.0.3.
 +
 +	* erc-autoaway.el (autoaway, erc-autoaway-reestablish-idletimer):
 +	Use `erc-cancel-timer' instead of `cancel-timer'.
 +
 +	* erc-compat.el (format-spec, format-spec-make): If we cannot load
 +	the `format-spec' library, provide versions of these functions.
 +	This should keep problems from surfacing with Emacs21 Debian
 +	builds.
 +	(erc-cancel-timer): New function created to take the place of
 +	`cancel-timer' since XEmacs calls it something else.
 +
 +	* erc-track.el (erc-modified-channels-update): Accept any number
 +	of arguments, which are ignored.  This allows it to be run from
 +	`erc-disconnected-hook' without extra bother.
 +	(track): Add `erc-modified-channels-update' to
 +	`erc-disconnected-hook' so that the indicators are removed
 +	correctly in some edge cases.
 +	(erc-modified-channels-display): Make sure that we never pass nil
 +	to the function in `erc-track-shorten-function'.  This happens
 +	when we have deleted buffers in `erc-modified-channels-alist'.
 +	Also, make sure that the buffer has a non-nil short-name before
 +	adding it to the string list.  This should fix some XEmacs
 +	warnings when running /quit with unchecked buffers, as well as get
 +	rid of a stray buffer problem (or so it is hoped).
 +
 +2005-05-31  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-replace.el, erc-speak.el: Clean up comment formatting.
 +
 +	* erc-ring.el (ring, erc-input-ring-index, erc-clear-input-ring):
 +	Clean up docstring formatting.
 +
 +2005-05-30  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Delete superfluous
 +	arg to `format'.
 +	(erc-load-irc-script): Use `insert-file-contents' instead of
 +	`insert-file'. Simplify.
 +
 +2005-05-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Move this up so that it is
 +	evaluated before the `require' statements.  Not a major change.
 +
 +2005-04-27  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-complete-word): Simplify.
 +
 +2005-04-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Use a slightly different approach when
 +	removing CVS and Arch cruft.
 +
 +	* debian/changelog: Update for 5.0.2-1 package.
 +
 +2005-04-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move code
 +	block higher in file to fix a load failure when using Emacs21.
 +	Thanks to Daniel Brockman for the report and fix.
 +
 +2005-04-24  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-backend.el (JOIN): save-excursion so that
 +	`erc-current-logfile' inserts into the correct channel buffers
 +	when using erc-log-insert-log-on-open in combination with autojoin
 +	to multiple channels.
 +
 +2005-04-17  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-log.el: Remove stray whitespace.
 +	* erc.el: Ditto.
 +
 +2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
 +
 +	* erc.el: autoload erc-select-read-args, which, because it parses
 +	erc-select's args, can be called before erc.el is loaded. 
 +
 +2005-04-07  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Remove final newlines from previously-existing ERC
 +	buffers. (Minor bug fix.)
 +
 +2005-04-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Ignore errors from deleting Arch and CVS
 +	metadata.
 +
 +2005-04-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, CREDITS, AUTHORS: Correct name and email address of
 +	Marcelo Toledo.
 +
 +2005-04-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Add entry for spelling module.
 +
 +	* erc-spelling.el: Add autoload line.
 +
 +	* erc-backend.el: Apply latest non-ascii patch from Kai Fan.
 +	(erc-decode-parsed-server-response): Search
 +	erc-response.command-args for channel name.  Decode the
 +	erc-response struct using this channel name as key according to
 +	the `erc-encoding-coding-alist'.
 +
 +	* erc-track.el: Apply patch from Henrik Enberg.
 +	(erc-modified-channels-object): Use optimal amount of whitespace
 +	around modified channels indicator.
 +
 +2005-04-02  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (define-erc-module, erc-with-buffer)
 +	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
 +	edebug-form-spec.
 +
 +	* erc-compat (erc-define-minor-mode): Ditto.
 +
 +2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
 +
 +	* erc-spelling.el: New file.
 +
 +2005-03-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (define-erc-response-handler): Add
 +	`definition-name' property to constructed symbols so that
 +	find-function and find-variable will find them.
 +
 +2005-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el, erc-goodies.el, erc-list.el, erc-notify.el,
 +	erc-ring.el, erc.el: Copyright assignment occurred.
 +
 +	* debian/scripts/install: Make a shell wrapper around the original
 +	Makefile and inline the Makefile.  The problem is that Debian
 +	passes all the Emacs variants at once, rotating them at every
 +	invocation of the install script, which happens once per variant.
 +	This caused each installation to happen N-1 times more often than
 +	it should have.  As a result, we need to only deal with the first
 +	argument.
 +	(ELFILES): Only add format-spec.el if we are compiling for
 +	emacs21.  Don't filter out erc-compat.el.
 +	(SITEFLAG): New variable that indicates that the "nosite" option
 +	should look like.
 +	(.DEFAULT): Use $(FLAVOUR) instead of $@ for clarity.
 +
 +	* debian/rules: Install NEWS file and compress it.
 +
 +	* debian/maint/postinst: Be more cautious about configuration
 +	step.
 +
 +	* debian/copyright (Copyright): Another assignment came in.
 +
 +	* debian/control (Standards-Version): Update to a newer version as
 +	recommended by lintian.
 +
 +	* debian/changelog: Changes made for the Debian package.
 +
 +	* debian/README.Debian: Keep only the General Notes section.
 +
 +	* NEWS: Move old history items here from debian/README.Debian.
 +
 +	* Makefile (SNAPSHOTDATE): Deprecate this option since we hope to
 +	release more often.
 +
 +2005-03-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-define-catalog, `ctcp-request-to'): Fix typo (%: ->
 +	%t:).
 +
 +2005-03-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Replace tabs with spaces
 +	in code indentation.
 +
 +2005-02-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply corrected patch from Henrik
 +	Enberg.
 +
 +2005-02-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply patch from Henrik Enberg.
 +	Check here to see if a message should be hidden, rather than
 +	relying on code in each individual command.
 +	(erc-version-string): Add "(CVS)" to the version string for
 +	clarity.
 +
 +	* erc-backend.el (JOIN, KICK, MODE, NICK, PART, QUIT, TOPIC):
 +	Don't check `erc-hide-list' here.
 +
 +	* erc-list.el, erc-match.el, erc.el, debian/copyright: Update
 +	copyright information as a few more people have assignments
 +	registered.
 +
 +2005-02-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el: Apply patch from Kai Fan for non-ASCII character
 +	support.
 +	(erc-parse-server-response): Add call to
 +	`erc-decode-parsed-server-response'.
 +	(erc-decode-parsed-server-response): New function that decodes a
 +	pre-parsed server response before it can be handled.
 +	(PRIVMSG): Comment out call to `erc-decode-string-from-target'.
 +	(TOPIC): Ditto.
 +
 +2005-02-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-sentinel-1): Don't reconnect on connection
 +	refused. This error is reported differently when using
 +	open-network-stream-nowait.
 +
 +2005-01-26  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-APPENDTOPIC, erc-set-topic): The control
 +	character in `channel-topic' was changed to \C-o - replaced \C-c
 +	with \C-o so that these functions work as expected again.
 +	(erc-get-channel-mode-from-keypress): Doc fix.
 +
 +2005-01-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-button.el, erc-compat.el, erc-goodies.el,
 +	erc-match.el, erc-nets.el, ChangeLog, NEWS: Merged bug fixes made
 +	on release_5_0_branch since 5.0.1 release.
 +
 +2005-01-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-input-action): Quote `erc-action-history-list' so
 +	that input history actually works.
 +	(erc-process-ctcp-query): Fix and simplify logic.
 +	(erc-get-channel-mode-from-keypress): Use `C-' string syntax.
 +	(erc-load-irc-script-lines): Use `erc-command-indicator' instead
 +	of `erc-prompt'.
 +
 +2005-01-23  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Ensure that `viper-comint-mode-hook' runs in
 +	buffers whose `erc-mode-hook' has already run when this file is
 +	loaded.
 +	Explicitly `require' erc.el.
 +
 +2005-01-22  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Remove frobbing of `require-final-newline'.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Remove frobbing of
 +	`require-final-newline'.
 +
 +	* erc-viper.el: New file. This is where all ERC/Viper
 +	compatiibilty code should live. When and if ERC is bundled with
 +	Emacs, some of the hacks in this file should be merged into Viper
 +	itself.
 +
 +2005-01-21  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Set `require-final-newline' to nil in ERC
 +	buffers. This prevents a Viper misfeature whereby extraneous
 +	newlines are inserted into the ERC buffer when switching between
 +	viper states.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Bind `require-final-newline'
 +	to t when calling `write-region' to ensure that further log
 +	entries start on fresh lines.
 +	
 +2005-01-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-face): Reverted my change to the
 +	order faces since it had the unwanted effect of putting the button
 +	face after all others.
 +	(erc-button-face-has-priority): Removed this variable as it is not
 +	necessary anymore - it was used to compensate for the above
 +	mentioned change.
 +
 +	* NEWS: Added the latest fixes.
 +
 +2005-01-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el, erc-match.el:
 +	(erc-button-syntax-table, erc-match-syntax-table): Added \ as a
 +	legal character for nicknames.
 +
 +	* erc-nets.el (erc-server-select): Fixed so that only networks
 +	with servers found in `erc-server-alist' are available as choices.
 +
 +	* erc.el, erc-compat.el, erc-goodies.el:
 +	(erc-replace-match-subexpression-in-string): New function.  Needed
 +	because `replace-match' in XEmacs doesn't replace regular
 +	expression subexpressions in strings, only in buffers.
 +	(erc-seconds-to-string, erc-controls-interpret): Use the new
 +	function.
 +
 +	* erc-button.el (erc-button-add-button): Use the `:button-face'
 +	key combined with an `erc-mode' local `widget-button-face' set to
 +	nil to get the widget overlay face suppressed in XEmacs.
 +
 +2005-01-19  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-face): The face added by this
 +	function is more important than the existing text's face, so we
 +	now prepend erc-button-face to the list of existing faces when
 +	adding a button.  To instead append erc-button-face to existing
 +	faces, set variable `erc-button-face-has-priority' to nil.
 +	(erc-button-face-has-priority): New variable to control how
 +	erc-button-add-face adds erc-button-face to existing faces.
 +	(erc-button-press-button): Silenced a byte-compiler warning about
 +	too few arguments in a call to `error'.
 +
 +2005-01-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* NEWS: Added list of 5.0.1 fixes.
 +
 +2005-01-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Move to format that cscvs can understand.  As an added
 +	perk, entries line up nicer.
 +
 +	* erc.el, erc-fill.el, erc-pcomplete.el, debian/copyright: Merge a
 +	few more copyright lines thanks to Alex Schroeder's BBDB file.
 +
 +	* Makefile: Change version to correspond with our new scheme.
 +
 +2005-01-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el (erc-chanlist-channel-line-regexp): Now matches
 +	private channels, the channels `#' and `&', and channels with
 +	names including non-ascii characters.
 +	(erc-chanlist-join-channel): Don't attempt to join private
 +	channels since the channel name is unknown.
 +
 +	* erc-goodies.el (erc-make-read-only): Add `rear-nonsticky'
 +	property to avoid `Text is read-only' errors during connection.
 +	`front-nonsticky' does not exist, changed to `front-sticky'.
 +	(erc-controls-interpret, erc-controls-strip): Just work on the
 +	string, don't open a temporary buffer.
 +	(erc-controls-propertize): Now accepts optional argument STR.
 +
 +2005-01-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile: Version is 5.01, but only in the Makefile.  It has not
 +	been released yet.
 +
 +	* erc-auto.in, erc-autojoin.el, erc-bbdb.el, erc-button.el,
 +	erc-chess.el, erc-complete.el, erc-dcc.el, erc-fill.el,
 +	erc-goodies.el, erc-ibuffer.el, erc-identd.el, erc-imenu.el,
 +	erc-list.el, erc-match.el, erc-menu.el, erc-nets.el,
 +	erc-netsplit.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el,
 +	erc-ring.el, erc-speak.el, erc-speedbar.el, erc-stamp.el,
 +	erc-track.el, erc-xdcc.el, erc.el, debian/copyright: Update
 +	copyright notices.  If anyone has signed papers for Emacs in
 +	general, merge them with the FSF's entry.
 +
 +2005-01-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc): `erc-set-active-buffer' was being called before
 +	`erc-process' was set, so that channels weren't being marked
 +	active correctly upon join; fixed.
 +
 +2005-01-15  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (def-edebug-spec): This macro caused problems (in
 +	XEmacs). Use its expansion directly.
 +
 +2005-01-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-button): Reverted previous change
 +	since `:suppress-face' doesn't seem to be checked for a certain
 +	face.
 +	(erc-button-add-face): FACE is now appended to the `old' face.
 +	This should fix the problem of faces being "covered" by
 +	`erc-button-face'.
 +
 +2005-01-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-OPS, erc-cmd-COUNTRY,
 +	erc-cmd-NICK, erc-process-ctcp-query, ERROR, PONG, 311, 312, 313,
 +	314, 317, 319, 320, 321, 322, 330, 352): Use catalog entries
 +	instead of hard-coded text messages.
 +	(english): Added new catalog entries `country', `country-unknown',
 +	`ctcp-empty', `ctcp-request-to', `ctcp-too-many', `nick-too-long',
 +	`ops', `ops-none', `ERROR', `PONG', `s311', `s312', `s313',
 +	`s314', `s317', `s317-on-since', `s319', `s320', `s321', `s322',
 +	`s330', and `s352'.
 +	(erc-send-current-line): Use `erc-set-active-buffer' (change was
 +	lost in previous bug fix).
 +
 +2005-01-14  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-button): Fixed a bug where the
 +	overlay created by widget-convert-button has a `face' property
 +	that hides the `face' property set on the underlying button text.
 +
 +	* erc-goodies.el: Docstring fix.
 +
 +	* erc-button.el: Improved docstring for variable erc-button-face.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el (erc-menu-definition): "Topic set by channel
 +	operator": Small word change.  "Identify to NickServ...": Check
 +	that we're connected to the server.  Added "Save buffer in log"
 +	and "Truncate buffer".
 +
 +2005-01-13  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el (erc-display-line-1): Widen before we try to insert
 +	anything, this makes sure input isn't broken when the buffer is
 +	narrowed by the user.
 +	(erc-beg-of-input-line): Simplify, just return the position of
 +	`erc-insert-marker' or error if does not exist.
 +	(erc-send-current-line): Widen before trying to send anything.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el, erc-list.el:
 +	(erc-update-mode-line-buffer): Strip controls characters from
 +	`channel-topic' since we add our own control character to it.
 +	(TOPIC, 332): Use \C-o instead of \C-c to force an end of IRC
 +	control characters as it also ends bold, underline, and inverse -
 +	\C-c only ends colors.
 +	(erc-chanlist-322): Strip control characters from channel and
 +	topic.  No need to interpret controls when we're applying overlays
 +	to the lines.
 +
 +	* erc.el, erc-backend.el, erc-button.el, erc-netsplit.el,
 +	erc-nicklist.el: Fixed so that each server has an active buffer.
 +	(erc-active-buffer): Now a buffer-local variable.
 +	(erc-active-buffer, erc-set-active-buffer): New functions.
 +	(erc-display-line, erc-echo-notice-in-active-non-server-buffer,
 +	erc-process-away, MODE): Call `erc-active-buffer' to get the
 +	active buffer for the current server.
 +	(erc, erc-process-sentinel-1, erc-grab-region, erc-input-action,
 +	erc-send-current-line, erc-invite-only-mode,
 +	erc-toggle-channel-mode, erc-channel-names, MODE, erc-nick-popup,
 +	erc-nicklist-call-erc-command): Use `erc-set-active-buffer' to set
 +	the active buffer for the current server.
 +	(erc-cmd-WHOLEFT): Use 'active as BUFFER in `erc-display-message'.
 +
 +	* erc-track.el (erc-track-modified-channels): Server buffers are
 +	now treated the same as channels and queries.  This means that
 +	`erc-track-priority-faces-only', `erc-track-exclude', and
 +	`erc-track-exclude-types' now work with server buffers.
 +
 +2005-01-12  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (475): Prompt for the channel's key if
 +	`erc-prompt-for-channel-key' is non-nil.  Send a new JOIN message
 +	with the key if a key is provided.
 +
 +	* erc.el (erc-command-indicator): Fixed customization choices so
 +	that there's no `mismatch' message when nil is the value.
 +
 +2005-01-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-bbdb.el (bbdb): Lowercase the name of the module.  This
 +	fixes a bug which caused an error to occur when trying to enable
 +	the module using the customization interface.
 +
 +2005-01-08  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-track.el: Support using faces to indicate channel activity
 +	in the modeline under XEmacs.
 +	(erc-modified-channels-object): New function.
 +	(erc-modified-channels-display): Use it.
 +	`erc-modified-channels-string' renamed to
 +	`erc-modified-channels-object' (because it's no longer a string on
 +	XEmacs). The new function `erc-modified-channels-object' is used
 +	to generate updated values for the same-named variable.
 +
 +2005-01-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* ChangeLog.2002: Changed instances of my sourceforge username and
 +	email address to real name and email.
 +
 +	* erc.el (erc-modules): Changed customization tag descriptions, so
 +	that they all start with a verb; added new modules to choices.
 +
 +2005-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/rules: Introduce new variable DOCDIR to simplify stuff a
 +	bit.
 +
 +2005-01-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS, ChangeLog.2004: Change bpalmer's email address as
 +	requested.
 +
 +	* CREDITS: Add everyone who is mentioned in the ChangeLogs.
 +
 +	* debian/copyright (Copyright): Add last few people.  This can now
 +	be considered a complete list, as far as CVS entries are
 +	concerned.  If people have assigned copyright to the FSF, merge
 +	them with the entry for the FSF.
 +
 +	* debian/README.Debian: Add entry for XEmacs-related change in
 +	`erc-track.el'.
 +
 +	* erc.el (erc-cmd-MODE): New command that changes or displays the
 +	mode for a channel or user.  The functionality was present before
 +	this change, but there was no documentation for it.
 +
 +	* erc-auto.in, erc-*.el: Fully investigate copyright headers and
 +	change them appropriately.  If a file has been pulled off of
 +	erc.el at one time, keep track of copyright from the time of
 +	separation, but not before.  If a file has been derived from a
 +	work outside of erc, keep copyright statements in place.
 +
 +	* Makefile (VERSION): Change to 5.0! :^) Congrats on all the great
 +	work.  I'll wait until hober commits his XEmacs compatibility
 +	patch to erc-track.el, and then release.
 +	(distclean): Alias for `realclean' target.
 +
 +2005-01-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Add Marcelo Toledo, who has CVS access to this project.
 +
 +	* ChangeLog.2004: Add my name to my one contribution to erc last
 +	year.
 +
 +	* CREDITS: Add people that were discovered while scouring
 +	ChangeLogs.
 +
 +	* debian/copyright: Add everyone from `AUTHORS' to Upstream
 +	Authors.  Anyone who has contributed 15 or more lines of
 +	code (according to ChangeLogs) is listed in Copyright section.
 +	Accurate years are included.
 +
 +	* debian/README.Debian: Paste content of NEWS and reformat
 +	slightly.
 +
 +	* debian/rules: Concatenate the ChangeLogs during the Debian
 +	install process and then gzip them.
 +
 +	* Makefile (MISC): Add ChangeLog.yyyy files to list.
 +	(ChangeLog): Remove rule since we do not dynamically generate the
 +	ChangeLog anymore.
 +
 +	* MkChangeLog: Removed since we do not use it to generate the
 +	ChangeLog anymore.  cvs2cl does a much better job anyway.
 +
 +	* NEWS: Use 3rd level heading instead of bullets for lists that
 +	contain descriptions.
 +
 +2005-01-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Require 'sort.
 +	(erc-chanlist): Disable undo in the channel list buffer.
 +
 +	* erc.el, erc-menu.el: The `IRC' menu is now automatically added
 +	to the menu-bar.  Add the call to `easy-menu-add' to
 +	`erc-mode-hook' when running in XEmacs (without this the menu
 +	doesn't appear).
 +
 +	* NEWS: Added the information from
 +	http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer
 +	changes which weren't yet documented on that page.
 +
 +2005-01-06  Hoan Ton-That  <hoan@ton-that.org>
 +
 +	* erc-log.el (erc-current-logfile): Only downcase the logfile
 +	name, not the whole filename.  Also expand relative to
 +	`erc-log-channels-directory'.
 +	(erc-generate-log-file-name-with-date)
 +	(erc-generate-log-file-name-short)
 +	(erc-generate-log-file-name-long): Don't expand filename, done in
 +	`erc-current-logfile'.
 +
 +2005-01-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* NEWS: New file, details user visible changes from version to
 +	version.
 +
 +	* HACKING (NEWS entries): Mention NEWS file, and what its purpose
 +	is.
 +
 +2005-01-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: New file containing the list of release-critical
 +	tasks.  Feel free to add to it.
 +
 +	* debian/rules (binary-erc): Add ChangeLog files.
 +
 +2005-01-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.2001, ChangeLog.2002, ChangeLog.2003, ChangeLog.2004:
 +	ChangeLog entries from previous years.
 +
 +	* ChangeLog: New file containing ChangeLog entries for the current
 +	year.  Please update this file manually whenever a change is
 +	committed.  This is a new policy.
 +
 +	* AUTHORS: Add myself to list.  Some entries were space-delimited
 +	instead of TAB-delimited, and since the latter seemed to be the
 +	default, make the other entries conform.
 +
 +	* HACKING (ChangeLog Entries): Update section to reflect new
 +	policy toward ChangeLog entries, which is that they should be
 +	manually updated whenever a change is committed.
 +
 +2005-01-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-connection-established, erc-login): Update the
 +	mode-line.
 +	(erc-update-mode-line-buffer): If `erc-current-nick' returns nil,
 +	use an empty string for ?n character in format spec.  Set
 +	`mode-line-process' to ":connecting" while the connection is being
 +	established.
 +
 +2005-01-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* AUTHORS: Update list of authors.
 +
 +2005-01-02  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-goodies.el (erc-control-characters): New customization
 +	group.
 +	(erc-interpret-controls-p): Small fix, addition to
 +	documentation. Updated customization to allow 'remove as a value.
 +	Use 'erc-control-characters as `:group'.
 +	(erc-interpret-mirc-color): Use 'erc-control-characters as
 +	`:group'.
 +	(erc-beep-p): Updated documentation.  Use 'erc-control-characters
 +	as `:group'.
 +	(define-erc-module irccontrols): Add `erc-controls-highlight' to
 +	`erc-insert-modify-hook' and `erc-send-modify-hook' since it
 +	changes the text's appearance.
 +	(erc-controls-remove-regexp, erc-controls-interpret-regexp): New
 +	variables.
 +	(erc-controls-highlight): Fixed so that highlighting works even if
 +	there is no following control character.  Fixed mirc color
 +	highlighting; now respecting `erc-interpret-mirc-color'.  Fixed a
 +	bug where emacs would get stuck in a loop when \C-g was in a
 +	message and `erc-beep-p' was set to nil (default setting).
 +
 +See ChangeLog.04 for earlier changes.
 +
 +    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
diff --cc ChangeLog.06
index cb949c9,0000000..f5fc5d0
mode 100644,000000..100644
--- a/ChangeLog.06
+++ b/ChangeLog.06
@@@ -1,1508 -1,0 +1,1523 @@@
 +2006-12-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-list.el: Change header to mention that this is part of ERC,
 +	rather than GNU Emacs.
 +
 +	* erc-networks.el (erc-server-alist): Add Ars OpenIRC and
 +	LinuxChix networks.  Thanks to Angelina Carlton for mentioning
 +	them.  Properly escape periods in Konfido.Net and Kewl.Org.
 +	(erc-networks-alist): Add entries for Ars and LinuxChix, though
 +	the latter does not actually provide an announced network name.
 +
 +	* erc-services.el (erc-nickserv-identify-mode): Add 'both method,
 +	which waits for a NickServ message if the network supports it,
 +	otherwise sends the password after connecting.
 +	(erc-nickserv-identify-mode): Default to 'both.
 +	(erc-nickserv-passwords): Add OFTC and Azzurra to custom options.
 +	(erc-nickserv-alist): Indentation fix.
 +	(erc-nickserv-identify-on-connect)
 +	(erc-nickserv-identify-on-nick-change): Handle 'both method.
 +
 +2006-12-28  Leo  <sdl.web@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
 +	hitting C-g does not leave iswitchb-mode on.
 +
 +2006-12-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-RECONNECT): New command that calls
 +	erc-server-reconnect.
 +
 +	* erc-backend.el (erc-server-reconnect-count): New server variable
 +	that keeps track of reconnection attempts.
 +	(erc-server-reconnect-attempts): New option that determines the
 +	number of reconnection attempts that ERC will make per server.
 +	(erc-server-reconnect-timeout): New option that determines the
 +	amount of time, in seconds, that ERC will wait between successive
 +	reconnect attempts.
 +	(erc-server-reconnect): New function that reestablishes the
 +	current IRC connection.  Move some commands from
 +	erc-process-sentinel-1 here.
 +	(erc-process-sentinel-1): If we have been disconnected, loop until
 +	we either reconnect or run out of attempts.
 +	(erc-server-reconnect-p): Move higher and make this a defsubst,
 +	since I'm worried about the current buffer changing from
 +	underneath us.  Implement limit of number of reconnect attempts..
 +
 +	* erc.texi (Getting Started): Update for /RECONNECT command.
 +
 +2006-12-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-open): Restore old point correctly, or at least get
 +	closer to doing so than before.
 +
 +2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
 +	isn't active already, instead of leaving it on.
 +
 +2006-12-10  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc-ezbounce.el (erc-ezb-init-session-list): Doc fix.
 +
 +2006-12-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Juanma Barranquero.
 +
 +	* erc.el: Re-evaluate contributions from a contributor, and found
 +	them under 15 lines of non-obvious code, so it is safe to remove
 +	the copyright notice.
 +
 +2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
 +	(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook)
 +	(erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer)
 +	(erc-modules, erc-display-message-highlight, erc-process-input-line)
 +	(erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers)
 +	(erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers)
 +	(erc-echo-notice-in-first-user-buffer, erc-connection-established)
 +	(erc-update-user-nick, erc-update-channel-member, erc-highlight-notice)
 +	(erc-command-symbol, erc-add-query, erc-process-script-line)
 +	(erc-determine-parameters, erc-client-info, erc-popup-input-buffer):
 +	(erc-script-echo): Fix typos in docstrings.
 +	(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list)
 +	(define-erc-module, erc-once-with-server-event)
 +	(erc-once-with-server-event-global, erc-debug-irc-protocol)
 +	(erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user)
 +	(erc-update-current-channel-member, erc-load-script):
 +	(erc-mode-line-away-status-format): Doc fixes.
 +
 +2006-11-20  Andrea Russo  <rastandy@inventati.org>  (tiny change)
 +
 +	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
 +	before calling `erc-display-prompt'.
 +
 +2006-11-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Display better error message when
 +	module not found.
 +
 +2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc.el (erc-after-connect, erc-open-ssl-stream)
 +	(erc-display-line-1, erc-display-line):
 +	* erc-backend.el (005): Fix space/tab mixup in docstrings.
 +
 +2006-11-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el: Save all log buffers when Emacs exits, in case
 +	someone ignores the warning about open processes.  Remove the
 +	advice code in the commentary.
 +	(erc-save-query-buffers): Docfix.
 +	(erc-log-save-all-buffers): New function that saves all ERC
 +	buffers to logs.
 +	(erc-current-logfile): Fix bug in filename selection, where the
 +	current buffer was erroneously being preferred over the given
 +	buffer.
 +
 +2006-11-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-string-to-port): Avoid error when a numerical port
 +	is passed.  Thanks to Zekeriya KOÇ for the report.
 +
 +2006-11-08  Łukasz Demianiuk  <ldemianiuk@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-header-line): Fix typo.
 +
 +2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
 +
 +	* erc.el (read-passwd):
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
 +	* erc-truncate.el (truncate): Fix typo in docstring.
 +
 +2006-10-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
 +	first loading iswitchb.  Thanks to Leo for the report.
 +
 +2006-10-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-default-port): Make the default be 6667 instead of
 +	ircd. since Mac OS X apparently has problems with looking up that
 +	port name.
 +
 +	* erc-backend.el (353): Receive names after displaying the initial
 +	message, instead of before.
 +
 +2006-10-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-my-nick-face): New face.
 +	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
 +	fixes a bug where the :full-name argument passed to the function
 +	was not respected.
 +	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
 +	make it easier to find messages you sent in conversations when
 +	`erc-show-my-nick' is non-nil.
 +	(erc-compute-server): Doc fix.
 +
 +2006-10-01  John J Foerch  <jjfoerch@earthlink.net>  (tiny change)
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
 +	from the erc-timestamp field.
 +
 +2006-09-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
 +	parenthesis.  Thanks to Stephan Stahl for the report.
 +
 +2006-09-10  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
 +
 +	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
 +	instead of a single user.
 +
 +2006-09-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-generate-new-buffer-name): If this is a server
 +	buffer and a process exists already, create a new buffer.
 +	(erc-open): If the IRC session was continued, restore the old
 +	point.  Thanks to Stephan Stahl for the report.
 +	(erc-member-ignore-case): Coding style tweak.
 +	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
 +	find the user listed verbatim, try to match them against the list
 +	using string-match.  In this case, prompt as to whether the regexp
 +	should be removed.
 +	(erc-ignored-user-p): Remove CL-ism.
 +
 +	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
 +	whether we are already away.
 +
 +	* erc-menu.el: Fix potential compiler warning.
 +
 +2006-09-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: Updated Commentary and URL.
 +	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
 +	(erc-arrange-session-in-multiple-windows): No need to check if
 +	`erc-server-process' is bound.
 +	(erc-server-buffer-live-p): Doc fix.
 +	(erc-part-from-channel): Don't use any initial contents at prompt.
 +	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
 +	(s367): Fixed to support only banmask and channel which is the
 +	standard.  Also, there's no reason to add a message to each banned
 +	user entry trying to persuade the user to use /banlist instead of
 +	/mode #channel +b.  That part of the message was a little
 +	confusing, anyways.
 +	(s367-set-by): New catalog entry.  The user who set the ban and
 +	the time of ban seem to be specific to only certain servers such
 +	as freenode.
 +
 +	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
 +
 +	* erc-backend.el (erc-server-process-alive): No need to check if
 +	`erc-server-process' is bound.
 +	(367): Use s367 or s367-set-by where appropriate.
 +
 +	* erc-compat.el: Fixed URL.
 +
 +	* erc-dcc.el: Updated copyright years.  Added Usage section.
 +	Changed supported Emacs version number from 21.3.50 to 22 in
 +	Commentary.
 +
 +	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
 +	to check if `erc-server-process' is bound.
 +
 +	* erc-nicklist.el: Added to the Commentary section an explanation
 +	that `erc-nicklist-quit' should be called from within the nicklist
 +	buffer.  Set file coding to utf-8 so a contributor's name is
 +	displayed correctly.
 +	(erc-nicklist-icons-directory): Use customize type directory
 +	instead of string.
 +	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
 +	if it wasn't found.  This fixes a bug where an error would occur
 +	when using `string=' on bbdb-nick if it was nil.
 +
 +	* erc-replace.el: Removed URL from file information since it
 +	doesn't exist.
 +
 +	* erc-sound.el: Updated copyright years.  Fixed Commentary and
 +	added Usage section.
 +	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
 +	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
 +	definitions.
 +	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
 +	(erc-ctcp-query-SOUND): Doc fix.
 +	(erc-play-command): Removed, not necessary anymore.
 +	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
 +	higher in code, added docstring.
 +	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
 +	as well since version 21 or earlier.  Removed commented-out older
 +	version of function.
 +
 +	* NEWS: Fixed formatting, added channel tracking change.
 +
 +	* README: Fixed typo.  Added more information to Installation
 +	section.  Updated URL.
 +
 +2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: M-x erc RET can now be used to start ERC.
 +	(erc-open): Renamed from `erc'.
 +	(erc-before-connect): Change erc-select to erc.
 +	(erc): Renamed from `erc-select'.  Use `erc-open'.
 +	(erc-select): Defined as alias of `erc'.
 +	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
 +	(erc-select-ssl): Defined as alias of `erc-ssl'.
 +	(erc-cmd-SERVER): Use `erc'.
 +	(erc-query, erc-handle-irc-url): Use `erc-open'.
 +
 +	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc'.
 +
 +	* erc-networks.el: Updated copyright years.
 +	(erc-server-select): Use keyword arguments when calling `erc'.
 +
 +	* erc.texi (Getting Started, Connecting): Changed erc-select to
 +	erc.
 +
 +	* README: Changed erc-select to erc.
 +
 +	* NEWS: Added note about these changes.
 +
 +	* FOR-RELEASE: Marked this item as done.
 +
 +2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
 +	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
 +	properties to channel name.
 +
 +2006-08-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd): New customization group.
 +	(erc-identd-port): New option that specifies the port to use if
 +	none is given as an argument to erc-identd-start.
 +	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
 +	instead of erc-identd-start so that we deal with the different
 +	meaning of the first argument.
 +	(erc-identd-start): Use erc-identd-port.
 +	(erc-identd-quickstart): New function that ignores any arguments
 +	and calls erc-identd-start.
 +
 +	* erc.el (erc-with-server-buffer): New macro that switches to the
 +	current ERC server buffer and runs some code.  If no server buffer
 +	is available, return nil.  This is a useful way to access
 +	variables in the server buffer.
 +	(erc-get-server-user, erc-add-server-user)
 +	(erc-remove-server-user, erc-change-user-nickname)
 +	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
 +	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
 +	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
 +	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
 +	(erc-format-channel-modes): Use it.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
 +	instead of gensym.
 +	(erc-open-server-buffer-p): New function that returns non-nil if
 +	the given buffer is an ERC server buffer that has an open IRC
 +	process.
 +	(erc-with-buffer): Use buffer-live-p here to set a good example,
 +	though it isn't really needed here.
 +	(erc-away): Mention erc-away-time.
 +	(erc): Don't propagate the erc-away setting, since it makes more
 +	sense to access it from the server buffer.  Set up the prompt
 +	before connecting rather than after.  Run erc-connect-pre-hook
 +	with the buffer as an argument, instead of no arguments.
 +	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
 +	erc-server-buffer-p so that only open connections are set away.
 +	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
 +	(erc-process-away): Docfix.  Don't set erc-away in channel
 +	buffers.
 +	(erc-set-current-nick): Make this uniform with the style used in
 +	erc-current-nick.
 +	(erc-away-time): Rename from erc-away-p, since this is no longer a
 +	boolean-style predicate.
 +	(erc-format-away-status): Use it.
 +	(erc-initialize-log-marker): Accept a `buffer' argument.
 +	(erc-connect-pre-hook): Docfix.
 +	(erc-connection-established): Make sure this runs in the correct
 +	buffer.
 +	(erc-set-initial-user-mode): Accept a `buffer' argument.
 +
 +	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
 +
 +	* erc-spelling.el (erc-spelling-init): Use
 +	erc-with-server-buffer.  Accept `buffer' argument.
 +	(spelling): Call erc-spelling-init with the `buffer' argument.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
 +	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
 +
 +	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
 +	erc-with-server-buffer.
 +
 +	* erc-networks.el (erc-network, erc-current-network)
 +	(erc-network-name): Use erc-with-server-buffer.
 +
 +	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
 +
 +	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
 +	erc-away-time.
 +
 +	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
 +	Pass `buffer' argument to erc-log-setup-logging instead of setting
 +	the current buffer.  Ditto for erc-log-disable-logging.
 +	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
 +	argument.
 +
 +	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
 +
 +	* erc-ibuffer.el (erc-away): Use erc-away-time.
 +
 +	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
 +	read only instead of permanently doing so.
 +
 +	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
 +	Emacs Lisp has make-symbol, which is better.
 +
 +	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
 +	erc-with-server-buffer.
 +
 +	* erc-capab.el (capab-identify): Only deal with server buffers
 +	that have an open IRC process.
 +	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
 +
 +	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
 +	`erc-server-process-alive' function.
 +	(erc-coding-system-for-target): Supply a default target if one is
 +	not given.
 +	(erc-server-send): Simplify slightly.
 +	(erc-call-hooks): Use erc-with-server-buffer.
 +	(erc-server-connect, erc-server-setup-periodical-ping): Accept
 +	`buffer' argument.
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
 +	higher to avoid an automatic load snafu.
 +	(erc-autoaway-some-server-buffer): New function that returns an
 +	ERC server buffer with a live connection, or nil otherwise.
 +	(erc-autoaway-insinuate-maybe): New function that adds the
 +	autoaway reset function to post-command-hook if at least one ERC
 +	process is alive.
 +	(erc-autoaway-remove-maybe): New function that removes the
 +	autoaway reset function from post-command-hook if no ERC process
 +	is alive.
 +	(autoaway): Don't touch post-command-hook unless an IRC process is
 +	already open.  Remove our addition to post-command-hook as soon as
 +	there are no more IRC processes open.  Reset the indicators before
 +	connecting to an IRC server, which fixes a bug when re-connecting.
 +	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
 +	there are no more IRC processes open.
 +	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
 +	argument which is a function call if we can't find one.
 +	(erc-autoaway-some-open-server-buffer): New function which returns
 +	an ERC server buffer with an open connection and a user that is
 +	not away.
 +	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
 +	(erc-autoaway-set-away): Accept a `notest' argument which is used
 +	to avoid testing the same thing twice.
 +	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
 +	higher in file to fix byte-compile warning.
 +
 +2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
 +	`erc-server-reconnect-p' check all condition cases.
 +	(erc-server-reconnect-p): Moved rest of checks from
 +	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
 +
 +2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
 +	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
 +	avoid confusion with rcirc and other clients.
 +
 +	* erc-backend.el (erc-server-banned): New variable.
 +	(erc-server-connect): Set `erc-server-banned' to nil.
 +	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
 +	(erc-server-reconnect-p): New function.  Return non-nil if the
 +	user wants automatic reconnects and if the user has not been
 +	banned from the server.  This should fix a bug where ERC gets into
 +	a loop trying to reconnect with no way to stop it when the user is
 +	denied access to the server due to a server ban.  It might also
 +	help when Tor users are blocked from freenode if freenode servers
 +	send the 465 message before disconnecting.
 +	(465): Handle "banned from server" error notices.
 +
 +2006-08-13  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
 +	prompt with a space.
 +
 +2006-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-timed-out): New variable that
 +	indicates whether the current connection has timed out due to
 +	failure to respond to a ping.
 +	(erc-server-send-ping): Set erc-server-timed-out to t.
 +	(erc-server-connect): Initialize erc-server-timed-out to nil.
 +	(erc-process-sentinel-1): Consult erc-server-timed-out.
 +
 +2006-08-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
 +	avoid errors when inserting disconnect messages and other messages
 +	that begin with newlines.
 +
 +2006-08-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
 +	in several places instead of inserting text.
 +	(erc-process-sentinel): Move to the input-marker before removing
 +	the prompt.
 +
 +	* erc.el (erc-port): Fix customization options.
 +	(erc-display-message): Handle null type explicitly.  Previously,
 +	this was relying on a chance side-effect.  Cosmetic indentation
 +	tweak.
 +	(english): Add 'finished and 'terminated entries to the catalog.
 +	Add initial and terminal newlines to 'disconnected and
 +	'disconnected-noreconnect entries.  Avoid long lines.
 +	(erc-cmd-QUIT): Bind the current erc-server-process to
 +	server-proc.  If the IRC server responds quickly, it is possible
 +	for the connection to close, and hence server buffer to be killed,
 +	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
 +	problem.
 +
 +2006-08-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-send-queue): Update from Circe
 +	version of this function.
 +	(erc-server-ping-timer-alist): New variable that keeps track of
 +	ping timers according to their associated server.
 +	(erc-server-last-received-time): New variable that specifies the
 +	time of the last message we received from the server.  This is
 +	used to detect hung processes.
 +	(erc-server-send-ping): New function that sends a ping to the IRC
 +	process corresponding with the given buffer.  Split from
 +	erc-server-setup-periodical-ping.  If the server buffer no longer
 +	exists, cancel the timer.  If the server process has not given us
 +	a message, including PING responses, since the last PING, kill it.
 +	This is necessary to deal with some aberrant freenode behavior.
 +	Idea taken from rcirc.
 +	(erc-server-setup-periodical-ping): Rename from
 +	erc-server-setup-periodical-server-ping.
 +	(erc-server-filter-function): Use erc-current-time instead of
 +	current-time.
 +
 +	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 +	multi-tty Emacs.
 +	(erc-select-startup-file): Fix bug introduced by recent change.
 +	(erc-cmd-QUIT): If the IRC process has not terminated itself
 +	within 4 seconds of completing our quit-hook, kill it manually.
 +	Freenode in particular needs this.
 +	(erc-connection-established): Use erc-server-setup-periodical-ping
 +	instead of erc-server-setup-periodical-server-ping.
 +
 +2006-08-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-standardize-name): New function that returns
 +	a filename that is safe for use for a log file.
 +	(erc-current-logfile): Use it.
 +
 +	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 +	since that is a fairly standard directory.
 +	(erc-select-startup-file): Re-write to use
 +	convert-standard-filename, which will ensure that MS-DOS systems
 +	look for the _ercrc.el file.
 +
 +2006-08-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.4.
 +
 +	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
 +
 +	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 +	to the wrong buffer.  Thanks to offby1 for the report.
 +
 +	* erc-backend.el (erc-coding-system-for-target): Handle case where
 +	target is nil.  Thanks to Kai Fan for the patch.
 +
 +2006-07-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 +	buffer.  It will be saved automatically killed.  Thanks to Johan
 +	Bockgård and Tassilo Horn for pointing this out.
 +
 +2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (define-erc-module): Make find-function and find-variable
 +	find the names constructed by `define-erc-module' in Emacs 22.
 +
 +2006-07-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (log): Make sure that we enable logging on
 +	already-opened buffers as well, in case the user toggles this
 +	module after loading ERC.  Also be sure to remove logging ability
 +	from all ERC buffers when the module is disabled.
 +	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 +	the empty string.  This should fix some errors that occur when
 +	quitting Emacs without first killing all ERC buffers.
 +	(erc-log-disable-logging): New function that removes the logging
 +	ability from the current buffer.
 +
 +	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
 +
 +2006-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 +	than call toggle-read-only.
 +
 +	* Makefile (debrelease-mwolson): Remove and consolidate with the
 +	`debrelease' target.
 +	(debrevision): Rename from `debrevision-mwolson'.
 +
 +	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
 +	add autoload cookie.
 +
 +2006-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.3.
 +
 +	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
 +
 +	* servers.pl: Add copyright notice.
 +
 +	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 +	from being set automatically away and current buffer is not an ERC
 +	buffer.
 +
 +	* erc-identd.el: Fix compiler error.
 +
 +	* erc.texi (Development): Use @subheading instead of @subsection.
 +	(Advanced Usage): Add menu.
 +	(Connecting): Fully document how to connect to an IRC server.
 +	(Options, Tips and Tricks, Sample Configuration): New unwritten
 +	sections.
 +
 +	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 +	(erc-user-full-name, erc-password): Docfixes and customization
 +	interface tweaks.
 +	(erc-try-new-nick-p): Rename from
 +	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 +	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 +	of `erc-nick-uniquifier', in case someone wants multiple
 +	characters.
 +	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 +	(erc-compute-port): Docfixes.
 +
 +	* FOR-RELEASE: Put in future-first order.
 +
 +	* erc-log.el (log): Move all add-hook calls here, rather than
 +	executing them immediately, and also cause them to be un-hooked
 +	when the module is removed.
 +	(erc-save-buffer-on-part): Move next to
 +	`erc-save-queries-on-quit'.
 +	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 +	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 +	nil.  This makes things fast, but reasonably failsafe, by default.
 +
 +2006-07-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 +	default, since most IRC clients don't do this.
 +	(erc-log-write-after-send): New option that determines whether the
 +	log file will be written to after every sent message.
 +	(erc-log-write-after-insert): New option that determines whether
 +	the log file will be written to when new text is added to a logged
 +	ERC buffer.
 +	(log): Use the aforementioned options.
 +
 +	* erc.texi (Modules): Document the "completion" module.
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 +	have a nil element in the list when ignore-self is non-nil.
 +
 +2006-07-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Use `set' instead of `set-default', since
 +	this setting should never be buffer-local.  Add the `list' and
 +	`page' modules to the list.
 +
 +	* erc.texi (Modules): Add entries for `list' and `page' modules.
 +	Change "spell" to "spelling".
 +	(History): Use past tense throughout.
 +
 +2006-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 +	can happen when doing /PART.
 +
 +	* erc.el (erc-quit-reason-various-alist)
 +	(erc-part-reason-various-alist): In the example, use "^$" as an
 +	example, since "" matches anything.
 +	(erc-quit-reason-various, erc-part-reason-various): If no argument
 +	is given, and no matches are found, use our default reason instead
 +	of "nil".
 +
 +2006-07-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd-start): XEmacs defines neither
 +	`make-network-process' nor `open-network-stream-server', so just
 +	fail silently.
 +
 +2006-06-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* HISTORY: Update.
 +
 +	* erc.texi (Modules): Mention identd.
 +	(Releases): Update mailing list address and download location.
 +	(Development): Refactor.  Provide updated directions for Arch.
 +	Make URLs clickable.
 +	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 +	(Getting Started): Give simpler example.  We do not need to
 +	explicitly load every module.
 +	(History): Update.
 +
 +	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 +	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 +	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 +	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 +	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 +	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 +	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 +	erc.el: Remove version strings.
 +
 +	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 +	module versions anymore.
 +	(erc-version-modules): Remove, since we do not use this function
 +	anymore.
 +	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 +	was only useful back when ERC consisted of one file.
 +	(erc-modules): Add line for identd.
 +	(erc-get-channel-mode-from-keypress): Typo fix.
 +
 +	* erc-imenu.el: Remove unnecessary lines in header.
 +
 +	* erc-goodies.el (erc-handle-irc-url): Docfix.
 +
 +	* erc-identd.el: Define an ERC module for this.
 +	(erc-identd-start): Don't create a process buffer if possible.
 +	Otherwise, use conventional hidden names for process buffers.
 +
 +2006-06-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-coding-system-for-target): Match
 +	case-insensitively.  Use a pattern match instead of `assoc', as
 +	per the documentation for `erc-encoding-coding-alist'.
 +
 +	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 +
 +2006-06-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Update maintainer information and URLs.
 +
 +2006-06-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (upload): Make this work with the GNU upload system.
 +
 +2006-06-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-active-buffer): If the active buffer has been
 +	deleted, default to the server buffer.
 +	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 +	control really toggle, not unconditionally turn off.
 +
 +2006-06-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add items since the 5.1.2 release.
 +
 +	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 +	indicates whether the current away status was caused by this
 +	module.
 +	(erc-autoaway-set-back): Only set back if this module set the user
 +	away.
 +	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 +	(erc-autoaway-reset-indicators): New function that resets some
 +	indicators when the user is no longer away.
 +	(autoaway): Add the above function to the 305 hook.
 +
 +2006-06-05  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc.texi (History): Fix various typos.
 +
 +2006-06-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 +	definition of the autoaway module.
 +	(autoaway): Don't do anything if erc-autoaway-idle-method is
 +	unbound.  This prevents an error on startup.
 +
 +2006-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 +	(erc-autoaway-idle-method): Renamed from
 +	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 +	how to do this, so it's best to make this take symbol values.
 +	Improve documentation.  Remove warning against Emacs idle-time;
 +	the point is moot now that we get user idle time via a different
 +	method.  Make sure we disable and re-enable the module when
 +	changing this value.
 +	(autoaway): Conditionalize on the above option.  If using the idle
 +	timer or user idle methods, don't add anything to the
 +	send-completed or server-001 hooks, since it is unnecessary.
 +	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 +	Docfix.
 +	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 +	(erc-autoaway-reset-idle-irc): Renamed from
 +	`erc-autoaway-reset-idle'.  Don't pass line to
 +	`erc-autoaway-set-away', since it is not used.
 +	(erc-autoaway-reset-idle-user): New function that resets the idle
 +	state for user idle time.
 +	(erc-autoaway-set-back): Remove line argument, since it is not
 +	used.
 +
 +	* Makefile (upload): Make this work for Savannah uploads.
 +
 +	* AUTHORS: Update for Savannah move.  No old entries have been
 +	removed, in case people have not registered yet on Savannah.
 +
 +2006-06-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 +	this are live.
 +
 +2006-05-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* README: Add License information.  Permit images to be used,
 +	distributed, and modified without restriction.
 +
 +2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
 +	a value for `url-irc-function'.
 +
 +2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 +	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 +	current nickname.  Doc fix.
 +	(pcomplete/erc-mode/complete-command): Don't complete the current
 +	nickname.
 +
 +2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 +	build date as it's shown in `emacs-version'.
 +
 +	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 +	with the same face property as the previous character.
 +
 +2006-04-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 +	erc.el: Make sure to include a newline inside of negated classes,
 +	so that a newline is not matched.
 +
 +2006-04-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-connect-function): Don't try to
 +	detect the existence of the `open-network-stream-nowait' function,
 +	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 +
 +2006-03-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.texi: Update direntry.  Remove unneeded local variables.
 +
 +2006-03-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-header-line): New face that will be used to colorize
 +	the text of the header-line, provided that
 +	`erc-header-line-face-method' is non-nil.
 +	(erc-prompt-face): Fix formatting.
 +	(erc-header-line-face-method): New option that determines the
 +	method used for colorizing header-line text.  This may be a
 +	function, nil, or non-nil.
 +	(erc-update-mode-line-buffer): Use the aforementioned option and
 +	face to colorize the header-line text, if that is what the user
 +	wants.
 +	(erc-send-input): If flood control is not activated, don't split
 +	the input line.
 +
 +2006-03-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 +	that fixes the case where there is no leading whitespace.  Only
 +	remove the first space character, though.
 +
 +	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 +	erc-identd-process is set properly.
 +	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 +	(erc-identd-start): Pass :host parameter so this works with Emacs
 +	22.
 +
 +2006-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Nelson Ferreira.  Change contact address.
 +
 +	* erc-bbdb.el: Install patch from Nelson Ferreira.
 +	(erc-bbdb-electric-p): New option that indicates whether to make
 +	the BBDB buffer electric.  Defaults to "not electric".
 +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
 +
 +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
 +	<C-tab> for `erc-button-previous' as it is a more standard key
 +	binding for this type of function.
 +
 +2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Removed things that were accidentally committed on
 +	2006-02-20.  Removed Todo section.
 +	(erc-capab-unidentified): Removed.
 +
 +2006-02-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 +	(erc-capab-unidentified): Fix compiler warning by specifying
 +	group.
 +
 +2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 +	to explain thoughts better.  `erc-server-parameters' is an
 +	associated list when it's set, not a string.
 +
 +2006-02-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +	parameters are strings before using them.  Thanks to Alejandro
 +	Benitez for the report.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.2.
 +
 +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +	<C-tab>.
 +	(erc-button-previous): New function.
 +
 +2006-02-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add category for ERC 5.2.
 +
 +	* erc.el (erc): Move to the end of the buffer when a continued
 +	session is detected.  Thanks to e1f and indio for the report and
 +	testing a potential fix.
 +
 +2006-02-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Prepare a new Debian package.
 +
 +	* Makefile (debprepare): New rule that creates an ERC snapshot
 +	directory for use in both new Debian releases and revisions for
 +	Debian packages.
 +	(debrelease, debrevision-mwolson): Use debprepare.
 +
 +	* NEWS: Bring up-to-date.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
 +	timestamps before rather than after erc-fill-column when
 +	erc-timestamp-right-column is nil.  This way we won't surprise
 +	anyone unpleasantly, or so it is hoped.
 +
 +2006-02-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 +
 +2006-02-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
 +	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
 +	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
 +	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
 +	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
 +	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
 +	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
 +	Add 2006 to copyright years, to comply with the changed guidelines.
 +
 +2006-02-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Handle erc-capab-identify
 +	correctly.  Make some requirements shorter, so that it's easier to
 +	see why they are needed.
 +
 +	* erc-capab.el: Add autoload cookie for capab-identify.
 +	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 +	Minor whitespace fix in code.
 +
 +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
 +	whether we are in Emacs 22, and using X.  Improve documentation.
 +	(erc-insert-aligned): Remove calculation of offset, since
 +	:align-to pos works after all.  Unlike the previous solution, this
 +	one works when erc-stamp.el is compiled.
 +	(erc-insert-timestamp-right): Don't add length of string, and then
 +	later remove its displayed width.  This puts timestamps after
 +	erc-fill-column when erc-timestamp-right-column is nil, rather
 +	than before it.  It also fixes a subtle bug.  Remove use of
 +	`current-window', since there is no variable by that name in
 +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
 +	`erc-fill-column' is non-nil before using it.
 +
 +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Define `list' module which sets the alias
 +	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 +	`erc-list-channels-simple' when disabled.
 +	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 +	(erc-list-channels-simple): New function.
 +
 +	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 +	`capab-identify' description.  Moved customization options left in
 +	source code.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 +
 +	* erc-capab.el: Put a little more detail into Usage section.
 +	(define-erc-module): Run `erc-capab-identify-setup' in all open
 +	server buffers when enabling.
 +	(erc-capab-identify-setup): Make PROC and PARSED optional
 +	arguments.
 +	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 +	should now also match nicknames that are formatted differently
 +	than the default.
 +
 +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 +	before calling `with-current-buffer'.
 +
 +2006-02-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debbuild): Split from debrelease.
 +	(debrevision-mwolson): New rule that causes a Debian revision to
 +	be built.
 +
 +	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 +	Johan Bockgård.
 +	(erc-modules): Change use of 'pcomplete to 'completion.
 +
 +2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Require erc.
 +	(erc-capab-send-identify-messages): Use `erc-server-send'.
 +	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 +	the flags so we can also check whether the `erc-identified' text
 +	property is there at all.
 +	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 +	This fixes a bug where the prefix wasn't inserted when timestamps
 +	are inserted on the right.  Tweaked nickname regexp.
 +	(erc-capab-find-parsed): New function.
 +	(erc-capab-get-unidentified-nickname): Updated to check for 0
 +	flag.  Only get nickname if there's a nickuserhost associated with
 +	this message.
 +
 +	* erc-capab.el: New file.  Adds the new module
 +	`erc-capab-identify', which allows flagging of unidentified users
 +	on servers running an ircd based on dancer - irc.freenode.net, for
 +	example.
 +
 +	* erc.el (erc-modules): Added `capab-identify' to options.
 +	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 +	(erc-version-string): Remove "(CVS)".
 +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
 +	connections work as expected.  Connecting with `open-tls-stream'
 +	only seems to work (if at all?) when using the tls.el located in
 +	lisp/net/ in Emacs22.
 +
 +	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved these functions to erc.el
 +	since they can be useful outside of the text matching module.
 +
 +	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 +	erc-services.el since the file name has changed.
 +
 +	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 +
 +	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 +	to "ERC".
 +
 +2006-02-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 +	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 +	the filenames in DOS.
 +
 +	* erc-goodies.el: Comment fix.
 +
 +	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 +	commentary.  Use define-erc-module so that it's possible to
 +	actually use this.
 +	(erc-hecomplete): Rename function from `erc-complete'.
 +	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 +
 +	* erc-join.el: Rename from erc-autojoin.el.
 +
 +	* erc-networks.el: Rename from erc-nets.el.
 +
 +	* erc-services.el: Rename from erc-nickserv.el.
 +
 +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
 +	the simpler `indent-to' function when
 +	`erc-timestamp-right-align-by-pixel' is nil.
 +	(erc-insert-timestamp-right): If the timestamp goes on the
 +	following line, don't add timestamp properties to the spaces in
 +	front of it.
 +
 +	* erc.el (erc-migrate-modules): New function that eases migration
 +	of module names.
 +	(erc-modules): Call erc-migrate-modules in the :get accessor.
 +	(erc-modules, erc-update-modules): Update for new modules names.
 +
 +2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* FOR-RELEASE: Added two things to do before the next release of
 +	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 +	the `C-c C-SPC' and `C-c C-@' global keybindings.
 +
 +2006-02-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
 +	directory correctly.
 +
 +	* debian/changelog: Update for 5.1.1 release.
 +
 +	* debian/control (Suggests): Suggest emacs-chess instead of
 +	Recommending it.  Thanks to Era Eriksson for the report.
 +
 +	* debian/maint/postinst: Install the Info documentation.
 +
 +	* debian/maint/prerm: Handle removing of Info documentation.
 +
 +	* debian/rules (configure, configure-stamp, build, build-stamp):
 +	Generate HTML and Info documentation.
 +	(binary-erc): Install HTML and Info documentation.
 +
 +	* erc-spelling.el (erc-spelling-init): If
 +	`erc-spelling-dictionaries' is nil, do not set
 +	ispell-local-dictionary.  Before, it was being set to nil, which
 +	was causing a long delay while the ispell process restarted.
 +	(erc-spelling-unhighlight-word): New function that removes
 +	flyspell properties from a spell-checked word.
 +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
 +	that have '/' before them.
 +
 +2006-02-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (VERSION): Update to 5.1.1.
 +
 +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
 +	that Emacs does in its NEWS file.
 +
 +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 +
 +	* erc-complete.el (erc-nick-completion-exclude-myself)
 +	(erc-try-complete-nick): Use better function for getting list of
 +	channel users.
 +
 +	* erc-goodies.el: Docfix.
 +
 +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 +	being treated properly.
 +
 +	* erc.texi (History): Note that ERC is now included with Emacs.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.1.
 +
 +2006-01-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el: Update copyright years.
 +
 +2006-01-30  Simon Josefsson  <jas@extundo.com>
 +
 +	* erc.el (erc-open-ssl-stream): Use tls.el.
 +
 +2006-01-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
 +	that determines whether to use pixel values to align right
 +	timestamps.  The default is not to do so, since it only works with
 +	Emacs22 on X, and even then some people have trouble.
 +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 +
 +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-viper.el: Ensure we only alter Viper's configuration when
 +	necessary, as Viper may already take ERC into account.
 +
 +2006-01-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
 +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
 +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
 +	variable.
 +	(erc-speedbar-goto-buffer): Fix compiler warning.
 +
 +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
 +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
 +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 +	work without compiler warnings.
 +
 +	* man/erc.texi (Obtaining ERC, Installation): Note that these
 +	sections may be skipped if using the version of ERC that comes
 +	with Emacs.
 +
 +2006-01-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
 +	guidelines.
 +
 +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
 +	the Emacs copyright statement.  Refer to ourselves as ERC rather
 +	than "Emacs IRC Client", since there are now several IRC clients
 +	for Emacs.
 +
 +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
 +
 +	* erc-ibuffer.el: Require 'erc.
 +
 +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
 +	it exists.
 +
 +	* erc-stamp.el (erc-insert-aligned): Only use the special text
 +	property when window-system is X.
 +
 +	* erc.texi (History): Note that ERC 5.1 is released.
 +
 +2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-format-message): More `cl' breakage; don't use
 +	`oddp'.
 +
 +2006-01-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Update for new release.
 +
 +	* debian/control (Description): Update.
 +
 +	* debian/rules: Concatenate ChangeLog for 2005.
 +
 +	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
 +	(debrelease, release): Copy images directory.
 +
 +	* NEWS: Spelling fixes.  Add items for recent changes.
 +
 +	* erc.el (erc): Move call to erc-update-modules before the call to
 +	erc-mode.  This should fix a timestamp display issue.
 +	(erc-version-string): Release ERC 5.1.
 +
 +2006-01-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-insert-aligned): New function that inserts
 +	text in an perfectly-aligned way relative to the right margin.  It
 +	only works well with Emacs22.  A sane fallback is provided for
 +	other versions of Emacs.
 +	(erc-insert-timestamp-right): Use the new function.
 +
 +2006-01-25  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
 +	before `erc-match-mode'.
 +
 +	* erc-match.el (match): Append `erc-match-message' to
 +	`erc-insert-modify-hook'.
 +
 +2006-01-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: Mark last release requirement as done.
 +
 +	* Makefile (realclean, distclean): Remove docs.
 +
 +	* erc.texi: Take care of all pre-5.1 items.
 +
 +	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
 +	`process-send-string' in `condition-case' to avoid an error when
 +	quitting ERC.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
 +	variable-width characters in the timestamp and on the same line.
 +	The latter is a kludge, but it seems to work with most of the
 +	input I've thrown at it so far.  It's certainly better than going
 +	past the end of line consistently when we have variable-width
 +	characters on the same line.  When `erc-timestamp-intangible' is
 +	non-nil, add intangible properties to the whitespace as well, so
 +	that hitting <end> does what you'd expect.
 +
 +	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
 +	this to only use boolean values for `erc-flood-protect'.  Update
 +	documentation.
 +	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
 +	that any QUIT-related messages go there.
 +	(erc): Try to be more clever about re-using channel buffers when
 +	automatically re-connecting.  Thanks to e1f for noticing.
 +
 +2006-01-23  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.2005: Remove erroneous line.
 +
 +	* FOR-RELEASE: Make that the Makefile tweaking is complete.
 +	(NEWS): Mark as done.
 +
 +	* Makefile (MANUAL): New option indicating the name of the manual.
 +	(PREFIX, ELISPDIR, INFODIR): New options that specify the
 +	directories to install lisp code and info manuals to.  PREFIX is
 +	used only by ELISPDIR and INFODIR.
 +	(all): Call `lisp' and create the manual.
 +	(lisp): Compile lisp code.
 +	(%.info, %.html): New rules that make Info files and HTML files,
 +	respectively, from a TexInfo source.
 +	(doc): Create both the Info and HTML versions of the manual.  This
 +	is for the user -- we never call it automatically.
 +	(install-info): Install Info files.
 +	(install-bin): Install compiled and source Lisp files.
 +	(todo): Remove, since it seems pointless.
 +
 +	* NEWS: Update.
 +
 +	* README: Add Installation instructions.  Tweak layout.
 +
 +	* erc.texi: Work on some pre-5.1 items.
 +
 +	* erc-stamp.el, erc-track.el: Move some functions and options in
 +	order to get rid of a few compiler warnings.
 +
 +	* erc.el (erc-modules): Enable readonly by default.  This will
 +	prevent new users from accidentally removing old messages, which
 +	could be disconcerting.  Also enable stamp by default, since
 +	timestamps are a fairly standard feature among IRC clients.
 +
 +	* erc-button.el: Munge whitespace.
 +
 +	* erc-identd.el (erc-identd-start): Instead of throwing an error,
 +	just try to use the obsolete function.
 +
 +2006-01-22  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-decode-string-from-target): Make sure that
 +	we have a string as an argument.  If not, coerce it to the empty
 +	string.  Hopefully, this will work painlessly around an edge case
 +	related to quitting ERC around the same time a message comes in.
 +
 +2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
 +	`case').  Doc fixes.
 +	(erc-find-parsed-property): Simplify.
 +	(erc-track-get-active-buffer): Fix logic.  Simplify.
 +	(erc-track-switch-buffer): Remove unused variable `dir'.  Simplify.
 +
 +	* erc-speak.el: Doc fixes.
 +	(erc-speak-region): `propertize' --> `erc-propertize'.
 +
 +	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
 +	`erc-propertize'.
 +
 +	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
 +	account when wrapping URLs.
 +
 +	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
 +
 +	* erc-backend.el (define-erc-response-handler): Doc fix.
 +
 +2006-01-22  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Use `require' instead of `load',
 +	but prevent it from causing errors, in order to preserve the
 +	previous behavior.
 +
 +2006-01-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE (Source): Mark cl task as done.
 +
 +	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
 +	generate-autoloads.
 +	(erc-auto.el, %.elc): Don't show command, just its output.
 +
 +	* NEWS: Add items from 2005-01-01 to 2005-08-13.
 +
 +	* debian/copyright (Copyright): Update.
 +
 +	* erc-auto.in (erc-generate-autoloads): Rename from
 +	generate-autoloads.
 +
 +	* erc.el, erc-autoaway.el, erc-backend.el: Use
 +	erc-server-process-alive instead of erc-process-alive.
 +
 +	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
 +	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
 +	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
 +	Use (eval-when-compile (require 'cl)), so that compilation doesn't
 +	fail.
 +
 +	* erc-fill.el, erc-truncate.el: Whitespace munging.
 +
 +	* erc.el: Update copyright notice.  Remove eval-after-load code.
 +	(erc-with-buffer): Docfix.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
 +	instead of gensym.
 +	(erc-banlist-update): Use erc-delete-if instead of delete-if.
 +	(erc): Call `erc-update-modules' here.
 +
 +	* erc-backend.el: Require 'erc-compat to minimize compiler
 +	warnings.
 +	(erc-decode-parsed-server-response): Docfix.
 +	(erc-server-process-alive): Move here from erc.el and rename from
 +	`erc-process-alive'.
 +	(erc-server-send, erc-remove-channel-users): Make sure process is
 +	alive before sending data to it.
 +
 +	* erc-bbdb.el: Update copyright years.
 +	(erc-bbdb-whois): Remove overexuberant comment.
 +
 +	* erc-button.el: Require erc-fill, since we make liberal use of
 +	`erc-fill-column'.
 +
 +	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
 +	functions, the latter of which provides an `assert' equivalent.
 +	(erc-remove-if-not): New function that provides a simple
 +	implementation of `remove-if-not'.
 +	(erc-gensym): New function that provides a simple implementation
 +	of `gensym'.
 +	(erc-delete-if): New function that provides a simple
 +	implementation of `delete-if'.
 +	(erc-member-if): New function that provides a simple
 +	implementation of `member-if'.
 +	(field-end): Remove this, since it is unused, and later versions
 +	of XEmacs have this function already.
 +	(erc-function-arglist): Moved here from erc.el.
 +	(erc-delete-dups): New compatibility function for dealing with
 +	XEmacs.
 +	(erc-subseq): New function copied from cl-extra.el.
 +
 +	* erc-dcc.el: Require pcomplete during compilation to avoid
 +	compiler warnings.
 +	(erc-unpack-int, erc-dcc-send-filter)
 +	(erc-dcc-get-filter): Use erc-assert instead of assert.
 +	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
 +	remove-if-not.
 +
 +	* erc-match.el (erc-log-matches): Fix compiler warning.
 +
 +	* erc-nicklist.el: Update copyright notice.
 +	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
 +	(erc-nicklist-bitlbee-connected-p): Remove.
 +	(erc-nicklist-insert-medium-name-or-icon): Accept channel
 +	argument.  Use it to determine whether we are on bitlbee.  Now
 +	that bitlbee names its channel "&bitlbee", this is trivial.
 +	(erc-nicklist-insert-contents): Pass channel as specified above.
 +	Don't try to determine whether we are on bitlbee here.
 +	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
 +	of remove-if-not.
 +	(erc-nicklist-search-for-nick): Use erc-member-if instead of
 +	member-if.
 +
 +	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
 +	partially-evaluated lambda expression instead of `delete' and
 +	`find'.
 +
 +	* erc-track.el: Use erc-assert.
 +	(erc-track-modified-channels): Remove use of `return'.
 +	(erc-track-modified-channels): Use `cadr' instead of `second',
 +	since otherwise we would need yet another eval-when-compile line.
 +
 +2006-01-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
 +	detect SIGPIPE, since it doesn't work.
 +
 +2006-01-10  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-spelling.el: Updated copyright years.
 +	(define-erc-module): Enable/disable `flyspell-mode' for all open
 +	ERC buffers as well.
 +	(erc-spelling-dictionaries): Reworded customize description.
 +
 +	* erc.el (erc-command-symbol): New function.
 +	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
 +	fixes a bug where "Symbol's function definition is void:
 +	erc-cmd-LIST" would be shown after typing /list at the prompt (the
 +	command was interned because erc-menu.el uses it and is enabled by
 +	default whereas erc-list.el is not).
 +
 +	* NEWS: Started a list of renamed variables.
 +
 +	* erc.el: Reworded the message sent when defining variable
 +	aliases.
 +	(erc-command-indicator-face): Doc fix.
 +	(erc-modules): Enable the match module by default which makes
 +	current nickname highlighting on as the default.
 +
 +	* erc-button.el: Updated copyright years.
 +	(erc-button): New face.
 +	(erc-button-face): Use `erc-button'.
 +	(erc-button-nickname-face): New customizable variable.
 +	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
 +	new argument to `erc-button-add-button'.
 +	(erc-button-add-button): Doc fix.  Added new argument to function
 +	definition, NICK-P.  If it's a nickname, use
 +	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
 +	makes channel tracking and buttons work better together when
 +	`erc-button-buttonize-nicks' is enabled, since there is a nickname
 +	on just about every line.
 +
 +	* erc-track.el (erc-track-use-faces): Doc fix.
 +	(erc-track-faces-priority-list): Added `erc-button' to list.
 +	(erc-track-priority-faces-only): Doc fix.
 +
 +2006-01-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-url-regexp): Use `concat' so the
 +	regexp is not one long line.
 +	(erc-button-alist): Fixed so that customizing works correctly.
 +	Reorganized.  Removed lambda functions with more than two lines.
 +	Doc fix.
 +	(erc-button-describe-symbol, erc-button-beats-to-time): New
 +	functions.  Moved from `erc-button-alist'.
 +
 +2006-01-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
 +	process if a SIGPIPE occurs.  This happens when a new message
 +	comes in at the same time a /quit is requested.
 +	(erc-process-sentinel): Use string-match rather than string= to do
 +	these comparisons.  Matching literal newlines makes me nervous.
 +
 +	* erc-track.el (erc-track-remove-from-mode-line): Handle case
 +	where global-mode-string is not a list.  Emacs22 permits this.
 +
 +
 +See ChangeLog.05 for earlier changes.
 +
 +    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --cc NEWS
index 9c97183,0000000..68afde5
mode 100644,000000..100644
--- a/NEWS
+++ b/NEWS
@@@ -1,1084 -1,0 +1,1105 @@@
 +ERC NEWS                                                       -*- outline -*-
 +
++Copyright (C) 2006, 2007  Free Software Foundation, Inc.
++See the end of the file for license conditions.
++
 +* Changes in ERC 5.2
 +
 +** M-x erc RET now starts ERC.
 +`erc-select' has been changed to `erc'.  `erc-select' still remains as
 +an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
 +`erc-ssl' with `erc-select-ssl' as its alias.  The function that was
 +known as `erc' is now `erc-open'.
 +
 +** Open query buffers by default when private messages are received.
 +The default value of `erc-auto-query' has been changed to 'bury.
 +
 +** New command: /RECONNECT
 +This command tries to reconnect to the current IRC server exactly
 +once.  It does not work in server buffers (throws an error before the
 +command is run), but works in query and channel buffers.
 +
 +** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
 +
 +** Fix buggy interaction with multi-tty Emacs.
 +
 +** After running /QUIT, make sure that the IRC process is killed within
 +4 seconds.  Freenode, in particular, needs this at times.
 +
 +** If the IRC process has not responded to our PINGs within a certain
 +time, kill it and restart the connection.  See
 +`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
 +`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
 +`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
 +
 +** Avoid getting into an infinite connection loop.
 +Previously, this could happen if your nick was banned, you were using
 +Tor, incorrect information was entered, or the connection was bad.
 +
 +** Make ban messages less confusing.
 +
 +** Restore the point correctly when reconnecting to an IRC server.
 +
 +** Make /IGNORE and /UNIGNORE prompt to determine whether their
 +argument is a user or a regexp.  This results in less-confusing
 +behavior when trying to ignore someone who has a bracket in their
 +nick.
 +
 +** Make the default port "6667" rather than "ircd", because some
 +operating systems don't know what port "ircd" maps to.
 +
 +** Fix several bugs in erc-iswitchb (C-c C-b).
 +
 +** Clean up internal documentation.
 +Special thanks go to Juanma Barranquero for the thorough vetting of
 +ERC's internal documentation.
 +
 +** Display a more informative message when a module is not found.
 +
 +** Fix a bug where paths were being colored like IRC commands.
 +
 +** In the customize interface for `erc-modules', add the name of the module.
 +This makes it easier to find modules by name.
 +
 +** erc-server-send-ping-interval: Change to use a default of 30 seconds.
 +
 +** Some files which are included with the release of ERC 5.2 will not
 +appear in the version of ERC that is bundled with Emacs 22.  These
 +extras files may be found at:
 +
 + o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
 + o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
 +
 +** Renamed files
 +
 +Several files were renamed so as to make them distinct to users of the
 +MS-DOS operating system.
 +
 + o erc-autojoin.el -> erc-join.el
 + o erc-complete.el -> erc-hecomplete.el
 + o erc-nickserv.el -> erc-services.el
 + o ChangeLog.NNNN -> ChangeLog.NN
 +
 +** Header line changes
 +
 +*** Remove "[IRC]" from the header line.
 +
 +*** Add the %l format character to `erc-header-line-format',
 +
 +*** Document how to remove the header line.
 +Namely: (setq erc-header-line-format nil).
 +
 +** New options
 +
 +*** erc-server-reconnect-attempts: Determines the number of
 +reconnection attempts that ERC will make per server.
 +
 +*** erc-server-reconnect-timeout: Determines the amount of time,
 +in seconds, that ERC will wait between successive reconnect attempts.
 +
 +*** erc-server-send-ping-timeout: Determines when to consider a connection
 +stalled and restart it.  The default is	after 120 seconds.
 +
 +*** erc-system-name: Determines the system name to use when logging in.
 +The default is to figure this out by calling `system-name'.
 +
 +** New face: `erc-my-nick-face'
 +This helps make it easier to distinguish messages sent by yourself
 +from messages sent by other users when the value of the variable
 +`erc-show-my-nick' is non-nil.
 +
 +** Namespace changes
 +
 +*** New macro: `erc-with-server-buffer'
 +Switches to the current ERC server buffer and runs some code.  If no
 +server buffer is available, return nil.  This is a useful way to
 +access variables in the server buffer.
 +
 +*** New function: `erc-open-server-buffer-p'
 +Returns non-nil if the given buffer is an ERC server buffer that has
 +an open IRC process.
 +
 +*** New function: `erc-format-lag-time'
 +Returns the estimated lag time to server, `erc-server-lag'.
 +
 +*** Renamed items
 +
 + o `erc-server-setup-periodical-server-ping' is now
 +   `erc-server-setup-periodical-ping'
 +
 + o `erc-away-p' is now `erc-away-time'
 +
 +** Changes to the ERC manual
 +
 +*** New section: Sample Session.
 +Describes a sample ERC session for connecting to the #emacs channel on
 +Freenode.  Also mention the #erc channel.
 +
 +*** New section: Special Features.
 +Describes some of the special features of ERC.
 +
 +*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
 +interface.
 +
 +*** Development: Mention ErcDevelopment page on emacswiki.org.
 +
 +*** Tips and Tricks: Remove empty section for now.
 +
 +*** Options: Mention how to see available ERC options.
 +
 +*** Sample Configuration: Add an example of how to configure ERC.
 +
 +** New modules
 +
 +*** Autoaway (erc-autoaway.el)
 +
 +**** Make this much more reliable.
 +
 +**** Avoid duplicate messages when coming back from being away.
 +
 +**** Fix bug where autoaway was enabled just by loading the file.
 +
 +*** BBDB (erc-bbdb.el)
 +
 +**** Display information on how to cancel merging of info or how to
 +create a new John Doe record.
 +
 +**** Make it so that information from /whois continues to come in, even
 +while prompting for a record to merge.
 +
 +**** Make hitting C-g correctly abort merging the record.
 +
 +*** Capab identify (erc-capab.el)
 +Mark users who haven't identified to NickServ on servers supporting
 +CAPAB IDENTIFY-MSG.
 +
 +** Changes and additions to modules
 +
 +*** Button (erc-button.el)
 +
 +**** Make <backtab> go to the previous button.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Use mouse-face and help-echo for channel names in the mode-line.
 +This helps people using a mouse know that they are buttons and can be
 +clicked on.
 +
 +**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
 +This is accomplished by moving these bindings to their own global
 +minor mode.  Now the default is to check whether the user has bound
 +something to C-c C-SPC or C-c C-@.  If they have, prompt them about
 +whether to really override that binding.  This also has the effect of
 +preventing ERC from clobbering rcirc's keybinding, unless this is
 +desired.  See `erc-track-enable-keybindings' for more details.
 +
 +**** New option: erc-track-enable-keybindings.
 +Determine whether or not to enable the C-c C-SPC and C-c C-@
 +keybindings.  The default is to ask whether to do this if a binding to
 +these keys already exists.  It can also be set to t or nil to always
 +bind or never bind, respectively.
 +
 +**** Remove `track-when-inactive' module.
 +See `erc-track-when-inactive' for further details.
 +
 +**** New option: erc-track-when-inactive.
 +This option replaces the track-when-inactive module.  Set it to
 +non-nil to track activity even in visible buffers when inactive.  The
 +default is nil.
 +
 +**** Remove the `track-modified-channels' alias for the `track' module.
 +
 +*** DCC support (erc-dcc.el)
 +
 +**** Add Usage section to Commentary.
 +
 +**** Fix a bug in the server message output.
 +
 +*** Filling (erc-fill.el)
 +
 +**** Fix bug involving messages that start with one or more blank lines.
 +
 +*** Identd (erc-identd.el)
 +
 +**** New option `erc-identd-port'
 +Specifies the port to use if none is given as an argument to
 +`erc-identd-start'.  This is placed in the new customization group
 +`erc-identd'.
 +
 +**** New function: `erc-identd-quickstart'
 +Ignores any arguments and calls `erc-identd-start'.
 +
 +*** Channel lists (erc-list.el)
 +
 +**** Enable by default, except in the version of ERC bundled with Emacs 22.
 +
 +*** Logging (erc-log.el)
 +
 +**** Make sure filenames are safe to use before writing to them.
 +
 +**** Save all log buffers when exiting Emacs.
 +
 +**** erc-generate-log-file-name-function: Add option for
 +`erc-generate-log-file-name-network', which is a new function that
 +uses the network name rather than the server name when possible.
 +
 +*** Menu (erc-menu.el)
 +
 +**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
 +and other clients.
 +
 +**** Make this into a proper module and load it by default.
 +
 +**** Add "Current channel" submenu.
 +
 +*** Networks (erc-networks.el)
 +
 +**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
 +
 +**** Escape periods in Konfido.Net and Kewl.Org.
 +
 +*** Internet services / Nickserv (erc-nickserv.el)
 +
 +**** Add new 'both method for the `erc-nickserv-identify-mode' option
 +and make it the default.  This tries to do the right thing both when a
 +known nickserv message exists for an IRC network, and when it does
 +not.
 +
 +**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
 +
 +**** Support authentication on BitlBee.
 +
 +**** Make source code easier to understand by using accessor functions.
 +
 +*** Sound support (erc-sound.el)
 +
 +**** Make this work with both Emacs 21 and Emacs 22.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** Exclude the newline from the erc-timestamp field.
 +
 +**** New function: `erc-toggle-timestamps'.
 +Toggles display of timestamps.
 +
 +* Changes in ERC 5.1.4
 +
 +** Make find-function and find-variable work in Emacs 22 for
 +names that are constructed by `define-erc-module'.
 +
 +** Fix bug introduced in ERC 5.1.3 that caused messages to go the
 +wrong buffer.
 +
 +** Changes and additions to modules
 +
 +*** Highlighting (erc-match.el)
 +
 +**** Don't activate view-mode.
 +
 +*** Logging (erc-log.el)
 +
 +**** When this module is activated, make sure logging is enabled on
 +already-opened buffers.  Ditto for disabling logging when the module
 +is deactivated.
 +
 +**** Fix some errors that occur when exiting Emacs without first
 +quitting open IRC servers.
 +
 +* Changes in ERC 5.1.3
 +
 +** Fix use of /quote command with no initial whitespace.
 +
 +** Make it possible to customize the colorization of the header line.
 +The `erc-header-line' face is used to color the header line.
 +The `erc-header-line-face-method' determines the method to use when
 +colorizing the header line.
 +
 +** Add the new function `erc-handle-irc-url', which is a suitable
 +candidate to use for `url-irc-function'.  This permits some
 +integration of url.el and ERC.
 +
 +** Fix several errors that occur when server or channel buffers are killed
 +prematurely.
 +
 +** Fix toggling of flood control.
 +
 +** Match the patterns in `erc-encoding-coding-alist' as regexps,
 +instead of verbatim text.  Also, match case-insensitively.
 +
 +** The /SMV command has been removed, since we no longer have
 +meaningful module-specific version information.
 +
 +** Fix a "(stringp nil)" error that can happen when doing /PART.
 +
 +** Use a better example in the `erc-part-reason-various-alist'
 +documentation.
 +
 +** When using `erc-quit-reason-various' and `erc-part-reason-various'
 +and no matches are found, default to using the ERC version string
 +rather than "nil".
 +
 +** Add the `list' and `page' modules to the `erc-modules' customize
 +interface.
 +
 +** Changes to the ERC manual
 +
 +*** Update the list of available modules.
 +
 +*** Revise information about releases and development.
 +
 +*** Provide a simpler example in the "Getting Started" chapter.
 +
 +*** Fully document how to connect to an IRC server in the new
 +"Connecting" chapter.
 +
 +** Changes and additions to modules
 +
 +*** Autoaway (erc-autoaway.el)
 +
 +**** Rename the `erc-autoaway-use-emacs-idle' option to
 +`erc-autoaway-idle-method'.
 +
 +**** Add support for autoaway based on user idle time.
 +This is now the default.
 +
 +**** If you set the AWAY status yourself, erc-autoaway will not
 +interfere by un-setting AWAY prematurely.
 +
 +**** If you are set away while visiting a non-ERC buffer,
 +erc-autoaway used to fail in bringing the user back.  This is now
 +fixed.
 +
 +*** BBDB (erc-bbdb.el)
 +
 +**** Add new option `erc-bbdb-electric-p', which determines whether
 +to make the BBDB buffer electric.  This defaults to not electric.
 +
 +*** Button (erc-button.el)
 +
 +**** Use <backtab> instead of <C-tab> for `erc-button-previous'.
 +
 +*** Identd (erc-identd.el)
 +
 +**** Fix a bug that involves starting the identd server.
 +
 +**** Make this work with Emacs 22.
 +
 +**** Provide a real ERC module named `identd'.
 +
 +**** Don't create an extra buffer for the identd process.
 +
 +*** Logging (erc-log.el)
 +
 +**** By default, don't insert old logs when opening an ERC buffer.
 +This may be changed by customizing `erc-log-insert-log-on-open'.
 +
 +**** New option `erc-log-write-after-send' determines whether the
 +log file will be written to after every sent message.  The default is
 +not to do this.
 +
 +**** New option `erc-log-write-after-insert' determines whether the
 +log file will be written to when new text is added to a logged ERC
 +buffer.  The default is not to do this.  With this option and the
 +previous option, logging should no longer slow down ERC as much.
 +
 +**** Default to saving buffers and queries on quit.
 +This may be changed by customizing the `erc-save-buffer-on-quit' and
 +`erc-save-queries-on-quit' options, respectively.
 +
 +**** Only perform logging when the `logging' module is added to
 +`erc-modules'.  This prevents logging from being activated just by
 +loading the erc-log.el file, and makes logging act like other ERC
 +modules.
 +
 +*** Programmable completion (erc-pcomplete.el)
 +
 +**** Don't complete the user's current nickname.
 +
 +* Changes in ERC 5.1.2
 +
 +** Go back to using ssl.el so that SSL connections work as expected.
 +Connecting with `open-tls-stream' only seems to work (if at all?) when
 +using the tls.el located in lisp/net/ in Emacs22.
 +
 +** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
 +
 +** Move to end of prompt when ERC reconnects to a server.
 +
 +** Changes and additions to modules
 +
 +*** Spell-checking (erc-spelling.el)
 +
 +**** Don't spell-check nicks or words that are prefixed with '/'.
 +
 +**** Remove flyspell properties from words we shouldn't spell-check.
 +
 +**** Fix an issue that caused the ispell process to reload every time
 +we switch to an ERC buffer.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** Fix an inconsistency in calculating width of right timestamps.
 +
 +**** Rename option `erc-timestamp-right-align-by-pixel' to
 +`erc-timestamp-use-align-to'.  This controls whether to use the more
 +fail-proof method of aligning right timestamps, as mentioned below.
 +
 +**** Fix a right timestamp spacing problem that used to occur when
 +erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
 +use the method that aligns right timestamps perfectly in Emacs22 with
 +X.  If the current version of Emacs doesn't support this method, use
 +the simpler method, which is prone to alignment issues for math
 +symbols and other variable-width text.
 +
 +A side effect of using this new method is that there will only be one
 +space before a right timestamp in any saved logs.  If this is
 +unacceptable, set `erc-timestamp-use-align-to' to nil.
 +
 +* Changes in ERC 5.1.1
 +
 +** Fix a requirement on cl.el.
 +
 +** Use tls.el for SSL connections, rather than ssl.el.
 +
 +** Changes and additions to modules
 +
 +*** ibuffer integration (erc-ibuffer.el)
 +
 +**** Update this to work with the version of ibuffer.el that comes with
 +recent Emacs variants.
 +
 +*** Old completion (erc-complete.el)
 +
 +**** Fix a few errors.
 +
 +*** Speedbar (erc-speedbar.el)
 +
 +**** Make this work with the version of speedbar.el that comes with
 +recent Emacs variants.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** By default, use a more failsafe method of displaying right timestamps.
 +To get right timestamps to align perfectly in Emacs22 using X, set the
 +new `erc-timestamp-right-align-by-pixel' option to non-nil.
 +
 +*** Viper compatibility (erc-viper.el)
 +
 +**** Since most of these changes are now merged into Emacs22, detect
 +whether we need these changes and install them only if necessary.
 +
 +* Changes in ERC 5.1
 +
 +** Improve XEmacs compatibility.
 +
 +** Namespace changes
 +
 +*** Now ERC doesn't use global variable space.
 +Renamed all variables that didn't start with "erc-".
 +
 +  o `away' is now `erc-away'
 +
 +  o `current-nick' is now `erc-server-current-nick'
 +
 +  o `last-peers' is now `erc-server-last-peers'
 +
 +  o `last-ping-time' is now `erc-server-last-ping-time'
 +
 +  o `last-sent-time' is now `erc-server-last-sent-time'
 +
 +  o `lines-sent' is now `erc-server-lines-sent'
 +
 +  o `quitting' is now `erc-server-quitting'
 +
 +*** Remove the `with-erc-channel-buffer' function.
 +
 +** Bugfixes
 +
 +*** Don't inadvertently destroy face properties.
 +
 +*** Load erc scripts in a safer way.
 +
 +*** Don't insert a timestamp if text at point is invisible.
 +
 +*** Don't hide messages from those in `erc-fools' by default.
 +Color their nicks instead.
 +
 +*** Use a more foolproof method of encoding and decoding strings
 +before sending to a channel.
 +
 +** Backend changes
 +
 +*** Renamed some server-specific variables
 +
 +  o `erc-announced-server-name' is now `erc-server-announced-name'
 +
 +  o `erc-auto-reconnect' is now `erc-server-auto-reconnect'
 +
 +  o `erc-connect-function' is now `erc-server-connect-function'
 +
 +  o `erc-default-coding-system' is now `erc-server-coding-system'
 +
 +  o `erc-duplicate-timeout' is now `erc-server-duplicate-timeout'
 +
 +  o `erc-duplicates' is now `erc-server-duplicates'
 +
 +  o `erc-lag' is now `erc-server-lag'
 +
 +  o `erc-prevent-duplicates' is now `erc-server-prevent-duplicates'
 +
 +  o `erc-previous-read' is now `erc-server-filter-data'
 +
 +  o `erc-process' is now `erc-server-process'
 +
 +  o `erc-ping-handler' is now `erc-server-send-ping-handler'
 +
 +  o `erc-ping-interval' is now `erc-server-send-ping-interval'
 +
 +*** Renamed some functions
 +
 +  o `erc-connect' is now `erc-server-connect'
 +
 +  o `erc-process-filter' is now `erc-server-filter-function'
 +
 +  o `erc-send-command' is now `erc-server-send'
 +
 +  o `erc-send-single-line' is now `erc-send-input'
 +
 +  o `erc-setup-periodical-server-ping' is now
 +    `erc-server-setup-periodical-server-ping'
 +
 +  o `erc-split-command is now `erc-split-line'
 +
 +*** New options
 +
 +  o erc-server-flood-margin, erc-server-flood-penalty: New options
 +    that allow tweaking of flood control.
 +
 +  o erc-split-line-length: The maximum line length of a single
 +    message.
 +
 +*** New variables
 +
 +  o erc-server-flood-last-message, erc-server-flood-queue,
 +    erc-server-flood-timer: Flood control.
 +
 +  o erc-server-processing-p: Indicate when we're currently processing
 +    a message.
 +
 +*** Remove some options
 +
 +  o `erc-flood-limit'
 +  o `erc-flood-limit2'
 +
 +** New customization group `erc-server' for dealing with IRC servers.
 +
 +** ERC can now be installed by doing `make install' from the command line.
 +
 +** ERC now has a manual in erc.texi.
 +Type `make doc' to generate HTML and Info versions of it.
 +
 +** ERC no longer depends on cl.el.
 +Only the macros in cl-macs.el are used.
 +
 +** Fix an edge case when quitting as new messages come in.
 +
 +** Make flood protection toggle-able as on/off, removing the 'strict option.
 +
 +** If possible, re-use channel buffers when reconnecting to a server.
 +
 +** Text in ERC buffers is now read-only by default.
 +To get the previous behavior, 
 +
 +** Changes and additions to modules
 +
 +*** Auto-join (erc-autojoin.el)
 +
 +**** Recognize the Azzurra server.
 +
 +*** BBDB (erc-bbdb.el)
 +
 +**** When the user types /WHOIS, ask for a record to merge to.
 +
 +**** Store the displayed name of a BitlBee contact.
 +The new `erc-bbdb-bitlbee-name-field' option specifies the field to use
 +to store this information.
 +
 +**** Don't prompt for a name on /JOIN or /NICK.
 +
 +*** Button (erc-button.el)
 +
 +**** Fix customization of `erc-button-alist'
 +
 +**** New option `erc-button-nickname-face' determines the face to use
 +when coloring ERC nicknames.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Remove channels from the modified channels list if not currently
 +connected.  This should remove residue from the mode line after
 +quitting ERC.
 +
 +**** Recognize buttonized text
 +
 +*** Highlighting (erc-match.el)
 +
 +**** Highlight current nickname by default.
 +
 +**** Added the option of beeping when certain matches occur.
 +Add `erc-beep-on-match' to `erc-text-matched-hook' to enable
 +beeping.  Set the new variable `erc-beep-match-types' which match
 +types that make beeps.
 +
 +*** Nicklist (erc-nicklist.el)
 +
 +**** Fix a couple of errors.
 +
 +**** Make sure a stray mouse click doesn't trigger an error.
 +
 +**** Insert icons from the /images directory next to nicks.
 +This indicates their away status.  The location is customizable via
 +the new `erc-nicklist-icons-directory' option.
 +
 +If you do not want these icons, set `erc-nicklist-use-icons' to nil.
 +
 +*** Nickserv identification (erc-nickserv.el)
 +
 +**** Recognize Azzurra and OFTC networks.
 +
 +*** Old completion (erc-complete.el)
 +
 +**** Disable by default.
 +
 +*** Programmable completion (erc-pcomplete.el)
 +
 +**** Enable by default.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** On Emacs22, align right timestamps perfectly, even if variable-width
 +characters are used.  If we aren't using Emacs22, move text farther
 +away from the right margin when variable-width characters are used.
 +It is considered better to misalign the stamp by a bit than to go past
 +the right margin.
 +
 +**** Enable by default
 +
 +** New modules
 +
 +*** Spell-checking (erc-spelling.el)
 +
 +**** Use flyspell in ERC.
 +
 +*** Viper compatibility (erc-viper.el)
 +
 +**** Helps ERC work correctly in viper-mode.
 +
 +* Changes in ERC 5.0.4
 +
 +** Fix a problem with undo in channels.
 +
 +* Changes in ERC 5.0.3
 +
 +** Fix typo in the `ctcp-request-to' entry of the English catalog.
 +
 +** Debugging with edegug has been made easier in all of the
 +erc-with-* and with-erc* macros.
 +
 +** Non-ASCII character sets should be better supported when sending
 +and processing messages.
 +
 +** A load failure with erc-autoaway.el and Emacs21 has been fixed.
 +
 +** A few XEmacs warnings were fixed.
 +
 +** Changes and additions to modules
 +
 +*** Backend (erc-backend.el)
 +
 +**** Move the check for hidden messages into `erc-display-message'
 +so there isn't so much replicated code.
 +
 +**** Add `definition-name' property to constructed symbols so that
 +`find-function' and `find-variable' will be able to locate them.
 +
 +**** Make sure logs are inserted info the correct channel buffers.
 +There was previously an error when using `erc-insert-log-on-open' in
 +combination with autojoin to multiple channels.
 +
 +*** Button (erc-button.el)
 +
 +**** The layering of `erc-button-face' on other faces in ERC buffers
 +has been improved.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Use optimal amount of whitespace around modified channels
 +indicator.  Previously, there was an additional unnecessary space.
 +
 +**** Fix an error that occurred when unchecked buffers existed when
 +invoking /QUIT.
 +
 +* Changes in ERC 5.0.2
 +
 +** If a channel key is required for a certain channel, ERC will prompt
 +for one if `erc-prompt-for-channel-key' is non-nil.
 +
 +** ERC doesn't try to reconnect if the network connection is refused
 +when using `open-network-stream-nowait' as the `erc-connect-function'.
 +
 +** Messages from multiple servers will not go to the currently active
 +buffer.  The messages from each server will be contained in the most
 +recently active channel/server buffer that corresponds with the
 +server.
 +
 +** Some text messages were cleaned up slightly.
 +
 +** Button faces should no longer "cover" other faces.
 +
 +** Made some XEmacs compatibility fixes.
 +
 +** Nicknames containing a backslash are now correctly highlighted as
 +current-nick and buttonized as nicks.
 +
 +** `erc-server-select' doesn't offer networks without servers as a
 +choice anymore.
 +
 +** Non-ASCII character support has been improved.
 +
 +** Changes and additions to modules
 +
 +*** Menu (erc-menu.el)
 +
 +**** You can now save logs and truncate buffers from the menu-bar.
 +
 +* Changes in ERC 5.0.1
 +
 +** Narrowing in ERC buffers no longer causes formatting errors.
 +
 +** The BBDB module now loads correctly when customizing `erc-modules'.
 +
 +** The value of `erc-button-face' is now respected.
 +
 +** Fixed a bug which caused a read-only error during connection.
 +
 +** Server buffers are now tracked correctly.
 +This means that `erc-track-priority-faces-only', `erc-track-exclude',
 +and `erc-track-exclude-types' now work with server buffers.
 +
 +* Changes in ERC 5.0
 +
 +** Channel members are now stored as a hash-table.
 +`erc-server-users' and `erc-channel-users' are now hash-tables, rather
 +than alists.  This significantly increases performance, especially in
 +large channels.  Each channel member is stored as an `erc-server-user'
 +struct, with additional information about the channels they are on
 +stored in an `erc-channel-user' struct.  Code using old alist-style
 +channel members needs to be updated to work with hash-tables.
 +This new code also removes the need for erc-members.el, which has been
 +removed.
 +
 +** The way ERC deals with input from the server has changed.
 +All server response code is now in a new file, erc-backend.el.  There
 +should be no real user visible changes.  There are, however, a few
 +major changes for implementers, and module writers:
 +
 +*** The PARSED response that all handlers get called with is
 +    no longer a vector, but an `erc-response' struct.
 +
 +    This means LESS MAGIC NUMBERS in the ERC source code, but a few
 +    changes in how you get at parsed responses.
 +
 +    The sender is accessed via `erc-response.sender'.
 +
 +    The command is accessed via `erc-response.command'.
 +
 +    The arguments to the command (everything after the command and
 +    before the colon) are accessed via `erc-response.command-args'.
 +    This is a /list/ of arguments in the order they appear in the
 +    unparsed response.
 +
 +    The contents of the response is accessed via
 +    `erc-response.contents'.
 +
 +    Should, for some reason, you want to do something with the
 +    /unparsed/ response, you can get it via `erc-response.unparsed'.
 +
 +*** The `erc-server-hook-list' mechanism is gone.
 +
 +    All server response handlers should be defined with
 +    `define-erc-response-handler'.  This defines functions and
 +    corresponding hook variables.
 +
 +    The mapping of server commands to hook variables is no longer
 +    done via `erc-event-to-hook', but through an #'equal hashtable,
 +    `erc-server-responses'.  In order to find a hook you do:
 +
 +    (erc-get-hook command)
 +
 +    See the docstring of `define-erc-response-handler' for more
 +    information.
 +
 +*** ALL hook variables have been renamed.
 +
 +    In accordance with recommendations in the Emacs Lisp manual,
 +    the hook variables are no longer called `erc-server-FOO-hook',
 +    but rather `erc-server-FOO-functions'.  This is to indicate
 +    that the functions they call take arguments.
 +
 +    All the modules in ERC have been updated to reflect this change,
 +    but external module authors should beware.
 +
 +** The values of `erc-mode-line-format' and `erc-header-line-format'
 +are now defined as strings to be formatted using `format-spec'.
 +`erc-mode-line-format' does not replace the whole mode-line anymore,
 +only `mode-line-buffer-identification' is set.  This way, personal
 +mode-line configurations are not modified and all key bindings work as
 +expected.  The process status (connecting, closed) is now shown in
 +`mode-line-process'.
 +
 +** Customization of ERC variables has been made easier.  Variables
 +have been split into more groups for better organization.
 +
 +** New variables
 +
 +  o `erc-send-whitespace-lines' - Set this to send lines even if they
 +    are empty.
 +
 +  o `erc-manual-set-nick-on-bad-nick-p' - If the nickname you chose is
 +    already taken or not allowed, your nick is not changed and you can
 +    try again manually if this is non-nil.
 +
 +  o `erc-mode-line-away-status-format' - You can now set what is shown
 +    in the mode-line when you are away.
 +
 +  o `erc-header-line-uses-help-echo-p' - The header-line now uses the
 +    help-echo property. You can set this to nil to disable it.
 +
 +  o `erc-format-query-as-channel-p' - Set this to nil to have messages
 +    in the query buffer formatted like private messages.
 +
 +  o `erc-show-channel-key-p' - The channel key is now shown with the
 +    other channel modes in the header line. Set this to nil if you
 +    want it hidden.
 +
 +  o `erc-prompt-for-channel-key' - Set this if you want to be prompted
 +    for the channel key (channel's mode is +k) when you call
 +    `erc-join-channel' interactively.
 +
 +  o `erc-kill-server-buffer-on-quit' - If non-nil, kill the server
 +    buffer automatically when you quit.
 +
 +** New hooks
 +
 +  o `erc-join-hook' - Called when you join a channel.
 +
 +  o `erc-kick-hook' - Called when you are kicked from a channel. The
 +    channel's buffer is sent as an argument to functions called from
 +    this hook.
 +
 +  o `erc-nick-changed-functions' - Whenever your nickname changes
 +    successfully, the functions in this hook are run with the
 +    arguments NEW-NICK and OLD-NICK.
 +
 +** New command /WHOAMI - Do a /WHOIS on your current nickname.
 +
 +** The key binding for changing channel modes is now C-c C-o.
 +
 +** Removed variables
 +
 +  o `erc-echo-notices-in-minibuffer-flag' and
 +    `erc-echo-notices-in-current-buffer' - You should use
 +    `erc-echo-notice-hook' and `erc-echo-notice-always-hook' instead.
 +
 +  o `erc-prompt-interactive-input' has been removed (commented out)
 +    because nickname completion does not work with it.
 +
 +  o All INFO buffer-related variables and functions have been removed.
 +
 +** You can now disable modules by setting `erc-modules' with the
 +customization interface.
 +
 +** Changes and additions to modules
 +
 +*** Autoaway (erc-autoaway.el)
 +
 +**** New variable `erc-autoaway-no-auto-back-regexp' - Add text which,
 +when you type anything matching it, will not automatically discard
 +your away status when `erc-auto-discard-away' is non-nil.
 +
 +*** Filling (erc-fill.el)
 +
 +**** New variable `erc-fill-variable-maximum-indentation' - Don't
 +indent more than this many characters when indenting a message from a
 +user with a long nickname.
 +
 +*** Goodies (erc-goodies.el)
 +
 +**** Miscellaneous small modules have been moved from erc.el.
 +The functions erc-add-scroll-to-bottom, erc-make-read-only,
 +erc-send-distinguish-noncommands, erc-interpret-controls, erc-unmorse,
 +erc-smiley, and erc-occur, which were defined in the main erc.el file
 +have been moved to erc-goodies.el and have mostly been translated to
 +the modules scrolltobottom, readonly, noncommands, irccontrols, smiley
 +and unmorse.
 +
 +**** New variables
 +
 +  o `erc-input-line-position' - The line number to use with
 +    `erc-scroll-to-bottom'.
 +
 +  o `erc-beep-p' - Beep if there is a \C-g control character in a
 +    message.
 +
 +*** Channel lists (erc-list.el)
 +
 +**** New variable `erc-chanlist-highlight-face' - A face used for
 +highlighting the current line.
 +
 +*** Highlighting (erc-match.el)
 +
 +**** `erc-current-nick-highlight-type' has new options: 'keyword and
 +'nick-or-keyword.
 +
 +*** Menu (erc-menu.el)
 +
 +**** The `IRC' menu is now automatically added to `erc-mode' buffers.
 +
 +*** Networks (erc-nets.el)
 +
 +**** The functions for determining current network are in this file.
 +There were a couple of functions spread about in different files which
 +each had a different way of determining the current network.  The
 +methods have been combined, and the big list of known networks
 +(`erc-networks-alist') is being put to use.  You can access the
 +network's name by calling the new function `erc-network'.  This
 +returns the name of the current network as a symbol or 'Unknown if it
 +could not determine which network it is.
 +
 +*** Nicklist (erc-nicklist.el)
 +
 +**** ERC has a new way of displaying nicknames in a channel.
 +The new file erc-nicklist.el defines a new command `erc-nicklist'
 +which pops up a small Emacs window showing the nicknames of all
 +members of the current channel.  The implementation is not complete
 +and is rather proof-of-concept for now.  The result is something a bit
 +like erc-speedbar, but not quite as invasive, and doesn't require use
 +of a new frame.
 +
 +*** Internet services / Nickserv (erc-nickserv.el)
 +
 +**** Network detection is now taken care of by erc-nets.el.
 +The function `erc-current-network' is deprecated, use `erc-network'
 +instead.  The variable `erc-networks' has been removed, use
 +`erc-networks-alist'.  The network symbols used in
 +`erc-nickserv-alist' now match those in `erc-networks-alist'.
 +
 +**** New variable `erc-nickserv-identify-mode' - Choose which method
 +to use for automatic identification: you can wait for Nickserv to ask
 +you to identify (the default), or send an identify message
 +automatically after you change your nickname.
 +
 +*** Speedbar (erc-speedbar.el)
 +
 +**** New variable `erc-speedbar-sort-users-type' - Sort users in a
 +channel by activity, alphabetically, or not at all.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** `erc-timestamp-only-if-changed-flag' now works when
 +`erc-insert-timestamp-function' is set to 'erc-insert-timestamp-left.
 +
 +**** New variable `erc-timestamp-intangible' - Set this to nil if
 +timestamps should not have the 'intangible property.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Using faces to indicate channel activity in the modeline now works
 +in XEmacs.
 +
 +**** New variables
 +
 +  o `erc-track-priority-faces-only' - Ignore changes in a channel
 +    unless there is a face from the `erc-track-faces-priority-list' in
 +    the message.
 +
 +  o `erc-track-exclude-server-buffer' - Ignore changes in the server
 +    buffer.
 +
 +  o `erc-track-position-in-mode-line' - Set the position in the
 +    mode-line where modified channels are shown (only works in GNU
 +    Emacs versions above 21.3).
 +
 +* Changes in ERC 4.0
 +
 +** The module system has again changed a lot.  You can now customize
 +  the variable `erc-modules' and define once and for all which
 +  extension modules you want to use.  This unfortunately may require
 +  you to change your current erc initialisation code a bit, if you
 +  have some existing customsations.  On the other hand, this change
 +  makes the configuration of extension modules a lot easier for new
 +  users.  In theory, you should be able to configure all aspects of
 +  ERC by using the customize interface, you should no longer really
 +  need to write Lisp code for trivial customizations.
 +
 +  By default, the following modules are now loaded: (pcomplete
 +  netsplit fill track ring button autojoin)
 +
 +  Please use M-x customize-variable RET erc-modules RET to change the
 +  default if it does not suite your needs.
 +
 +** THe symbol used in `erc-nickserv-passwords' for debian.org IRC servers
 +  (formerly called OpenProjects, now FreeNode) has changed from
 +  openprojects to freenode.  You may need to update your configuration
 +  for a successful automatic nickserv identification.
 +
 +* Changes in ERC 3.0.cvs.20030119
 +
 +** New module erc-dcc:
 +
 +This finally implements DCC.  It requires server sockets to fully work
 +in both directions.  This feature is currently only available in Emacs
 +21.3.50 (CVS). Here is a short list of what should work though.
 +
 +** Compatibility:
 +  * Emacs 21.2, DCC get, and accepting DCC chat offers.
 +  * XEmacs 21, Only accepting DCC chat offers.
 +
 +** erc is switching to global-minor-modes for activation of submodules.
 +
 +This allows you to customize such a mode and get automatic loading of
 +the module.  No longer putting a lot of require statments in .emacs.
 +At least this is the long-term plan, not all modules are converted
 +yet.
 +
 +** The most important user visible change is that you now need to activate
 +erc-completion-mode, to get TAB completion.  The new completion code
 +is based on pcomplete.  To get the old code, manually load
 +erc-complete and bind TAB to erc-complete in erc-mode-map.
 +
 +To activate completion on startup, put (erc-completion-mode 1) in your
 +.emacs file.
 +
 +Same applies to timestamps.  You no longer need to (require
 +'erc-stamp), you can customize the variable `erc-timestamp-mode', and
 +the rest should be automatic.
 +
++
++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 2, 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.
++
 +arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1



From MAILER-DAEMON Wed Oct 17 10:36:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0O-00038d-OI
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRw-00073L-7Q
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPJ-00055d-4z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPI-00055R-UO
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:53 -0400
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@hcoop.net>) id 1IgvPF-00042h-Up
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:51 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPE-0005DU-Hb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPE-0006Kw-JK
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPE-0006Kw-JK@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:48 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Split out 2006 ChangeLog entries
	into ChangeLog.06
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, 14 Oct 2007 04:51:36 -0000

commit 218b8e425e36e08936bdf0930a92ccab952f5ebc
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 03:13:41 2007 +0000

    Split out 2006 ChangeLog entries into ChangeLog.06
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-111

diff --git a/ChangeLog b/ChangeLog
index 7a8485b..cb04e28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -190,1505 +190,10 @@
 	(erc-menu-add, erc-menu-remove): New functions that add and remove
 	the ERC menu.
 
-2006-12-28  Michael Olson  <mwolson@gnu.org>
 
-	* erc-list.el: Change header to mention that this is part of ERC,
-	rather than GNU Emacs.
+See ChangeLog.06 for earlier changes.
 
-	* erc-networks.el (erc-server-alist): Add Ars OpenIRC and
-	LinuxChix networks.  Thanks to Angelina Carlton for mentioning
-	them.  Properly escape periods in Konfido.Net and Kewl.Org.
-	(erc-networks-alist): Add entries for Ars and LinuxChix, though
-	the latter does not actually provide an announced network name.
-
-	* erc-services.el (erc-nickserv-identify-mode): Add 'both method,
-	which waits for a NickServ message if the network supports it,
-	otherwise sends the password after connecting.
-	(erc-nickserv-identify-mode): Default to 'both.
-	(erc-nickserv-passwords): Add OFTC and Azzurra to custom options.
-	(erc-nickserv-alist): Indentation fix.
-	(erc-nickserv-identify-on-connect)
-	(erc-nickserv-identify-on-nick-change): Handle 'both method.
-
-2006-12-28  Leo  <sdl.web@gmail.com>  (tiny change)
-
-	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
-	hitting C-g does not leave iswitchb-mode on.
-
-2006-12-27  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-cmd-RECONNECT): New command that calls
-	erc-server-reconnect.
-
-	* erc-backend.el (erc-server-reconnect-count): New server variable
-	that keeps track of reconnection attempts.
-	(erc-server-reconnect-attempts): New option that determines the
-	number of reconnection attempts that ERC will make per server.
-	(erc-server-reconnect-timeout): New option that determines the
-	amount of time, in seconds, that ERC will wait between successive
-	reconnect attempts.
-	(erc-server-reconnect): New function that reestablishes the
-	current IRC connection.  Move some commands from
-	erc-process-sentinel-1 here.
-	(erc-process-sentinel-1): If we have been disconnected, loop until
-	we either reconnect or run out of attempts.
-	(erc-server-reconnect-p): Move higher and make this a defsubst,
-	since I'm worried about the current buffer changing from
-	underneath us.  Implement limit of number of reconnect attempts..
-
-	* erc.texi (Getting Started): Update for /RECONNECT command.
-
-2006-12-26  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-open): Restore old point correctly, or at least get
-	closer to doing so than before.
-
-2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
-
-	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
-	isn't active already, instead of leaving it on.
-
-2006-12-10  Juanma Barranquero  <lekktu@gmail.com>
-
-	* erc-ezbounce.el (erc-ezb-init-session-list): Doc fix.
-
-2006-12-08  Michael Olson  <mwolson@gnu.org>
-
-	* CREDITS: Add Juanma Barranquero.
-
-	* erc.el: Re-evaluate contributions from a contributor, and found
-	them under 15 lines of non-obvious code, so it is safe to remove
-	the copyright notice.
-
-2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
-
-	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
-	(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook)
-	(erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer)
-	(erc-modules, erc-display-message-highlight, erc-process-input-line)
-	(erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers)
-	(erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers)
-	(erc-echo-notice-in-first-user-buffer, erc-connection-established)
-	(erc-update-user-nick, erc-update-channel-member, erc-highlight-notice)
-	(erc-command-symbol, erc-add-query, erc-process-script-line)
-	(erc-determine-parameters, erc-client-info, erc-popup-input-buffer):
-	(erc-script-echo): Fix typos in docstrings.
-	(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list)
-	(define-erc-module, erc-once-with-server-event)
-	(erc-once-with-server-event-global, erc-debug-irc-protocol)
-	(erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user)
-	(erc-update-current-channel-member, erc-load-script):
-	(erc-mode-line-away-status-format): Doc fixes.
-
-2006-11-20  Andrea Russo  <rastandy@inventati.org>  (tiny change)
-
-	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
-	before calling `erc-display-prompt'.
-
-2006-11-20  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-update-modules): Display better error message when
-	module not found.
-
-2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
-
-	* erc.el (erc-after-connect, erc-open-ssl-stream)
-	(erc-display-line-1, erc-display-line):
-	* erc-backend.el (005): Fix space/tab mixup in docstrings.
-
-2006-11-12  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el: Save all log buffers when Emacs exits, in case
-	someone ignores the warning about open processes.  Remove the
-	advice code in the commentary.
-	(erc-save-query-buffers): Docfix.
-	(erc-log-save-all-buffers): New function that saves all ERC
-	buffers to logs.
-	(erc-current-logfile): Fix bug in filename selection, where the
-	current buffer was erroneously being preferred over the given
-	buffer.
-
-2006-11-08  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-string-to-port): Avoid error when a numerical port
-	is passed.  Thanks to Zekeriya KOÇ for the report.
-
-2006-11-08  Łukasz Demianiuk  <ldemianiuk@gmail.com>  (tiny change)
-
-	* erc.el (erc-header-line): Fix typo.
-
-2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
-
-	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
-
-	* erc.el (read-passwd):
-	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
-	* erc-truncate.el (truncate): Fix typo in docstring.
-
-2006-10-21  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
-	first loading iswitchb.  Thanks to Leo for the report.
-
-2006-10-10  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-default-port): Make the default be 6667 instead of
-	ircd. since Mac OS X apparently has problems with looking up that
-	port name.
-
-	* erc-backend.el (353): Receive names after displaying the initial
-	message, instead of before.
-
-2006-10-05  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-my-nick-face): New face.
-	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
-	fixes a bug where the :full-name argument passed to the function
-	was not respected.
-	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
-	make it easier to find messages you sent in conversations when
-	`erc-show-my-nick' is non-nil.
-	(erc-compute-server): Doc fix.
-
-2006-10-01  John J Foerch  <jjfoerch@earthlink.net>  (tiny change)
-
-	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
-	from the erc-timestamp field.
-
-2006-09-11  Michael Olson  <mwolson@gnu.org>
-
-	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
-	parenthesis.  Thanks to Stephan Stahl for the report.
-
-2006-09-10  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
-
-	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
-	instead of a single user.
-
-2006-09-10  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-generate-new-buffer-name): If this is a server
-	buffer and a process exists already, create a new buffer.
-	(erc-open): If the IRC session was continued, restore the old
-	point.  Thanks to Stephan Stahl for the report.
-	(erc-member-ignore-case): Coding style tweak.
-	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
-	find the user listed verbatim, try to match them against the list
-	using string-match.  In this case, prompt as to whether the regexp
-	should be removed.
-	(erc-ignored-user-p): Remove CL-ism.
-
-	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
-	whether we are already away.
-
-	* erc-menu.el: Fix potential compiler warning.
-
-2006-09-07  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el: Updated Commentary and URL.
-	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
-	(erc-arrange-session-in-multiple-windows): No need to check if
-	`erc-server-process' is bound.
-	(erc-server-buffer-live-p): Doc fix.
-	(erc-part-from-channel): Don't use any initial contents at prompt.
-	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
-	(s367): Fixed to support only banmask and channel which is the
-	standard.  Also, there's no reason to add a message to each banned
-	user entry trying to persuade the user to use /banlist instead of
-	/mode #channel +b.  That part of the message was a little
-	confusing, anyways.
-	(s367-set-by): New catalog entry.  The user who set the ban and
-	the time of ban seem to be specific to only certain servers such
-	as freenode.
-
-	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
-
-	* erc-backend.el (erc-server-process-alive): No need to check if
-	`erc-server-process' is bound.
-	(367): Use s367 or s367-set-by where appropriate.
-
-	* erc-compat.el: Fixed URL.
-
-	* erc-dcc.el: Updated copyright years.  Added Usage section.
-	Changed supported Emacs version number from 21.3.50 to 22 in
-	Commentary.
-
-	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
-	to check if `erc-server-process' is bound.
-
-	* erc-nicklist.el: Added to the Commentary section an explanation
-	that `erc-nicklist-quit' should be called from within the nicklist
-	buffer.  Set file coding to utf-8 so a contributor's name is
-	displayed correctly.
-	(erc-nicklist-icons-directory): Use customize type directory
-	instead of string.
-	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
-	if it wasn't found.  This fixes a bug where an error would occur
-	when using `string=' on bbdb-nick if it was nil.
-
-	* erc-replace.el: Removed URL from file information since it
-	doesn't exist.
-
-	* erc-sound.el: Updated copyright years.  Fixed Commentary and
-	added Usage section.
-	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
-	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
-	definitions.
-	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
-	(erc-ctcp-query-SOUND): Doc fix.
-	(erc-play-command): Removed, not necessary anymore.
-	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
-	higher in code, added docstring.
-	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
-	as well since version 21 or earlier.  Removed commented-out older
-	version of function.
-
-	* NEWS: Fixed formatting, added channel tracking change.
-
-	* README: Fixed typo.  Added more information to Installation
-	section.  Updated URL.
-
-2006-09-03  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el: M-x erc RET can now be used to start ERC.
-	(erc-open): Renamed from `erc'.
-	(erc-before-connect): Change erc-select to erc.
-	(erc): Renamed from `erc-select'.  Use `erc-open'.
-	(erc-select): Defined as alias of `erc'.
-	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
-	(erc-select-ssl): Defined as alias of `erc-ssl'.
-	(erc-cmd-SERVER): Use `erc'.
-	(erc-query, erc-handle-irc-url): Use `erc-open'.
-
-	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
-
-	* erc-menu.el (erc-menu-definition): Use `erc'.
-
-	* erc-networks.el: Updated copyright years.
-	(erc-server-select): Use keyword arguments when calling `erc'.
-
-	* erc.texi (Getting Started, Connecting): Changed erc-select to
-	erc.
-
-	* README: Changed erc-select to erc.
-
-	* NEWS: Added note about these changes.
-
-	* FOR-RELEASE: Marked this item as done.
-
-2006-08-21  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
-	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
-	properties to channel name.
-
-2006-08-20  Michael Olson  <mwolson@gnu.org>
-
-	* erc-identd.el (erc-identd): New customization group.
-	(erc-identd-port): New option that specifies the port to use if
-	none is given as an argument to erc-identd-start.
-	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
-	instead of erc-identd-start so that we deal with the different
-	meaning of the first argument.
-	(erc-identd-start): Use erc-identd-port.
-	(erc-identd-quickstart): New function that ignores any arguments
-	and calls erc-identd-start.
-
-	* erc.el (erc-with-server-buffer): New macro that switches to the
-	current ERC server buffer and runs some code.  If no server buffer
-	is available, return nil.  This is a useful way to access
-	variables in the server buffer.
-	(erc-get-server-user, erc-add-server-user)
-	(erc-remove-server-user, erc-change-user-nickname)
-	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
-	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
-	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
-	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
-	(erc-format-channel-modes): Use it.
-	(erc-once-with-server-event, erc-once-with-server-event-global)
-	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
-	instead of gensym.
-	(erc-open-server-buffer-p): New function that returns non-nil if
-	the given buffer is an ERC server buffer that has an open IRC
-	process.
-	(erc-with-buffer): Use buffer-live-p here to set a good example,
-	though it isn't really needed here.
-	(erc-away): Mention erc-away-time.
-	(erc): Don't propagate the erc-away setting, since it makes more
-	sense to access it from the server buffer.  Set up the prompt
-	before connecting rather than after.  Run erc-connect-pre-hook
-	with the buffer as an argument, instead of no arguments.
-	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
-	erc-server-buffer-p so that only open connections are set away.
-	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
-	(erc-process-away): Docfix.  Don't set erc-away in channel
-	buffers.
-	(erc-set-current-nick): Make this uniform with the style used in
-	erc-current-nick.
-	(erc-away-time): Rename from erc-away-p, since this is no longer a
-	boolean-style predicate.
-	(erc-format-away-status): Use it.
-	(erc-initialize-log-marker): Accept a `buffer' argument.
-	(erc-connect-pre-hook): Docfix.
-	(erc-connection-established): Make sure this runs in the correct
-	buffer.
-	(erc-set-initial-user-mode): Accept a `buffer' argument.
-
-	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
-
-	* erc-spelling.el (erc-spelling-init): Use
-	erc-with-server-buffer.  Accept `buffer' argument.
-	(spelling): Call erc-spelling-init with the `buffer' argument.
-
-	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
-
-	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
-	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
-
-	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
-	erc-with-server-buffer.
-
-	* erc-networks.el (erc-network, erc-current-network)
-	(erc-network-name): Use erc-with-server-buffer.
-
-	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
-
-	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
-	erc-away-time.
-
-	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
-	Pass `buffer' argument to erc-log-setup-logging instead of setting
-	the current buffer.  Ditto for erc-log-disable-logging.
-	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
-	argument.
-
-	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
-
-	* erc-ibuffer.el (erc-away): Use erc-away-time.
-
-	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
-	read only instead of permanently doing so.
-
-	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
-	Emacs Lisp has make-symbol, which is better.
-
-	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
-	erc-with-server-buffer.
-
-	* erc-capab.el (capab-identify): Only deal with server buffers
-	that have an open IRC process.
-	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
-
-	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
-	`erc-server-process-alive' function.
-	(erc-coding-system-for-target): Supply a default target if one is
-	not given.
-	(erc-server-send): Simplify slightly.
-	(erc-call-hooks): Use erc-with-server-buffer.
-	(erc-server-connect, erc-server-setup-periodical-ping): Accept
-	`buffer' argument.
-
-	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
-	higher to avoid an automatic load snafu.
-	(erc-autoaway-some-server-buffer): New function that returns an
-	ERC server buffer with a live connection, or nil otherwise.
-	(erc-autoaway-insinuate-maybe): New function that adds the
-	autoaway reset function to post-command-hook if at least one ERC
-	process is alive.
-	(erc-autoaway-remove-maybe): New function that removes the
-	autoaway reset function from post-command-hook if no ERC process
-	is alive.
-	(autoaway): Don't touch post-command-hook unless an IRC process is
-	already open.  Remove our addition to post-command-hook as soon as
-	there are no more IRC processes open.  Reset the indicators before
-	connecting to an IRC server, which fixes a bug when re-connecting.
-	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
-	there are no more IRC processes open.
-	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
-	argument which is a function call if we can't find one.
-	(erc-autoaway-some-open-server-buffer): New function which returns
-	an ERC server buffer with an open connection and a user that is
-	not away.
-	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
-	(erc-autoaway-set-away): Accept a `notest' argument which is used
-	to avoid testing the same thing twice.
-	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
-	higher in file to fix byte-compile warning.
-
-2006-08-20  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
-	`erc-server-reconnect-p' check all condition cases.
-	(erc-server-reconnect-p): Moved rest of checks from
-	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
-
-2006-08-14  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
-	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
-	avoid confusion with rcirc and other clients.
-
-	* erc-backend.el (erc-server-banned): New variable.
-	(erc-server-connect): Set `erc-server-banned' to nil.
-	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
-	(erc-server-reconnect-p): New function.  Return non-nil if the
-	user wants automatic reconnects and if the user has not been
-	banned from the server.  This should fix a bug where ERC gets into
-	a loop trying to reconnect with no way to stop it when the user is
-	denied access to the server due to a server ban.  It might also
-	help when Tor users are blocked from freenode if freenode servers
-	send the 465 message before disconnecting.
-	(465): Handle "banned from server" error notices.
-
-2006-08-13  Romain Francoise  <romain@orebokech.com>
-
-	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
-	prompt with a space.
-
-2006-08-13  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-server-timed-out): New variable that
-	indicates whether the current connection has timed out due to
-	failure to respond to a ping.
-	(erc-server-send-ping): Set erc-server-timed-out to t.
-	(erc-server-connect): Initialize erc-server-timed-out to nil.
-	(erc-process-sentinel-1): Consult erc-server-timed-out.
-
-2006-08-11  Michael Olson  <mwolson@gnu.org>
-
-	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
-	avoid errors when inserting disconnect messages and other messages
-	that begin with newlines.
-
-2006-08-07  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
-	in several places instead of inserting text.
-	(erc-process-sentinel): Move to the input-marker before removing
-	the prompt.
-
-	* erc.el (erc-port): Fix customization options.
-	(erc-display-message): Handle null type explicitly.  Previously,
-	this was relying on a chance side-effect.  Cosmetic indentation
-	tweak.
-	(english): Add 'finished and 'terminated entries to the catalog.
-	Add initial and terminal newlines to 'disconnected and
-	'disconnected-noreconnect entries.  Avoid long lines.
-	(erc-cmd-QUIT): Bind the current erc-server-process to
-	server-proc.  If the IRC server responds quickly, it is possible
-	for the connection to close, and hence server buffer to be killed,
-	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
-	problem.
-
-2006-08-06  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-server-send-queue): Update from Circe
-	version of this function.
-	(erc-server-ping-timer-alist): New variable that keeps track of
-	ping timers according to their associated server.
-	(erc-server-last-received-time): New variable that specifies the
-	time of the last message we received from the server.  This is
-	used to detect hung processes.
-	(erc-server-send-ping): New function that sends a ping to the IRC
-	process corresponding with the given buffer.  Split from
-	erc-server-setup-periodical-ping.  If the server buffer no longer
-	exists, cancel the timer.  If the server process has not given us
-	a message, including PING responses, since the last PING, kill it.
-	This is necessary to deal with some aberrant freenode behavior.
-	Idea taken from rcirc.
-	(erc-server-setup-periodical-ping): Rename from
-	erc-server-setup-periodical-server-ping.
-	(erc-server-filter-function): Use erc-current-time instead of
-	current-time.
-
-	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
-	multi-tty Emacs.
-	(erc-select-startup-file): Fix bug introduced by recent change.
-	(erc-cmd-QUIT): If the IRC process has not terminated itself
-	within 4 seconds of completing our quit-hook, kill it manually.
-	Freenode in particular needs this.
-	(erc-connection-established): Use erc-server-setup-periodical-ping
-	instead of erc-server-setup-periodical-server-ping.
-
-2006-08-05  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-log-standardize-name): New function that returns
-	a filename that is safe for use for a log file.
-	(erc-current-logfile): Use it.
-
-	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
-	since that is a fairly standard directory.
-	(erc-select-startup-file): Re-write to use
-	convert-standard-filename, which will ensure that MS-DOS systems
-	look for the _ercrc.el file.
-
-2006-08-02  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-version-string): Release ERC 5.1.4.
-
-	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
-
-	* erc.el (erc-active-buffer): Fix bug that caused messages to go
-	to the wrong buffer.  Thanks to offby1 for the report.
-
-	* erc-backend.el (erc-coding-system-for-target): Handle case where
-	target is nil.  Thanks to Kai Fan for the patch.
-
-2006-07-29  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-log-setup-logging): Don't offer to save the
-	buffer.  It will be saved automatically killed.  Thanks to Johan
-	Bockgård and Tassilo Horn for pointing this out.
-
-2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
-
-	* erc.el (define-erc-module): Make find-function and find-variable
-	find the names constructed by `define-erc-module' in Emacs 22.
-
-2006-07-14  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (log): Make sure that we enable logging on
-	already-opened buffers as well, in case the user toggles this
-	module after loading ERC.  Also be sure to remove logging ability
-	from all ERC buffers when the module is disabled.
-	(erc-log-setup-logging): Set buffer-file-name to nil rather than
-	the empty string.  This should fix some errors that occur when
-	quitting Emacs without first killing all ERC buffers.
-	(erc-log-disable-logging): New function that removes the logging
-	ability from the current buffer.
-
-	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
-
-2006-07-12  Michael Olson  <mwolson@gnu.org>
-
-	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
-	than call toggle-read-only.
-
-	* Makefile (debrelease-mwolson): Remove and consolidate with the
-	`debrelease' target.
-	(debrevision): Rename from `debrevision-mwolson'.
-
-	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
-	add autoload cookie.
-
-2006-07-09  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-version-string): Release ERC 5.1.3.
-
-	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
-
-	* servers.pl: Add copyright notice.
-
-	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
-	from being set automatically away and current buffer is not an ERC
-	buffer.
-
-	* erc-identd.el: Fix compiler error.
-
-	* erc.texi (Development): Use @subheading instead of @subsection.
-	(Advanced Usage): Add menu.
-	(Connecting): Fully document how to connect to an IRC server.
-	(Options, Tips and Tricks, Sample Configuration): New unwritten
-	sections.
-
-	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
-	(erc-user-full-name, erc-password): Docfixes and customization
-	interface tweaks.
-	(erc-try-new-nick-p): Rename from
-	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
-	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
-	of `erc-nick-uniquifier', in case someone wants multiple
-	characters.
-	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
-	(erc-compute-port): Docfixes.
-
-	* FOR-RELEASE: Put in future-first order.
-
-	* erc-log.el (log): Move all add-hook calls here, rather than
-	executing them immediately, and also cause them to be un-hooked
-	when the module is removed.
-	(erc-save-buffer-on-part): Move next to
-	`erc-save-queries-on-quit'.
-	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
-	(erc-log-write-after-send, erc-log-write-after-insert): Default to
-	nil.  This makes things fast, but reasonably failsafe, by default.
-
-2006-07-08  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
-	default, since most IRC clients don't do this.
-	(erc-log-write-after-send): New option that determines whether the
-	log file will be written to after every sent message.
-	(erc-log-write-after-insert): New option that determines whether
-	the log file will be written to when new text is added to a logged
-	ERC buffer.
-	(log): Use the aforementioned options.
-
-	* erc.texi (Modules): Document the "completion" module.
-
-	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
-	have a nil element in the list when ignore-self is non-nil.
-
-2006-07-05  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-modules): Use `set' instead of `set-default', since
-	this setting should never be buffer-local.  Add the `list' and
-	`page' modules to the list.
-
-	* erc.texi (Modules): Add entries for `list' and `page' modules.
-	Change "spell" to "spelling".
-	(History): Use past tense throughout.
-
-2006-07-02  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
-	can happen when doing /PART.
-
-	* erc.el (erc-quit-reason-various-alist)
-	(erc-part-reason-various-alist): In the example, use "^$" as an
-	example, since "" matches anything.
-	(erc-quit-reason-various, erc-part-reason-various): If no argument
-	is given, and no matches are found, use our default reason instead
-	of "nil".
-
-2006-07-01  Michael Olson  <mwolson@gnu.org>
-
-	* erc-identd.el (erc-identd-start): XEmacs defines neither
-	`make-network-process' nor `open-network-stream-server', so just
-	fail silently.
-
-2006-06-30  Michael Olson  <mwolson@gnu.org>
-
-	* HISTORY: Update.
-
-	* erc.texi (Modules): Mention identd.
-	(Releases): Update mailing list address and download location.
-	(Development): Refactor.  Provide updated directions for Arch.
-	Make URLs clickable.
-	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
-	(Getting Started): Give simpler example.  We do not need to
-	explicitly load every module.
-	(History): Update.
-
-	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
-	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
-	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
-	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
-	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
-	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
-	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
-	erc.el: Remove version strings.
-
-	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
-	module versions anymore.
-	(erc-version-modules): Remove, since we do not use this function
-	anymore.
-	(erc-latest-version, erc-ediff-latest-version): Remove, since this
-	was only useful back when ERC consisted of one file.
-	(erc-modules): Add line for identd.
-	(erc-get-channel-mode-from-keypress): Typo fix.
-
-	* erc-imenu.el: Remove unnecessary lines in header.
-
-	* erc-goodies.el (erc-handle-irc-url): Docfix.
-
-	* erc-identd.el: Define an ERC module for this.
-	(erc-identd-start): Don't create a process buffer if possible.
-	Otherwise, use conventional hidden names for process buffers.
-
-2006-06-29  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-coding-system-for-target): Match
-	case-insensitively.  Use a pattern match instead of `assoc', as
-	per the documentation for `erc-encoding-coding-alist'.
-
-	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
-
-2006-06-27  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el: Update maintainer information and URLs.
-
-2006-06-21  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (upload): Make this work with the GNU upload system.
-
-2006-06-14  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-active-buffer): If the active buffer has been
-	deleted, default to the server buffer.
-	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
-	control really toggle, not unconditionally turn off.
-
-2006-06-12  Michael Olson  <mwolson@gnu.org>
-
-	* NEWS: Add items since the 5.1.2 release.
-
-	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
-	indicates whether the current away status was caused by this
-	module.
-	(erc-autoaway-set-back): Only set back if this module set the user
-	away.
-	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
-	(erc-autoaway-reset-indicators): New function that resets some
-	indicators when the user is no longer away.
-	(autoaway): Add the above function to the 305 hook.
-
-2006-06-05  Romain Francoise  <romain@orebokech.com>
-
-	* erc.texi (History): Fix various typos.
-
-2006-06-04  Michael Olson  <mwolson@gnu.org>
-
-	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
-	definition of the autoaway module.
-	(autoaway): Don't do anything if erc-autoaway-idle-method is
-	unbound.  This prevents an error on startup.
-
-2006-06-03  Michael Olson  <mwolson@gnu.org>
-
-	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
-	(erc-autoaway-idle-method): Renamed from
-	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
-	how to do this, so it's best to make this take symbol values.
-	Improve documentation.  Remove warning against Emacs idle-time;
-	the point is moot now that we get user idle time via a different
-	method.  Make sure we disable and re-enable the module when
-	changing this value.
-	(autoaway): Conditionalize on the above option.  If using the idle
-	timer or user idle methods, don't add anything to the
-	send-completed or server-001 hooks, since it is unnecessary.
-	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
-	Docfix.
-	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
-	(erc-autoaway-reset-idle-irc): Renamed from
-	`erc-autoaway-reset-idle'.  Don't pass line to
-	`erc-autoaway-set-away', since it is not used.
-	(erc-autoaway-reset-idle-user): New function that resets the idle
-	state for user idle time.
-	(erc-autoaway-set-back): Remove line argument, since it is not
-	used.
-
-	* Makefile (upload): Make this work for Savannah uploads.
-
-	* AUTHORS: Update for Savannah move.  No old entries have been
-	removed, in case people have not registered yet on Savannah.
-
-2006-06-01  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-buffer-filter): Make sure all buffers returned from
-	this are live.
-
-2006-05-15  Michael Olson  <mwolson@gnu.org>
-
-	* README: Add License information.  Permit images to be used,
-	distributed, and modified without restriction.
-
-2006-05-01  Edward O'Connor  <ted@oconnor.cx>
-
-	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
-	a value for `url-irc-function'.
-
-2006-04-18  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
-	argument IGNORE-SELF.  If this is non-nil, don't return the user's
-	current nickname.  Doc fix.
-	(pcomplete/erc-mode/complete-command): Don't complete the current
-	nickname.
-
-2006-04-05  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
-	build date as it's shown in `emacs-version'.
-
-	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
-	with the same face property as the previous character.
-
-2006-04-02  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
-	erc.el: Make sure to include a newline inside of negated classes,
-	so that a newline is not matched.
-
-2006-04-01  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-server-connect-function): Don't try to
-	detect the existence of the `open-network-stream-nowait' function,
-	since I can't find it in Emacs21, XEmacs21, or Emacs22.
-
-2006-03-27  Michael Olson  <mwolson@gnu.org>
-
-	* erc.texi: Update direntry.  Remove unneeded local variables.
-
-2006-03-26  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-header-line): New face that will be used to colorize
-	the text of the header-line, provided that
-	`erc-header-line-face-method' is non-nil.
-	(erc-prompt-face): Fix formatting.
-	(erc-header-line-face-method): New option that determines the
-	method used for colorizing header-line text.  This may be a
-	function, nil, or non-nil.
-	(erc-update-mode-line-buffer): Use the aforementioned option and
-	face to colorize the header-line text, if that is what the user
-	wants.
-	(erc-send-input): If flood control is not activated, don't split
-	the input line.
-
-2006-03-25  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
-	that fixes the case where there is no leading whitespace.  Only
-	remove the first space character, though.
-
-	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
-	erc-identd-process is set properly.
-	(erc-identd-start, erc-identd-stop): Add autoload cookies.
-	(erc-identd-start): Pass :host parameter so this works with Emacs
-	22.
-
-2006-03-21  Michael Olson  <mwolson@gnu.org>
-
-	* CREDITS: Add Nelson Ferreira.  Change contact address.
-
-	* erc-bbdb.el: Install patch from Nelson Ferreira.
-	(erc-bbdb-electric-p): New option that indicates whether to make
-	the BBDB buffer electric.  Defaults to "not electric".
-	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
-
-2006-03-09  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el (erc-button-keymap): Use <backtab> rather than
-	<C-tab> for `erc-button-previous' as it is a more standard key
-	binding for this type of function.
-
-2006-02-28  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-capab.el: Removed things that were accidentally committed on
-	2006-02-20.  Removed Todo section.
-	(erc-capab-unidentified): Removed.
-
-2006-02-26  Michael Olson  <mwolson@gnu.org>
-
-	* erc-capab.el: Use (eval-when-compile (require 'cl)).
-	(erc-capab-unidentified): Fix compiler warning by specifying
-	group.
-
-2006-02-20  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
-	to explain thoughts better.  `erc-server-parameters' is an
-	associated list when it's set, not a string.
-
-2006-02-19  Michael Olson  <mwolson@gnu.org>
-
-	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
-	parameters are strings before using them.  Thanks to Alejandro
-	Benitez for the report.
-
-	* erc.el (erc-version-string): Release ERC 5.1.2.
-
-2006-02-19  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
-	<C-tab>.
-	(erc-button-previous): New function.
-
-2006-02-15  Michael Olson  <mwolson@gnu.org>
-
-	* NEWS: Add category for ERC 5.2.
-
-	* erc.el (erc): Move to the end of the buffer when a continued
-	session is detected.  Thanks to e1f and indio for the report and
-	testing a potential fix.
-
-2006-02-14  Michael Olson  <mwolson@gnu.org>
-
-	* debian/changelog: Prepare a new Debian package.
-
-	* Makefile (debprepare): New rule that creates an ERC snapshot
-	directory for use in both new Debian releases and revisions for
-	Debian packages.
-	(debrelease, debrevision-mwolson): Use debprepare.
-
-	* NEWS: Bring up-to-date.
-
-	* erc-stamp.el (erc-insert-timestamp-right): For now, put
-	timestamps before rather than after erc-fill-column when
-	erc-timestamp-right-column is nil.  This way we won't surprise
-	anyone unpleasantly, or so it is hoped.
-
-2006-02-13  Michael Olson  <mwolson@gnu.org>
-
-	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
-
-2006-02-12  Michael Olson  <mwolson@gnu.org>
-
-	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
-	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
-	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
-	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
-	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
-	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
-	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
-	Add 2006 to copyright years, to comply with the changed guidelines.
-
-2006-02-11  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-update-modules): Handle erc-capab-identify
-	correctly.  Make some requirements shorter, so that it's easier to
-	see why they are needed.
-
-	* erc-capab.el: Add autoload cookie for capab-identify.
-	(erc-capab-send-identify-messages, erc-capab-identify-activate):
-	Minor whitespace fix in code.
-
-	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
-	`erc-timestamp-right-align-by-pixel'.  Set the default based on
-	whether we are in Emacs 22, and using X.  Improve documentation.
-	(erc-insert-aligned): Remove calculation of offset, since
-	:align-to pos works after all.  Unlike the previous solution, this
-	one works when erc-stamp.el is compiled.
-	(erc-insert-timestamp-right): Don't add length of string, and then
-	later remove its displayed width.  This puts timestamps after
-	erc-fill-column when erc-timestamp-right-column is nil, rather
-	than before it.  It also fixes a subtle bug.  Remove use of
-	`current-window', since there is no variable by that name in
-	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
-	`erc-fill-column' is non-nil before using it.
-
-2006-02-11  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-list.el: Define `list' module which sets the alias
-	`erc-cmd-LIST' to `erc-list-channels' when enabled and
-	`erc-list-channels-simple' when disabled.
-	(erc-list-channels): Was `erc-cmd-LIST', renamed.
-	(erc-list-channels-simple): New function.
-
-	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
-	`capab-identify' description.  Moved customization options left in
-	source code.
-
-	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
-
-	* erc-capab.el: Put a little more detail into Usage section.
-	(define-erc-module): Run `erc-capab-identify-setup' in all open
-	server buffers when enabling.
-	(erc-capab-identify-setup): Make PROC and PARSED optional
-	arguments.
-	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
-	should now also match nicknames that are formatted differently
-	than the default.
-
-	* erc-spelling.el (define-erc-module): Make sure there's a buffer
-	before calling `with-current-buffer'.
-
-2006-02-10  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (debbuild): Split from debrelease.
-	(debrevision-mwolson): New rule that causes a Debian revision to
-	be built.
-
-	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
-	Johan Bockgård.
-	(erc-modules): Change use of 'pcomplete to 'completion.
-
-2006-02-09  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-capab.el: Require erc.
-	(erc-capab-send-identify-messages): Use `erc-server-send'.
-	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
-	the flags so we can also check whether the `erc-identified' text
-	property is there at all.
-	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
-	This fixes a bug where the prefix wasn't inserted when timestamps
-	are inserted on the right.  Tweaked nickname regexp.
-	(erc-capab-find-parsed): New function.
-	(erc-capab-get-unidentified-nickname): Updated to check for 0
-	flag.  Only get nickname if there's a nickuserhost associated with
-	this message.
-
-	* erc-capab.el: New file.  Adds the new module
-	`erc-capab-identify', which allows flagging of unidentified users
-	on servers running an ircd based on dancer - irc.freenode.net, for
-	example.
-
-	* erc.el (erc-modules): Added `capab-identify' to options.
-	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
-	(erc-get-parsed-vector-type): Moved here from erc-match.el.
-	(erc-version-string): Remove "(CVS)".
-	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
-	connections work as expected.  Connecting with `open-tls-stream'
-	only seems to work (if at all?) when using the tls.el located in
-	lisp/net/ in Emacs22.
-
-	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
-	(erc-get-parsed-vector-type): Moved these functions to erc.el
-	since they can be useful outside of the text matching module.
-
-	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
-	erc-services.el since the file name has changed.
-
-	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
-
-	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
-	to "ERC".
-
-2006-02-07  Michael Olson  <mwolson@gnu.org>
-
-	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
-	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
-	the filenames in DOS.
-
-	* erc-goodies.el: Comment fix.
-
-	* erc-hecomplete.el: Rename from erc-complete.el.  Update
-	commentary.  Use define-erc-module so that it's possible to
-	actually use this.
-	(erc-hecomplete): Rename function from `erc-complete'.
-	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
-
-	* erc-join.el: Rename from erc-autojoin.el.
-
-	* erc-networks.el: Rename from erc-nets.el.
-
-	* erc-services.el: Rename from erc-nickserv.el.
-
-	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
-	the simpler `indent-to' function when
-	`erc-timestamp-right-align-by-pixel' is nil.
-	(erc-insert-timestamp-right): If the timestamp goes on the
-	following line, don't add timestamp properties to the spaces in
-	front of it.
-
-	* erc.el (erc-migrate-modules): New function that eases migration
-	of module names.
-	(erc-modules): Call erc-migrate-modules in the :get accessor.
-	(erc-modules, erc-update-modules): Update for new modules names.
-
-2006-02-05  Diane Murray  <disumu@x3y2z1.net>
-
-	* FOR-RELEASE: Added two things to do before the next release of
-	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
-	the `C-c C-SPC' and `C-c C-@' global keybindings.
-
-2006-02-05  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
-	directory correctly.
-
-	* debian/changelog: Update for 5.1.1 release.
-
-	* debian/control (Suggests): Suggest emacs-chess instead of
-	Recommending it.  Thanks to Era Eriksson for the report.
-
-	* debian/maint/postinst: Install the Info documentation.
-
-	* debian/maint/prerm: Handle removing of Info documentation.
-
-	* debian/rules (configure, configure-stamp, build, build-stamp):
-	Generate HTML and Info documentation.
-	(binary-erc): Install HTML and Info documentation.
-
-	* erc-spelling.el (erc-spelling-init): If
-	`erc-spelling-dictionaries' is nil, do not set
-	ispell-local-dictionary.  Before, it was being set to nil, which
-	was causing a long delay while the ispell process restarted.
-	(erc-spelling-unhighlight-word): New function that removes
-	flyspell properties from a spell-checked word.
-	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
-	that have '/' before them.
-
-2006-02-04  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (VERSION): Update to 5.1.1.
-
-	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
-	that Emacs does in its NEWS file.
-
-	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
-
-	* erc-complete.el (erc-nick-completion-exclude-myself)
-	(erc-try-complete-nick): Use better function for getting list of
-	channel users.
-
-	* erc-goodies.el: Docfix.
-
-	* erc-stamp.el: Use new arch tagline, since the other one wasn't
-	being treated properly.
-
-	* erc.texi (History): Note that ERC is now included with Emacs.
-
-	* erc.el (erc-version-string): Release ERC 5.1.1.
-
-2006-01-31  Michael Olson  <mwolson@gnu.org>
-
-	* erc-stamp.el: Update copyright years.
-
-2006-01-30  Simon Josefsson  <jas@extundo.com>
-
-	* erc.el (erc-open-ssl-stream): Use tls.el.
-
-2006-01-30  Michael Olson  <mwolson@gnu.org>
-
-	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
-	that determines whether to use pixel values to align right
-	timestamps.  The default is not to do so, since it only works with
-	Emacs22 on X, and even then some people have trouble.
-	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
-
-2006-01-29  Edward O'Connor  <ted@oconnor.cx>
-
-	* erc-viper.el: Ensure we only alter Viper's configuration when
-	necessary, as Viper may already take ERC into account.
-
-2006-01-29  Michael Olson  <mwolson@gnu.org>
-
-	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
-	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
-	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
-
-	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
-	variable.
-	(erc-speedbar-goto-buffer): Fix compiler warning.
-
-	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
-	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
-	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
-	work without compiler warnings.
-
-	* man/erc.texi (Obtaining ERC, Installation): Note that these
-	sections may be skipped if using the version of ERC that comes
-	with Emacs.
-
-2006-01-28  Michael Olson  <mwolson@gnu.org>
-
-	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
-	guidelines.
-
-	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
-	the Emacs copyright statement.  Refer to ourselves as ERC rather
-	than "Emacs IRC Client", since there are now several IRC clients
-	for Emacs.
-
-	* erc-compat.el (erc-emacs-build-time): Define as a variable.
-
-	* erc-ibuffer.el: Require 'erc.
-
-	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
-	it exists.
-
-	* erc-stamp.el (erc-insert-aligned): Only use the special text
-	property when window-system is X.
-
-	* erc.texi (History): Note that ERC 5.1 is released.
-
-2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
-
-	* erc.el (erc-format-message): More `cl' breakage; don't use
-	`oddp'.
-
-2006-01-27  Michael Olson  <mwolson@gnu.org>
-
-	* debian/changelog: Update for new release.
-
-	* debian/control (Description): Update.
-
-	* debian/rules: Concatenate ChangeLog for 2005.
-
-	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
-	(debrelease, release): Copy images directory.
-
-	* NEWS: Spelling fixes.  Add items for recent changes.
-
-	* erc.el (erc): Move call to erc-update-modules before the call to
-	erc-mode.  This should fix a timestamp display issue.
-	(erc-version-string): Release ERC 5.1.
-
-2006-01-26  Michael Olson  <mwolson@gnu.org>
-
-	* erc-stamp.el (erc-insert-aligned): New function that inserts
-	text in an perfectly-aligned way relative to the right margin.  It
-	only works well with Emacs22.  A sane fallback is provided for
-	other versions of Emacs.
-	(erc-insert-timestamp-right): Use the new function.
-
-2006-01-25  Edward O'Connor  <ted@oconnor.cx>
-
-	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
-	before `erc-match-mode'.
-
-	* erc-match.el (match): Append `erc-match-message' to
-	`erc-insert-modify-hook'.
-
-2006-01-25  Michael Olson  <mwolson@gnu.org>
-
-	* FOR-RELEASE: Mark last release requirement as done.
-
-	* Makefile (realclean, distclean): Remove docs.
-
-	* erc.texi: Take care of all pre-5.1 items.
-
-	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
-	`process-send-string' in `condition-case' to avoid an error when
-	quitting ERC.
-
-	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
-	variable-width characters in the timestamp and on the same line.
-	The latter is a kludge, but it seems to work with most of the
-	input I've thrown at it so far.  It's certainly better than going
-	past the end of line consistently when we have variable-width
-	characters on the same line.  When `erc-timestamp-intangible' is
-	non-nil, add intangible properties to the whitespace as well, so
-	that hitting <end> does what you'd expect.
-
-	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
-	this to only use boolean values for `erc-flood-protect'.  Update
-	documentation.
-	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
-	that any QUIT-related messages go there.
-	(erc): Try to be more clever about re-using channel buffers when
-	automatically re-connecting.  Thanks to e1f for noticing.
-
-2006-01-23  Michael Olson  <mwolson@gnu.org>
-
-	* ChangeLog.2005: Remove erroneous line.
-
-	* FOR-RELEASE: Make that the Makefile tweaking is complete.
-	(NEWS): Mark as done.
-
-	* Makefile (MANUAL): New option indicating the name of the manual.
-	(PREFIX, ELISPDIR, INFODIR): New options that specify the
-	directories to install lisp code and info manuals to.  PREFIX is
-	used only by ELISPDIR and INFODIR.
-	(all): Call `lisp' and create the manual.
-	(lisp): Compile lisp code.
-	(%.info, %.html): New rules that make Info files and HTML files,
-	respectively, from a TexInfo source.
-	(doc): Create both the Info and HTML versions of the manual.  This
-	is for the user -- we never call it automatically.
-	(install-info): Install Info files.
-	(install-bin): Install compiled and source Lisp files.
-	(todo): Remove, since it seems pointless.
-
-	* NEWS: Update.
-
-	* README: Add Installation instructions.  Tweak layout.
-
-	* erc.texi: Work on some pre-5.1 items.
-
-	* erc-stamp.el, erc-track.el: Move some functions and options in
-	order to get rid of a few compiler warnings.
-
-	* erc.el (erc-modules): Enable readonly by default.  This will
-	prevent new users from accidentally removing old messages, which
-	could be disconcerting.  Also enable stamp by default, since
-	timestamps are a fairly standard feature among IRC clients.
-
-	* erc-button.el: Munge whitespace.
-
-	* erc-identd.el (erc-identd-start): Instead of throwing an error,
-	just try to use the obsolete function.
-
-2006-01-22  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-decode-string-from-target): Make sure that
-	we have a string as an argument.  If not, coerce it to the empty
-	string.  Hopefully, this will work painlessly around an edge case
-	related to quitting ERC around the same time a message comes in.
-
-2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
-
-	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
-	`case').  Doc fixes.
-	(erc-find-parsed-property): Simplify.
-	(erc-track-get-active-buffer): Fix logic.  Simplify.
-	(erc-track-switch-buffer): Remove unused variable `dir'.  Simplify.
-
-	* erc-speak.el: Doc fixes.
-	(erc-speak-region): `propertize' --> `erc-propertize'.
-
-	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
-	`erc-propertize'.
-
-	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
-	account when wrapping URLs.
-
-	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
-
-	* erc-backend.el (define-erc-response-handler): Doc fix.
-
-2006-01-22  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-update-modules): Use `require' instead of `load',
-	but prevent it from causing errors, in order to preserve the
-	previous behavior.
-
-2006-01-21  Michael Olson  <mwolson@gnu.org>
-
-	* FOR-RELEASE (Source): Mark cl task as done.
-
-	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
-	generate-autoloads.
-	(erc-auto.el, %.elc): Don't show command, just its output.
-
-	* NEWS: Add items from 2005-01-01 to 2005-08-13.
-
-	* debian/copyright (Copyright): Update.
-
-	* erc-auto.in (erc-generate-autoloads): Rename from
-	generate-autoloads.
-
-	* erc.el, erc-autoaway.el, erc-backend.el: Use
-	erc-server-process-alive instead of erc-process-alive.
-
-	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
-	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
-	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
-	Use (eval-when-compile (require 'cl)), so that compilation doesn't
-	fail.
-
-	* erc-fill.el, erc-truncate.el: Whitespace munging.
-
-	* erc.el: Update copyright notice.  Remove eval-after-load code.
-	(erc-with-buffer): Docfix.
-	(erc-once-with-server-event, erc-once-with-server-event-global)
-	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
-	instead of gensym.
-	(erc-banlist-update): Use erc-delete-if instead of delete-if.
-	(erc): Call `erc-update-modules' here.
-
-	* erc-backend.el: Require 'erc-compat to minimize compiler
-	warnings.
-	(erc-decode-parsed-server-response): Docfix.
-	(erc-server-process-alive): Move here from erc.el and rename from
-	`erc-process-alive'.
-	(erc-server-send, erc-remove-channel-users): Make sure process is
-	alive before sending data to it.
-
-	* erc-bbdb.el: Update copyright years.
-	(erc-bbdb-whois): Remove overexuberant comment.
-
-	* erc-button.el: Require erc-fill, since we make liberal use of
-	`erc-fill-column'.
-
-	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
-	functions, the latter of which provides an `assert' equivalent.
-	(erc-remove-if-not): New function that provides a simple
-	implementation of `remove-if-not'.
-	(erc-gensym): New function that provides a simple implementation
-	of `gensym'.
-	(erc-delete-if): New function that provides a simple
-	implementation of `delete-if'.
-	(erc-member-if): New function that provides a simple
-	implementation of `member-if'.
-	(field-end): Remove this, since it is unused, and later versions
-	of XEmacs have this function already.
-	(erc-function-arglist): Moved here from erc.el.
-	(erc-delete-dups): New compatibility function for dealing with
-	XEmacs.
-	(erc-subseq): New function copied from cl-extra.el.
-
-	* erc-dcc.el: Require pcomplete during compilation to avoid
-	compiler warnings.
-	(erc-unpack-int, erc-dcc-send-filter)
-	(erc-dcc-get-filter): Use erc-assert instead of assert.
-	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
-	remove-if-not.
-
-	* erc-match.el (erc-log-matches): Fix compiler warning.
-
-	* erc-nicklist.el: Update copyright notice.
-	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
-	(erc-nicklist-bitlbee-connected-p): Remove.
-	(erc-nicklist-insert-medium-name-or-icon): Accept channel
-	argument.  Use it to determine whether we are on bitlbee.  Now
-	that bitlbee names its channel "&bitlbee", this is trivial.
-	(erc-nicklist-insert-contents): Pass channel as specified above.
-	Don't try to determine whether we are on bitlbee here.
-	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
-	of remove-if-not.
-	(erc-nicklist-search-for-nick): Use erc-member-if instead of
-	member-if.
-
-	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
-	partially-evaluated lambda expression instead of `delete' and
-	`find'.
-
-	* erc-track.el: Use erc-assert.
-	(erc-track-modified-channels): Remove use of `return'.
-	(erc-track-modified-channels): Use `cadr' instead of `second',
-	since otherwise we would need yet another eval-when-compile line.
-
-2006-01-19  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
-	detect SIGPIPE, since it doesn't work.
-
-2006-01-10  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-spelling.el: Updated copyright years.
-	(define-erc-module): Enable/disable `flyspell-mode' for all open
-	ERC buffers as well.
-	(erc-spelling-dictionaries): Reworded customize description.
-
-	* erc.el (erc-command-symbol): New function.
-	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
-	fixes a bug where "Symbol's function definition is void:
-	erc-cmd-LIST" would be shown after typing /list at the prompt (the
-	command was interned because erc-menu.el uses it and is enabled by
-	default whereas erc-list.el is not).
-
-	* NEWS: Started a list of renamed variables.
-
-	* erc.el: Reworded the message sent when defining variable
-	aliases.
-	(erc-command-indicator-face): Doc fix.
-	(erc-modules): Enable the match module by default which makes
-	current nickname highlighting on as the default.
-
-	* erc-button.el: Updated copyright years.
-	(erc-button): New face.
-	(erc-button-face): Use `erc-button'.
-	(erc-button-nickname-face): New customizable variable.
-	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
-	new argument to `erc-button-add-button'.
-	(erc-button-add-button): Doc fix.  Added new argument to function
-	definition, NICK-P.  If it's a nickname, use
-	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
-	makes channel tracking and buttons work better together when
-	`erc-button-buttonize-nicks' is enabled, since there is a nickname
-	on just about every line.
-
-	* erc-track.el (erc-track-use-faces): Doc fix.
-	(erc-track-faces-priority-list): Added `erc-button' to list.
-	(erc-track-priority-faces-only): Doc fix.
-
-2006-01-09  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el (erc-button-url-regexp): Use `concat' so the
-	regexp is not one long line.
-	(erc-button-alist): Fixed so that customizing works correctly.
-	Reorganized.  Removed lambda functions with more than two lines.
-	Doc fix.
-	(erc-button-describe-symbol, erc-button-beats-to-time): New
-	functions.  Moved from `erc-button-alist'.
-
-2006-01-07  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
-	process if a SIGPIPE occurs.  This happens when a new message
-	comes in at the same time a /quit is requested.
-	(erc-process-sentinel): Use string-match rather than string= to do
-	these comparisons.  Matching literal newlines makes me nervous.
-
-	* erc-track.el (erc-track-remove-from-mode-line): Handle case
-	where global-mode-string is not a list.  Emacs22 permits this.
-
-
-See ChangeLog.05 for earlier changes.
-
-    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
@@ -1697,4 +202,4 @@ See ChangeLog.05 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
+;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496
diff --git a/ChangeLog.06 b/ChangeLog.06
new file mode 100644
index 0000000..cb949c9
--- /dev/null
+++ b/ChangeLog.06
@@ -0,0 +1,1508 @@
+2006-12-28  Michael Olson  <mwolson@gnu.org>
+
+	* erc-list.el: Change header to mention that this is part of ERC,
+	rather than GNU Emacs.
+
+	* erc-networks.el (erc-server-alist): Add Ars OpenIRC and
+	LinuxChix networks.  Thanks to Angelina Carlton for mentioning
+	them.  Properly escape periods in Konfido.Net and Kewl.Org.
+	(erc-networks-alist): Add entries for Ars and LinuxChix, though
+	the latter does not actually provide an announced network name.
+
+	* erc-services.el (erc-nickserv-identify-mode): Add 'both method,
+	which waits for a NickServ message if the network supports it,
+	otherwise sends the password after connecting.
+	(erc-nickserv-identify-mode): Default to 'both.
+	(erc-nickserv-passwords): Add OFTC and Azzurra to custom options.
+	(erc-nickserv-alist): Indentation fix.
+	(erc-nickserv-identify-on-connect)
+	(erc-nickserv-identify-on-nick-change): Handle 'both method.
+
+2006-12-28  Leo  <sdl.web@gmail.com>  (tiny change)
+
+	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
+	hitting C-g does not leave iswitchb-mode on.
+
+2006-12-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-cmd-RECONNECT): New command that calls
+	erc-server-reconnect.
+
+	* erc-backend.el (erc-server-reconnect-count): New server variable
+	that keeps track of reconnection attempts.
+	(erc-server-reconnect-attempts): New option that determines the
+	number of reconnection attempts that ERC will make per server.
+	(erc-server-reconnect-timeout): New option that determines the
+	amount of time, in seconds, that ERC will wait between successive
+	reconnect attempts.
+	(erc-server-reconnect): New function that reestablishes the
+	current IRC connection.  Move some commands from
+	erc-process-sentinel-1 here.
+	(erc-process-sentinel-1): If we have been disconnected, loop until
+	we either reconnect or run out of attempts.
+	(erc-server-reconnect-p): Move higher and make this a defsubst,
+	since I'm worried about the current buffer changing from
+	underneath us.  Implement limit of number of reconnect attempts..
+
+	* erc.texi (Getting Started): Update for /RECONNECT command.
+
+2006-12-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-open): Restore old point correctly, or at least get
+	closer to doing so than before.
+
+2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
+
+	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
+	isn't active already, instead of leaving it on.
+
+2006-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc-ezbounce.el (erc-ezb-init-session-list): Doc fix.
+
+2006-12-08  Michael Olson  <mwolson@gnu.org>
+
+	* CREDITS: Add Juanma Barranquero.
+
+	* erc.el: Re-evaluate contributions from a contributor, and found
+	them under 15 lines of non-obvious code, so it is safe to remove
+	the copyright notice.
+
+2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
+	(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook)
+	(erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer)
+	(erc-modules, erc-display-message-highlight, erc-process-input-line)
+	(erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers)
+	(erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers)
+	(erc-echo-notice-in-first-user-buffer, erc-connection-established)
+	(erc-update-user-nick, erc-update-channel-member, erc-highlight-notice)
+	(erc-command-symbol, erc-add-query, erc-process-script-line)
+	(erc-determine-parameters, erc-client-info, erc-popup-input-buffer):
+	(erc-script-echo): Fix typos in docstrings.
+	(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list)
+	(define-erc-module, erc-once-with-server-event)
+	(erc-once-with-server-event-global, erc-debug-irc-protocol)
+	(erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user)
+	(erc-update-current-channel-member, erc-load-script):
+	(erc-mode-line-away-status-format): Doc fixes.
+
+2006-11-20  Andrea Russo  <rastandy@inventati.org>  (tiny change)
+
+	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
+	before calling `erc-display-prompt'.
+
+2006-11-20  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-update-modules): Display better error message when
+	module not found.
+
+2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc.el (erc-after-connect, erc-open-ssl-stream)
+	(erc-display-line-1, erc-display-line):
+	* erc-backend.el (005): Fix space/tab mixup in docstrings.
+
+2006-11-12  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el: Save all log buffers when Emacs exits, in case
+	someone ignores the warning about open processes.  Remove the
+	advice code in the commentary.
+	(erc-save-query-buffers): Docfix.
+	(erc-log-save-all-buffers): New function that saves all ERC
+	buffers to logs.
+	(erc-current-logfile): Fix bug in filename selection, where the
+	current buffer was erroneously being preferred over the given
+	buffer.
+
+2006-11-08  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-string-to-port): Avoid error when a numerical port
+	is passed.  Thanks to Zekeriya KOÇ for the report.
+
+2006-11-08  Łukasz Demianiuk  <ldemianiuk@gmail.com>  (tiny change)
+
+	* erc.el (erc-header-line): Fix typo.
+
+2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
+
+	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
+
+	* erc.el (read-passwd):
+	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
+	* erc-truncate.el (truncate): Fix typo in docstring.
+
+2006-10-21  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
+	first loading iswitchb.  Thanks to Leo for the report.
+
+2006-10-10  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-default-port): Make the default be 6667 instead of
+	ircd. since Mac OS X apparently has problems with looking up that
+	port name.
+
+	* erc-backend.el (353): Receive names after displaying the initial
+	message, instead of before.
+
+2006-10-05  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-my-nick-face): New face.
+	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
+	fixes a bug where the :full-name argument passed to the function
+	was not respected.
+	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
+	make it easier to find messages you sent in conversations when
+	`erc-show-my-nick' is non-nil.
+	(erc-compute-server): Doc fix.
+
+2006-10-01  John J Foerch  <jjfoerch@earthlink.net>  (tiny change)
+
+	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
+	from the erc-timestamp field.
+
+2006-09-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
+	parenthesis.  Thanks to Stephan Stahl for the report.
+
+2006-09-10  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
+
+	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
+	instead of a single user.
+
+2006-09-10  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-generate-new-buffer-name): If this is a server
+	buffer and a process exists already, create a new buffer.
+	(erc-open): If the IRC session was continued, restore the old
+	point.  Thanks to Stephan Stahl for the report.
+	(erc-member-ignore-case): Coding style tweak.
+	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
+	find the user listed verbatim, try to match them against the list
+	using string-match.  In this case, prompt as to whether the regexp
+	should be removed.
+	(erc-ignored-user-p): Remove CL-ism.
+
+	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
+	whether we are already away.
+
+	* erc-menu.el: Fix potential compiler warning.
+
+2006-09-07  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el: Updated Commentary and URL.
+	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
+	(erc-arrange-session-in-multiple-windows): No need to check if
+	`erc-server-process' is bound.
+	(erc-server-buffer-live-p): Doc fix.
+	(erc-part-from-channel): Don't use any initial contents at prompt.
+	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
+	(s367): Fixed to support only banmask and channel which is the
+	standard.  Also, there's no reason to add a message to each banned
+	user entry trying to persuade the user to use /banlist instead of
+	/mode #channel +b.  That part of the message was a little
+	confusing, anyways.
+	(s367-set-by): New catalog entry.  The user who set the ban and
+	the time of ban seem to be specific to only certain servers such
+	as freenode.
+
+	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
+
+	* erc-backend.el (erc-server-process-alive): No need to check if
+	`erc-server-process' is bound.
+	(367): Use s367 or s367-set-by where appropriate.
+
+	* erc-compat.el: Fixed URL.
+
+	* erc-dcc.el: Updated copyright years.  Added Usage section.
+	Changed supported Emacs version number from 21.3.50 to 22 in
+	Commentary.
+
+	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
+	to check if `erc-server-process' is bound.
+
+	* erc-nicklist.el: Added to the Commentary section an explanation
+	that `erc-nicklist-quit' should be called from within the nicklist
+	buffer.  Set file coding to utf-8 so a contributor's name is
+	displayed correctly.
+	(erc-nicklist-icons-directory): Use customize type directory
+	instead of string.
+	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
+	if it wasn't found.  This fixes a bug where an error would occur
+	when using `string=' on bbdb-nick if it was nil.
+
+	* erc-replace.el: Removed URL from file information since it
+	doesn't exist.
+
+	* erc-sound.el: Updated copyright years.  Fixed Commentary and
+	added Usage section.
+	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
+	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
+	definitions.
+	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
+	(erc-ctcp-query-SOUND): Doc fix.
+	(erc-play-command): Removed, not necessary anymore.
+	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
+	higher in code, added docstring.
+	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
+	as well since version 21 or earlier.  Removed commented-out older
+	version of function.
+
+	* NEWS: Fixed formatting, added channel tracking change.
+
+	* README: Fixed typo.  Added more information to Installation
+	section.  Updated URL.
+
+2006-09-03  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el: M-x erc RET can now be used to start ERC.
+	(erc-open): Renamed from `erc'.
+	(erc-before-connect): Change erc-select to erc.
+	(erc): Renamed from `erc-select'.  Use `erc-open'.
+	(erc-select): Defined as alias of `erc'.
+	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
+	(erc-select-ssl): Defined as alias of `erc-ssl'.
+	(erc-cmd-SERVER): Use `erc'.
+	(erc-query, erc-handle-irc-url): Use `erc-open'.
+
+	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
+
+	* erc-menu.el (erc-menu-definition): Use `erc'.
+
+	* erc-networks.el: Updated copyright years.
+	(erc-server-select): Use keyword arguments when calling `erc'.
+
+	* erc.texi (Getting Started, Connecting): Changed erc-select to
+	erc.
+
+	* README: Changed erc-select to erc.
+
+	* NEWS: Added note about these changes.
+
+	* FOR-RELEASE: Marked this item as done.
+
+2006-08-21  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
+	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
+	properties to channel name.
+
+2006-08-20  Michael Olson  <mwolson@gnu.org>
+
+	* erc-identd.el (erc-identd): New customization group.
+	(erc-identd-port): New option that specifies the port to use if
+	none is given as an argument to erc-identd-start.
+	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
+	instead of erc-identd-start so that we deal with the different
+	meaning of the first argument.
+	(erc-identd-start): Use erc-identd-port.
+	(erc-identd-quickstart): New function that ignores any arguments
+	and calls erc-identd-start.
+
+	* erc.el (erc-with-server-buffer): New macro that switches to the
+	current ERC server buffer and runs some code.  If no server buffer
+	is available, return nil.  This is a useful way to access
+	variables in the server buffer.
+	(erc-get-server-user, erc-add-server-user)
+	(erc-remove-server-user, erc-change-user-nickname)
+	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
+	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
+	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
+	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
+	(erc-format-channel-modes): Use it.
+	(erc-once-with-server-event, erc-once-with-server-event-global)
+	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
+	instead of gensym.
+	(erc-open-server-buffer-p): New function that returns non-nil if
+	the given buffer is an ERC server buffer that has an open IRC
+	process.
+	(erc-with-buffer): Use buffer-live-p here to set a good example,
+	though it isn't really needed here.
+	(erc-away): Mention erc-away-time.
+	(erc): Don't propagate the erc-away setting, since it makes more
+	sense to access it from the server buffer.  Set up the prompt
+	before connecting rather than after.  Run erc-connect-pre-hook
+	with the buffer as an argument, instead of no arguments.
+	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
+	erc-server-buffer-p so that only open connections are set away.
+	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
+	(erc-process-away): Docfix.  Don't set erc-away in channel
+	buffers.
+	(erc-set-current-nick): Make this uniform with the style used in
+	erc-current-nick.
+	(erc-away-time): Rename from erc-away-p, since this is no longer a
+	boolean-style predicate.
+	(erc-format-away-status): Use it.
+	(erc-initialize-log-marker): Accept a `buffer' argument.
+	(erc-connect-pre-hook): Docfix.
+	(erc-connection-established): Make sure this runs in the correct
+	buffer.
+	(erc-set-initial-user-mode): Accept a `buffer' argument.
+
+	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
+
+	* erc-spelling.el (erc-spelling-init): Use
+	erc-with-server-buffer.  Accept `buffer' argument.
+	(spelling): Call erc-spelling-init with the `buffer' argument.
+
+	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
+
+	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
+	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
+
+	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
+	erc-with-server-buffer.
+
+	* erc-networks.el (erc-network, erc-current-network)
+	(erc-network-name): Use erc-with-server-buffer.
+
+	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
+
+	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
+	erc-away-time.
+
+	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
+	Pass `buffer' argument to erc-log-setup-logging instead of setting
+	the current buffer.  Ditto for erc-log-disable-logging.
+	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
+	argument.
+
+	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
+
+	* erc-ibuffer.el (erc-away): Use erc-away-time.
+
+	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
+	read only instead of permanently doing so.
+
+	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
+	Emacs Lisp has make-symbol, which is better.
+
+	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
+	erc-with-server-buffer.
+
+	* erc-capab.el (capab-identify): Only deal with server buffers
+	that have an open IRC process.
+	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
+
+	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
+	`erc-server-process-alive' function.
+	(erc-coding-system-for-target): Supply a default target if one is
+	not given.
+	(erc-server-send): Simplify slightly.
+	(erc-call-hooks): Use erc-with-server-buffer.
+	(erc-server-connect, erc-server-setup-periodical-ping): Accept
+	`buffer' argument.
+
+	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
+	higher to avoid an automatic load snafu.
+	(erc-autoaway-some-server-buffer): New function that returns an
+	ERC server buffer with a live connection, or nil otherwise.
+	(erc-autoaway-insinuate-maybe): New function that adds the
+	autoaway reset function to post-command-hook if at least one ERC
+	process is alive.
+	(erc-autoaway-remove-maybe): New function that removes the
+	autoaway reset function from post-command-hook if no ERC process
+	is alive.
+	(autoaway): Don't touch post-command-hook unless an IRC process is
+	already open.  Remove our addition to post-command-hook as soon as
+	there are no more IRC processes open.  Reset the indicators before
+	connecting to an IRC server, which fixes a bug when re-connecting.
+	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
+	there are no more IRC processes open.
+	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
+	argument which is a function call if we can't find one.
+	(erc-autoaway-some-open-server-buffer): New function which returns
+	an ERC server buffer with an open connection and a user that is
+	not away.
+	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
+	(erc-autoaway-set-away): Accept a `notest' argument which is used
+	to avoid testing the same thing twice.
+	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
+	higher in file to fix byte-compile warning.
+
+2006-08-20  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
+	`erc-server-reconnect-p' check all condition cases.
+	(erc-server-reconnect-p): Moved rest of checks from
+	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
+
+2006-08-14  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
+	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
+	avoid confusion with rcirc and other clients.
+
+	* erc-backend.el (erc-server-banned): New variable.
+	(erc-server-connect): Set `erc-server-banned' to nil.
+	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
+	(erc-server-reconnect-p): New function.  Return non-nil if the
+	user wants automatic reconnects and if the user has not been
+	banned from the server.  This should fix a bug where ERC gets into
+	a loop trying to reconnect with no way to stop it when the user is
+	denied access to the server due to a server ban.  It might also
+	help when Tor users are blocked from freenode if freenode servers
+	send the 465 message before disconnecting.
+	(465): Handle "banned from server" error notices.
+
+2006-08-13  Romain Francoise  <romain@orebokech.com>
+
+	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
+	prompt with a space.
+
+2006-08-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-timed-out): New variable that
+	indicates whether the current connection has timed out due to
+	failure to respond to a ping.
+	(erc-server-send-ping): Set erc-server-timed-out to t.
+	(erc-server-connect): Initialize erc-server-timed-out to nil.
+	(erc-process-sentinel-1): Consult erc-server-timed-out.
+
+2006-08-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
+	avoid errors when inserting disconnect messages and other messages
+	that begin with newlines.
+
+2006-08-07  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
+	in several places instead of inserting text.
+	(erc-process-sentinel): Move to the input-marker before removing
+	the prompt.
+
+	* erc.el (erc-port): Fix customization options.
+	(erc-display-message): Handle null type explicitly.  Previously,
+	this was relying on a chance side-effect.  Cosmetic indentation
+	tweak.
+	(english): Add 'finished and 'terminated entries to the catalog.
+	Add initial and terminal newlines to 'disconnected and
+	'disconnected-noreconnect entries.  Avoid long lines.
+	(erc-cmd-QUIT): Bind the current erc-server-process to
+	server-proc.  If the IRC server responds quickly, it is possible
+	for the connection to close, and hence server buffer to be killed,
+	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
+	problem.
+
+2006-08-06  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-send-queue): Update from Circe
+	version of this function.
+	(erc-server-ping-timer-alist): New variable that keeps track of
+	ping timers according to their associated server.
+	(erc-server-last-received-time): New variable that specifies the
+	time of the last message we received from the server.  This is
+	used to detect hung processes.
+	(erc-server-send-ping): New function that sends a ping to the IRC
+	process corresponding with the given buffer.  Split from
+	erc-server-setup-periodical-ping.  If the server buffer no longer
+	exists, cancel the timer.  If the server process has not given us
+	a message, including PING responses, since the last PING, kill it.
+	This is necessary to deal with some aberrant freenode behavior.
+	Idea taken from rcirc.
+	(erc-server-setup-periodical-ping): Rename from
+	erc-server-setup-periodical-server-ping.
+	(erc-server-filter-function): Use erc-current-time instead of
+	current-time.
+
+	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
+	multi-tty Emacs.
+	(erc-select-startup-file): Fix bug introduced by recent change.
+	(erc-cmd-QUIT): If the IRC process has not terminated itself
+	within 4 seconds of completing our quit-hook, kill it manually.
+	Freenode in particular needs this.
+	(erc-connection-established): Use erc-server-setup-periodical-ping
+	instead of erc-server-setup-periodical-server-ping.
+
+2006-08-05  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-log-standardize-name): New function that returns
+	a filename that is safe for use for a log file.
+	(erc-current-logfile): Use it.
+
+	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
+	since that is a fairly standard directory.
+	(erc-select-startup-file): Re-write to use
+	convert-standard-filename, which will ensure that MS-DOS systems
+	look for the _ercrc.el file.
+
+2006-08-02  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-version-string): Release ERC 5.1.4.
+
+	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
+
+	* erc.el (erc-active-buffer): Fix bug that caused messages to go
+	to the wrong buffer.  Thanks to offby1 for the report.
+
+	* erc-backend.el (erc-coding-system-for-target): Handle case where
+	target is nil.  Thanks to Kai Fan for the patch.
+
+2006-07-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-log-setup-logging): Don't offer to save the
+	buffer.  It will be saved automatically killed.  Thanks to Johan
+	Bockgård and Tassilo Horn for pointing this out.
+
+2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
+
+	* erc.el (define-erc-module): Make find-function and find-variable
+	find the names constructed by `define-erc-module' in Emacs 22.
+
+2006-07-14  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (log): Make sure that we enable logging on
+	already-opened buffers as well, in case the user toggles this
+	module after loading ERC.  Also be sure to remove logging ability
+	from all ERC buffers when the module is disabled.
+	(erc-log-setup-logging): Set buffer-file-name to nil rather than
+	the empty string.  This should fix some errors that occur when
+	quitting Emacs without first killing all ERC buffers.
+	(erc-log-disable-logging): New function that removes the logging
+	ability from the current buffer.
+
+	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
+
+2006-07-12  Michael Olson  <mwolson@gnu.org>
+
+	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
+	than call toggle-read-only.
+
+	* Makefile (debrelease-mwolson): Remove and consolidate with the
+	`debrelease' target.
+	(debrevision): Rename from `debrevision-mwolson'.
+
+	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
+	add autoload cookie.
+
+2006-07-09  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-version-string): Release ERC 5.1.3.
+
+	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
+
+	* servers.pl: Add copyright notice.
+
+	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
+	from being set automatically away and current buffer is not an ERC
+	buffer.
+
+	* erc-identd.el: Fix compiler error.
+
+	* erc.texi (Development): Use @subheading instead of @subsection.
+	(Advanced Usage): Add menu.
+	(Connecting): Fully document how to connect to an IRC server.
+	(Options, Tips and Tricks, Sample Configuration): New unwritten
+	sections.
+
+	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
+	(erc-user-full-name, erc-password): Docfixes and customization
+	interface tweaks.
+	(erc-try-new-nick-p): Rename from
+	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
+	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
+	of `erc-nick-uniquifier', in case someone wants multiple
+	characters.
+	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
+	(erc-compute-port): Docfixes.
+
+	* FOR-RELEASE: Put in future-first order.
+
+	* erc-log.el (log): Move all add-hook calls here, rather than
+	executing them immediately, and also cause them to be un-hooked
+	when the module is removed.
+	(erc-save-buffer-on-part): Move next to
+	`erc-save-queries-on-quit'.
+	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
+	(erc-log-write-after-send, erc-log-write-after-insert): Default to
+	nil.  This makes things fast, but reasonably failsafe, by default.
+
+2006-07-08  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
+	default, since most IRC clients don't do this.
+	(erc-log-write-after-send): New option that determines whether the
+	log file will be written to after every sent message.
+	(erc-log-write-after-insert): New option that determines whether
+	the log file will be written to when new text is added to a logged
+	ERC buffer.
+	(log): Use the aforementioned options.
+
+	* erc.texi (Modules): Document the "completion" module.
+
+	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
+	have a nil element in the list when ignore-self is non-nil.
+
+2006-07-05  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-modules): Use `set' instead of `set-default', since
+	this setting should never be buffer-local.  Add the `list' and
+	`page' modules to the list.
+
+	* erc.texi (Modules): Add entries for `list' and `page' modules.
+	Change "spell" to "spelling".
+	(History): Use past tense throughout.
+
+2006-07-02  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
+	can happen when doing /PART.
+
+	* erc.el (erc-quit-reason-various-alist)
+	(erc-part-reason-various-alist): In the example, use "^$" as an
+	example, since "" matches anything.
+	(erc-quit-reason-various, erc-part-reason-various): If no argument
+	is given, and no matches are found, use our default reason instead
+	of "nil".
+
+2006-07-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc-identd.el (erc-identd-start): XEmacs defines neither
+	`make-network-process' nor `open-network-stream-server', so just
+	fail silently.
+
+2006-06-30  Michael Olson  <mwolson@gnu.org>
+
+	* HISTORY: Update.
+
+	* erc.texi (Modules): Mention identd.
+	(Releases): Update mailing list address and download location.
+	(Development): Refactor.  Provide updated directions for Arch.
+	Make URLs clickable.
+	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
+	(Getting Started): Give simpler example.  We do not need to
+	explicitly load every module.
+	(History): Update.
+
+	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
+	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
+	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
+	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
+	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
+	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
+	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
+	erc.el: Remove version strings.
+
+	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
+	module versions anymore.
+	(erc-version-modules): Remove, since we do not use this function
+	anymore.
+	(erc-latest-version, erc-ediff-latest-version): Remove, since this
+	was only useful back when ERC consisted of one file.
+	(erc-modules): Add line for identd.
+	(erc-get-channel-mode-from-keypress): Typo fix.
+
+	* erc-imenu.el: Remove unnecessary lines in header.
+
+	* erc-goodies.el (erc-handle-irc-url): Docfix.
+
+	* erc-identd.el: Define an ERC module for this.
+	(erc-identd-start): Don't create a process buffer if possible.
+	Otherwise, use conventional hidden names for process buffers.
+
+2006-06-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-coding-system-for-target): Match
+	case-insensitively.  Use a pattern match instead of `assoc', as
+	per the documentation for `erc-encoding-coding-alist'.
+
+	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
+
+2006-06-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el: Update maintainer information and URLs.
+
+2006-06-21  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (upload): Make this work with the GNU upload system.
+
+2006-06-14  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-active-buffer): If the active buffer has been
+	deleted, default to the server buffer.
+	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
+	control really toggle, not unconditionally turn off.
+
+2006-06-12  Michael Olson  <mwolson@gnu.org>
+
+	* NEWS: Add items since the 5.1.2 release.
+
+	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
+	indicates whether the current away status was caused by this
+	module.
+	(erc-autoaway-set-back): Only set back if this module set the user
+	away.
+	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
+	(erc-autoaway-reset-indicators): New function that resets some
+	indicators when the user is no longer away.
+	(autoaway): Add the above function to the 305 hook.
+
+2006-06-05  Romain Francoise  <romain@orebokech.com>
+
+	* erc.texi (History): Fix various typos.
+
+2006-06-04  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
+	definition of the autoaway module.
+	(autoaway): Don't do anything if erc-autoaway-idle-method is
+	unbound.  This prevents an error on startup.
+
+2006-06-03  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
+	(erc-autoaway-idle-method): Renamed from
+	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
+	how to do this, so it's best to make this take symbol values.
+	Improve documentation.  Remove warning against Emacs idle-time;
+	the point is moot now that we get user idle time via a different
+	method.  Make sure we disable and re-enable the module when
+	changing this value.
+	(autoaway): Conditionalize on the above option.  If using the idle
+	timer or user idle methods, don't add anything to the
+	send-completed or server-001 hooks, since it is unnecessary.
+	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
+	Docfix.
+	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
+	(erc-autoaway-reset-idle-irc): Renamed from
+	`erc-autoaway-reset-idle'.  Don't pass line to
+	`erc-autoaway-set-away', since it is not used.
+	(erc-autoaway-reset-idle-user): New function that resets the idle
+	state for user idle time.
+	(erc-autoaway-set-back): Remove line argument, since it is not
+	used.
+
+	* Makefile (upload): Make this work for Savannah uploads.
+
+	* AUTHORS: Update for Savannah move.  No old entries have been
+	removed, in case people have not registered yet on Savannah.
+
+2006-06-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-buffer-filter): Make sure all buffers returned from
+	this are live.
+
+2006-05-15  Michael Olson  <mwolson@gnu.org>
+
+	* README: Add License information.  Permit images to be used,
+	distributed, and modified without restriction.
+
+2006-05-01  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
+	a value for `url-irc-function'.
+
+2006-04-18  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
+	argument IGNORE-SELF.  If this is non-nil, don't return the user's
+	current nickname.  Doc fix.
+	(pcomplete/erc-mode/complete-command): Don't complete the current
+	nickname.
+
+2006-04-05  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
+	build date as it's shown in `emacs-version'.
+
+	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
+	with the same face property as the previous character.
+
+2006-04-02  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
+	erc.el: Make sure to include a newline inside of negated classes,
+	so that a newline is not matched.
+
+2006-04-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-server-connect-function): Don't try to
+	detect the existence of the `open-network-stream-nowait' function,
+	since I can't find it in Emacs21, XEmacs21, or Emacs22.
+
+2006-03-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi: Update direntry.  Remove unneeded local variables.
+
+2006-03-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-header-line): New face that will be used to colorize
+	the text of the header-line, provided that
+	`erc-header-line-face-method' is non-nil.
+	(erc-prompt-face): Fix formatting.
+	(erc-header-line-face-method): New option that determines the
+	method used for colorizing header-line text.  This may be a
+	function, nil, or non-nil.
+	(erc-update-mode-line-buffer): Use the aforementioned option and
+	face to colorize the header-line text, if that is what the user
+	wants.
+	(erc-send-input): If flood control is not activated, don't split
+	the input line.
+
+2006-03-25  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
+	that fixes the case where there is no leading whitespace.  Only
+	remove the first space character, though.
+
+	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
+	erc-identd-process is set properly.
+	(erc-identd-start, erc-identd-stop): Add autoload cookies.
+	(erc-identd-start): Pass :host parameter so this works with Emacs
+	22.
+
+2006-03-21  Michael Olson  <mwolson@gnu.org>
+
+	* CREDITS: Add Nelson Ferreira.  Change contact address.
+
+	* erc-bbdb.el: Install patch from Nelson Ferreira.
+	(erc-bbdb-electric-p): New option that indicates whether to make
+	the BBDB buffer electric.  Defaults to "not electric".
+	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
+
+2006-03-09  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-keymap): Use <backtab> rather than
+	<C-tab> for `erc-button-previous' as it is a more standard key
+	binding for this type of function.
+
+2006-02-28  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el: Removed things that were accidentally committed on
+	2006-02-20.  Removed Todo section.
+	(erc-capab-unidentified): Removed.
+
+2006-02-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc-capab.el: Use (eval-when-compile (require 'cl)).
+	(erc-capab-unidentified): Fix compiler warning by specifying
+	group.
+
+2006-02-20  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
+	to explain thoughts better.  `erc-server-parameters' is an
+	associated list when it's set, not a string.
+
+2006-02-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
+	parameters are strings before using them.  Thanks to Alejandro
+	Benitez for the report.
+
+	* erc.el (erc-version-string): Release ERC 5.1.2.
+
+2006-02-19  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
+	<C-tab>.
+	(erc-button-previous): New function.
+
+2006-02-15  Michael Olson  <mwolson@gnu.org>
+
+	* NEWS: Add category for ERC 5.2.
+
+	* erc.el (erc): Move to the end of the buffer when a continued
+	session is detected.  Thanks to e1f and indio for the report and
+	testing a potential fix.
+
+2006-02-14  Michael Olson  <mwolson@gnu.org>
+
+	* debian/changelog: Prepare a new Debian package.
+
+	* Makefile (debprepare): New rule that creates an ERC snapshot
+	directory for use in both new Debian releases and revisions for
+	Debian packages.
+	(debrelease, debrevision-mwolson): Use debprepare.
+
+	* NEWS: Bring up-to-date.
+
+	* erc-stamp.el (erc-insert-timestamp-right): For now, put
+	timestamps before rather than after erc-fill-column when
+	erc-timestamp-right-column is nil.  This way we won't surprise
+	anyone unpleasantly, or so it is hoped.
+
+2006-02-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
+
+2006-02-12  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
+	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
+	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
+	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
+	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
+	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
+	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
+	Add 2006 to copyright years, to comply with the changed guidelines.
+
+2006-02-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-update-modules): Handle erc-capab-identify
+	correctly.  Make some requirements shorter, so that it's easier to
+	see why they are needed.
+
+	* erc-capab.el: Add autoload cookie for capab-identify.
+	(erc-capab-send-identify-messages, erc-capab-identify-activate):
+	Minor whitespace fix in code.
+
+	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
+	`erc-timestamp-right-align-by-pixel'.  Set the default based on
+	whether we are in Emacs 22, and using X.  Improve documentation.
+	(erc-insert-aligned): Remove calculation of offset, since
+	:align-to pos works after all.  Unlike the previous solution, this
+	one works when erc-stamp.el is compiled.
+	(erc-insert-timestamp-right): Don't add length of string, and then
+	later remove its displayed width.  This puts timestamps after
+	erc-fill-column when erc-timestamp-right-column is nil, rather
+	than before it.  It also fixes a subtle bug.  Remove use of
+	`current-window', since there is no variable by that name in
+	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
+	`erc-fill-column' is non-nil before using it.
+
+2006-02-11  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-list.el: Define `list' module which sets the alias
+	`erc-cmd-LIST' to `erc-list-channels' when enabled and
+	`erc-list-channels-simple' when disabled.
+	(erc-list-channels): Was `erc-cmd-LIST', renamed.
+	(erc-list-channels-simple): New function.
+
+	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
+	`capab-identify' description.  Moved customization options left in
+	source code.
+
+	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
+
+	* erc-capab.el: Put a little more detail into Usage section.
+	(define-erc-module): Run `erc-capab-identify-setup' in all open
+	server buffers when enabling.
+	(erc-capab-identify-setup): Make PROC and PARSED optional
+	arguments.
+	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
+	should now also match nicknames that are formatted differently
+	than the default.
+
+	* erc-spelling.el (define-erc-module): Make sure there's a buffer
+	before calling `with-current-buffer'.
+
+2006-02-10  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (debbuild): Split from debrelease.
+	(debrevision-mwolson): New rule that causes a Debian revision to
+	be built.
+
+	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
+	Johan Bockgård.
+	(erc-modules): Change use of 'pcomplete to 'completion.
+
+2006-02-09  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el: Require erc.
+	(erc-capab-send-identify-messages): Use `erc-server-send'.
+	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
+	the flags so we can also check whether the `erc-identified' text
+	property is there at all.
+	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
+	This fixes a bug where the prefix wasn't inserted when timestamps
+	are inserted on the right.  Tweaked nickname regexp.
+	(erc-capab-find-parsed): New function.
+	(erc-capab-get-unidentified-nickname): Updated to check for 0
+	flag.  Only get nickname if there's a nickuserhost associated with
+	this message.
+
+	* erc-capab.el: New file.  Adds the new module
+	`erc-capab-identify', which allows flagging of unidentified users
+	on servers running an ircd based on dancer - irc.freenode.net, for
+	example.
+
+	* erc.el (erc-modules): Added `capab-identify' to options.
+	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
+	(erc-get-parsed-vector-type): Moved here from erc-match.el.
+	(erc-version-string): Remove "(CVS)".
+	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
+	connections work as expected.  Connecting with `open-tls-stream'
+	only seems to work (if at all?) when using the tls.el located in
+	lisp/net/ in Emacs22.
+
+	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
+	(erc-get-parsed-vector-type): Moved these functions to erc.el
+	since they can be useful outside of the text matching module.
+
+	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
+	erc-services.el since the file name has changed.
+
+	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
+
+	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
+	to "ERC".
+
+2006-02-07  Michael Olson  <mwolson@gnu.org>
+
+	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
+	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
+	the filenames in DOS.
+
+	* erc-goodies.el: Comment fix.
+
+	* erc-hecomplete.el: Rename from erc-complete.el.  Update
+	commentary.  Use define-erc-module so that it's possible to
+	actually use this.
+	(erc-hecomplete): Rename function from `erc-complete'.
+	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
+
+	* erc-join.el: Rename from erc-autojoin.el.
+
+	* erc-networks.el: Rename from erc-nets.el.
+
+	* erc-services.el: Rename from erc-nickserv.el.
+
+	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
+	the simpler `indent-to' function when
+	`erc-timestamp-right-align-by-pixel' is nil.
+	(erc-insert-timestamp-right): If the timestamp goes on the
+	following line, don't add timestamp properties to the spaces in
+	front of it.
+
+	* erc.el (erc-migrate-modules): New function that eases migration
+	of module names.
+	(erc-modules): Call erc-migrate-modules in the :get accessor.
+	(erc-modules, erc-update-modules): Update for new modules names.
+
+2006-02-05  Diane Murray  <disumu@x3y2z1.net>
+
+	* FOR-RELEASE: Added two things to do before the next release of
+	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
+	the `C-c C-SPC' and `C-c C-@' global keybindings.
+
+2006-02-05  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
+	directory correctly.
+
+	* debian/changelog: Update for 5.1.1 release.
+
+	* debian/control (Suggests): Suggest emacs-chess instead of
+	Recommending it.  Thanks to Era Eriksson for the report.
+
+	* debian/maint/postinst: Install the Info documentation.
+
+	* debian/maint/prerm: Handle removing of Info documentation.
+
+	* debian/rules (configure, configure-stamp, build, build-stamp):
+	Generate HTML and Info documentation.
+	(binary-erc): Install HTML and Info documentation.
+
+	* erc-spelling.el (erc-spelling-init): If
+	`erc-spelling-dictionaries' is nil, do not set
+	ispell-local-dictionary.  Before, it was being set to nil, which
+	was causing a long delay while the ispell process restarted.
+	(erc-spelling-unhighlight-word): New function that removes
+	flyspell properties from a spell-checked word.
+	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
+	that have '/' before them.
+
+2006-02-04  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (VERSION): Update to 5.1.1.
+
+	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
+	that Emacs does in its NEWS file.
+
+	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
+
+	* erc-complete.el (erc-nick-completion-exclude-myself)
+	(erc-try-complete-nick): Use better function for getting list of
+	channel users.
+
+	* erc-goodies.el: Docfix.
+
+	* erc-stamp.el: Use new arch tagline, since the other one wasn't
+	being treated properly.
+
+	* erc.texi (History): Note that ERC is now included with Emacs.
+
+	* erc.el (erc-version-string): Release ERC 5.1.1.
+
+2006-01-31  Michael Olson  <mwolson@gnu.org>
+
+	* erc-stamp.el: Update copyright years.
+
+2006-01-30  Simon Josefsson  <jas@extundo.com>
+
+	* erc.el (erc-open-ssl-stream): Use tls.el.
+
+2006-01-30  Michael Olson  <mwolson@gnu.org>
+
+	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
+	that determines whether to use pixel values to align right
+	timestamps.  The default is not to do so, since it only works with
+	Emacs22 on X, and even then some people have trouble.
+	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
+
+2006-01-29  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc-viper.el: Ensure we only alter Viper's configuration when
+	necessary, as Viper may already take ERC into account.
+
+2006-01-29  Michael Olson  <mwolson@gnu.org>
+
+	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
+	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
+	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
+
+	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
+	variable.
+	(erc-speedbar-goto-buffer): Fix compiler warning.
+
+	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
+	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
+	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
+	work without compiler warnings.
+
+	* man/erc.texi (Obtaining ERC, Installation): Note that these
+	sections may be skipped if using the version of ERC that comes
+	with Emacs.
+
+2006-01-28  Michael Olson  <mwolson@gnu.org>
+
+	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
+	guidelines.
+
+	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
+	the Emacs copyright statement.  Refer to ourselves as ERC rather
+	than "Emacs IRC Client", since there are now several IRC clients
+	for Emacs.
+
+	* erc-compat.el (erc-emacs-build-time): Define as a variable.
+
+	* erc-ibuffer.el: Require 'erc.
+
+	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
+	it exists.
+
+	* erc-stamp.el (erc-insert-aligned): Only use the special text
+	property when window-system is X.
+
+	* erc.texi (History): Note that ERC 5.1 is released.
+
+2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
+
+	* erc.el (erc-format-message): More `cl' breakage; don't use
+	`oddp'.
+
+2006-01-27  Michael Olson  <mwolson@gnu.org>
+
+	* debian/changelog: Update for new release.
+
+	* debian/control (Description): Update.
+
+	* debian/rules: Concatenate ChangeLog for 2005.
+
+	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
+	(debrelease, release): Copy images directory.
+
+	* NEWS: Spelling fixes.  Add items for recent changes.
+
+	* erc.el (erc): Move call to erc-update-modules before the call to
+	erc-mode.  This should fix a timestamp display issue.
+	(erc-version-string): Release ERC 5.1.
+
+2006-01-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc-stamp.el (erc-insert-aligned): New function that inserts
+	text in an perfectly-aligned way relative to the right margin.  It
+	only works well with Emacs22.  A sane fallback is provided for
+	other versions of Emacs.
+	(erc-insert-timestamp-right): Use the new function.
+
+2006-01-25  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
+	before `erc-match-mode'.
+
+	* erc-match.el (match): Append `erc-match-message' to
+	`erc-insert-modify-hook'.
+
+2006-01-25  Michael Olson  <mwolson@gnu.org>
+
+	* FOR-RELEASE: Mark last release requirement as done.
+
+	* Makefile (realclean, distclean): Remove docs.
+
+	* erc.texi: Take care of all pre-5.1 items.
+
+	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
+	`process-send-string' in `condition-case' to avoid an error when
+	quitting ERC.
+
+	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
+	variable-width characters in the timestamp and on the same line.
+	The latter is a kludge, but it seems to work with most of the
+	input I've thrown at it so far.  It's certainly better than going
+	past the end of line consistently when we have variable-width
+	characters on the same line.  When `erc-timestamp-intangible' is
+	non-nil, add intangible properties to the whitespace as well, so
+	that hitting <end> does what you'd expect.
+
+	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
+	this to only use boolean values for `erc-flood-protect'.  Update
+	documentation.
+	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
+	that any QUIT-related messages go there.
+	(erc): Try to be more clever about re-using channel buffers when
+	automatically re-connecting.  Thanks to e1f for noticing.
+
+2006-01-23  Michael Olson  <mwolson@gnu.org>
+
+	* ChangeLog.2005: Remove erroneous line.
+
+	* FOR-RELEASE: Make that the Makefile tweaking is complete.
+	(NEWS): Mark as done.
+
+	* Makefile (MANUAL): New option indicating the name of the manual.
+	(PREFIX, ELISPDIR, INFODIR): New options that specify the
+	directories to install lisp code and info manuals to.  PREFIX is
+	used only by ELISPDIR and INFODIR.
+	(all): Call `lisp' and create the manual.
+	(lisp): Compile lisp code.
+	(%.info, %.html): New rules that make Info files and HTML files,
+	respectively, from a TexInfo source.
+	(doc): Create both the Info and HTML versions of the manual.  This
+	is for the user -- we never call it automatically.
+	(install-info): Install Info files.
+	(install-bin): Install compiled and source Lisp files.
+	(todo): Remove, since it seems pointless.
+
+	* NEWS: Update.
+
+	* README: Add Installation instructions.  Tweak layout.
+
+	* erc.texi: Work on some pre-5.1 items.
+
+	* erc-stamp.el, erc-track.el: Move some functions and options in
+	order to get rid of a few compiler warnings.
+
+	* erc.el (erc-modules): Enable readonly by default.  This will
+	prevent new users from accidentally removing old messages, which
+	could be disconcerting.  Also enable stamp by default, since
+	timestamps are a fairly standard feature among IRC clients.
+
+	* erc-button.el: Munge whitespace.
+
+	* erc-identd.el (erc-identd-start): Instead of throwing an error,
+	just try to use the obsolete function.
+
+2006-01-22  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-decode-string-from-target): Make sure that
+	we have a string as an argument.  If not, coerce it to the empty
+	string.  Hopefully, this will work painlessly around an edge case
+	related to quitting ERC around the same time a message comes in.
+
+2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
+
+	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
+	`case').  Doc fixes.
+	(erc-find-parsed-property): Simplify.
+	(erc-track-get-active-buffer): Fix logic.  Simplify.
+	(erc-track-switch-buffer): Remove unused variable `dir'.  Simplify.
+
+	* erc-speak.el: Doc fixes.
+	(erc-speak-region): `propertize' --> `erc-propertize'.
+
+	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
+	`erc-propertize'.
+
+	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
+	account when wrapping URLs.
+
+	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
+
+	* erc-backend.el (define-erc-response-handler): Doc fix.
+
+2006-01-22  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-update-modules): Use `require' instead of `load',
+	but prevent it from causing errors, in order to preserve the
+	previous behavior.
+
+2006-01-21  Michael Olson  <mwolson@gnu.org>
+
+	* FOR-RELEASE (Source): Mark cl task as done.
+
+	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
+	generate-autoloads.
+	(erc-auto.el, %.elc): Don't show command, just its output.
+
+	* NEWS: Add items from 2005-01-01 to 2005-08-13.
+
+	* debian/copyright (Copyright): Update.
+
+	* erc-auto.in (erc-generate-autoloads): Rename from
+	generate-autoloads.
+
+	* erc.el, erc-autoaway.el, erc-backend.el: Use
+	erc-server-process-alive instead of erc-process-alive.
+
+	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
+	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
+	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
+	Use (eval-when-compile (require 'cl)), so that compilation doesn't
+	fail.
+
+	* erc-fill.el, erc-truncate.el: Whitespace munging.
+
+	* erc.el: Update copyright notice.  Remove eval-after-load code.
+	(erc-with-buffer): Docfix.
+	(erc-once-with-server-event, erc-once-with-server-event-global)
+	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
+	instead of gensym.
+	(erc-banlist-update): Use erc-delete-if instead of delete-if.
+	(erc): Call `erc-update-modules' here.
+
+	* erc-backend.el: Require 'erc-compat to minimize compiler
+	warnings.
+	(erc-decode-parsed-server-response): Docfix.
+	(erc-server-process-alive): Move here from erc.el and rename from
+	`erc-process-alive'.
+	(erc-server-send, erc-remove-channel-users): Make sure process is
+	alive before sending data to it.
+
+	* erc-bbdb.el: Update copyright years.
+	(erc-bbdb-whois): Remove overexuberant comment.
+
+	* erc-button.el: Require erc-fill, since we make liberal use of
+	`erc-fill-column'.
+
+	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
+	functions, the latter of which provides an `assert' equivalent.
+	(erc-remove-if-not): New function that provides a simple
+	implementation of `remove-if-not'.
+	(erc-gensym): New function that provides a simple implementation
+	of `gensym'.
+	(erc-delete-if): New function that provides a simple
+	implementation of `delete-if'.
+	(erc-member-if): New function that provides a simple
+	implementation of `member-if'.
+	(field-end): Remove this, since it is unused, and later versions
+	of XEmacs have this function already.
+	(erc-function-arglist): Moved here from erc.el.
+	(erc-delete-dups): New compatibility function for dealing with
+	XEmacs.
+	(erc-subseq): New function copied from cl-extra.el.
+
+	* erc-dcc.el: Require pcomplete during compilation to avoid
+	compiler warnings.
+	(erc-unpack-int, erc-dcc-send-filter)
+	(erc-dcc-get-filter): Use erc-assert instead of assert.
+	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
+	remove-if-not.
+
+	* erc-match.el (erc-log-matches): Fix compiler warning.
+
+	* erc-nicklist.el: Update copyright notice.
+	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
+	(erc-nicklist-bitlbee-connected-p): Remove.
+	(erc-nicklist-insert-medium-name-or-icon): Accept channel
+	argument.  Use it to determine whether we are on bitlbee.  Now
+	that bitlbee names its channel "&bitlbee", this is trivial.
+	(erc-nicklist-insert-contents): Pass channel as specified above.
+	Don't try to determine whether we are on bitlbee here.
+	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
+	of remove-if-not.
+	(erc-nicklist-search-for-nick): Use erc-member-if instead of
+	member-if.
+
+	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
+	partially-evaluated lambda expression instead of `delete' and
+	`find'.
+
+	* erc-track.el: Use erc-assert.
+	(erc-track-modified-channels): Remove use of `return'.
+	(erc-track-modified-channels): Use `cadr' instead of `second',
+	since otherwise we would need yet another eval-when-compile line.
+
+2006-01-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
+	detect SIGPIPE, since it doesn't work.
+
+2006-01-10  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-spelling.el: Updated copyright years.
+	(define-erc-module): Enable/disable `flyspell-mode' for all open
+	ERC buffers as well.
+	(erc-spelling-dictionaries): Reworded customize description.
+
+	* erc.el (erc-command-symbol): New function.
+	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
+	fixes a bug where "Symbol's function definition is void:
+	erc-cmd-LIST" would be shown after typing /list at the prompt (the
+	command was interned because erc-menu.el uses it and is enabled by
+	default whereas erc-list.el is not).
+
+	* NEWS: Started a list of renamed variables.
+
+	* erc.el: Reworded the message sent when defining variable
+	aliases.
+	(erc-command-indicator-face): Doc fix.
+	(erc-modules): Enable the match module by default which makes
+	current nickname highlighting on as the default.
+
+	* erc-button.el: Updated copyright years.
+	(erc-button): New face.
+	(erc-button-face): Use `erc-button'.
+	(erc-button-nickname-face): New customizable variable.
+	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
+	new argument to `erc-button-add-button'.
+	(erc-button-add-button): Doc fix.  Added new argument to function
+	definition, NICK-P.  If it's a nickname, use
+	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
+	makes channel tracking and buttons work better together when
+	`erc-button-buttonize-nicks' is enabled, since there is a nickname
+	on just about every line.
+
+	* erc-track.el (erc-track-use-faces): Doc fix.
+	(erc-track-faces-priority-list): Added `erc-button' to list.
+	(erc-track-priority-faces-only): Doc fix.
+
+2006-01-09  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-url-regexp): Use `concat' so the
+	regexp is not one long line.
+	(erc-button-alist): Fixed so that customizing works correctly.
+	Reorganized.  Removed lambda functions with more than two lines.
+	Doc fix.
+	(erc-button-describe-symbol, erc-button-beats-to-time): New
+	functions.  Moved from `erc-button-alist'.
+
+2006-01-07  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
+	process if a SIGPIPE occurs.  This happens when a new message
+	comes in at the same time a /quit is requested.
+	(erc-process-sentinel): Use string-match rather than string= to do
+	these comparisons.  Matching literal newlines makes me nervous.
+
+	* erc-track.el (erc-track-remove-from-mode-line): Handle case
+	where global-mode-string is not a list.  Emacs22 permits this.
+
+
+See ChangeLog.05 for earlier changes.
+
+    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
+;; Local Variables:
+;; coding: utf-8
+;; add-log-time-zone-rule: t
+;; End:
+
+;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a



From MAILER-DAEMON Wed Oct 17 10:36:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0P-00039K-FA
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSH-0007NA-NR
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvSF-0007LS-Pu
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvOv-00051Y-1Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:29 -0400
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@hcoop.net>) id 1IgvOu-0003xP-8t
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:28 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOt-000562-Ik
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOt-0005nq-KB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:27 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOt-0005nq-KB@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:27 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Fix several autoaway bugs and hack
	on internals.
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, 14 Oct 2007 04:51:58 -0000

commit aeaad2c2980570d539fc5d1dde45a267b62d962a
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Aug 20 03:42:00 2006 +0000

    Fix several autoaway bugs and hack on internals.
    
    * erc.el (erc-with-server-buffer): New macro that switches to the
      current ERC server buffer and runs some code.  If no server buffer
      is available, return nil.  This is a useful way to access
      variables in the server buffer.
      (erc-get-server-user, erc-add-server-user)
      (erc-remove-server-user, erc-change-user-nickname)
      (erc-get-server-nickname-list, erc-get-server-nickname-alist)
      (erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
      (erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
      (erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
      (erc-format-channel-modes): Use it.
      (erc-once-with-server-event, erc-once-with-server-event-global)
      (erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
      instead of gensym.
      (erc-open-server-buffer-p): New function that returns non-nil if
      the given buffer is an ERC server buffer that has an open IRC
      process.
      (erc-with-buffer): Use buffer-live-p here to set a good example,
      though it isn't really needed here.
      (erc-away): Mention erc-away-time.
      (erc): Don't propagate the erc-away setting, since it makes more
      sense to access it from the server buffer.
      (erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
      erc-server-buffer-p so that only open connections are set away.
      (erc-cmd-GQUIT): Use erc-open-server-buffer-p.
      (erc-process-away): Docfix.  Don't set erc-away in channel
      buffers.
      (erc-set-current-nick): Make this uniform with the style used in
      erc-current-nick.
      (erc-away-time): Rename from erc-away-p, since this is no longer a
      boolean-style predicate.
      (erc-format-away-status): Use it.
    
    * erc-stamp.el (erc-add-timestamp): Use erc-away-time.
    
    * erc-spelling.el (erc-spelling-init): Use erc-with-server-buffer.
    
    * erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
    
    * erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
      (pcomplete-erc-all-nicks): Use erc-with-server-buffer.
    
    * erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
      erc-with-server-buffer.
    
    * erc-networks.el (erc-network, erc-current-network)
      (erc-network-name): Use erc-with-server-buffer.
    
    * erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
    
    * erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
      erc-away-time.
    
    * erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
    
    * erc-list.el (erc-chanlist): Use erc-with-server-buffer.
    
    * erc-ibuffer.el (erc-away): Use erc-away-time.
    
    * erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
      read only instead of permanently doing so.
    
    * erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
      Emacs Lisp has make-symbol, which is better.
    
    * erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
      erc-with-server-buffer.
    
    * erc-capab.el (capab-identify): Only deal with server buffers
      that have an open IRC process.
      (erc-capab-identify-add-prefix): Use erc-with-server-buffer.
    
    * erc-backend.el (erc-server-connected): Docfix.  Recommend the
      `erc-server-process-alive' function.
      (erc-coding-system-for-target): Supply a default target if one is
      not given.
      (erc-server-send): Simplify slightly.
      (erc-call-hooks): Use erc-with-server-buffer.
    
    * erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
      higher to avoid an automatic load snafu.
      (erc-autoaway-some-server-buffer): New function that returns an
      ERC server buffer with a live connection, or nil otherwise.
      (erc-autoaway-insinuate-maybe): New function that adds the
      autoaway reset function to post-command-hook if at least one ERC
      process is alive.
      (erc-autoaway-remove-maybe): New function that removes the
      autoaway reset function from post-command-hook if no ERC process
      is alive.
      (autoaway): Don't touch post-command-hook unless an IRC process is
      already open.  Remove our addition to post-command-hook as soon as
      there are no more IRC processes open.  Reset the indicators before
      connecting to an IRC server, which fixes a bug when re-connecting.
      (erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
      there are no more IRC processes open.
      (erc-autoaway-set-back): Pick an open IRC process.  Accept an
      argument which is a function call if we can't find one.
      (erc-autoaway-some-open-server-buffer): New function which returns
      an ERC server buffer with an open connection and a user that is
      not away.
      (erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
      (erc-autoaway-set-away): Accept a `notest' argument which is used
      to avoid testing the same thing twice.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-45

diff --git a/ChangeLog b/ChangeLog
index 820da01..8647850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,109 @@
+2006-08-20  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-with-server-buffer): New macro that switches to the
+	current ERC server buffer and runs some code.  If no server buffer
+	is available, return nil.  This is a useful way to access
+	variables in the server buffer.
+	(erc-get-server-user, erc-add-server-user)
+	(erc-remove-server-user, erc-change-user-nickname)
+	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
+	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
+	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
+	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
+	(erc-format-channel-modes): Use it.
+	(erc-once-with-server-event, erc-once-with-server-event-global)
+	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
+	instead of gensym.
+	(erc-open-server-buffer-p): New function that returns non-nil if
+	the given buffer is an ERC server buffer that has an open IRC
+	process.
+	(erc-with-buffer): Use buffer-live-p here to set a good example,
+	though it isn't really needed here.
+	(erc-away): Mention erc-away-time.
+	(erc): Don't propagate the erc-away setting, since it makes more
+	sense to access it from the server buffer.
+	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
+	erc-server-buffer-p so that only open connections are set away.
+	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
+	(erc-process-away): Docfix.  Don't set erc-away in channel
+	buffers.
+	(erc-set-current-nick): Make this uniform with the style used in
+	erc-current-nick.
+	(erc-away-time): Rename from erc-away-p, since this is no longer a
+	boolean-style predicate.
+	(erc-format-away-status): Use it.
+
+	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
+
+	* erc-spelling.el (erc-spelling-init): Use erc-with-server-buffer.
+
+	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
+
+	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
+	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
+
+	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
+	erc-with-server-buffer.
+
+	* erc-networks.el (erc-network, erc-current-network)
+	(erc-network-name): Use erc-with-server-buffer.
+
+	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
+
+	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
+	erc-away-time.
+
+	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
+
+	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
+
+	* erc-ibuffer.el (erc-away): Use erc-away-time.
+
+	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
+	read only instead of permanently doing so.
+
+	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
+	Emacs Lisp has make-symbol, which is better.
+
+	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
+	erc-with-server-buffer.
+
+	* erc-capab.el (capab-identify): Only deal with server buffers
+	that have an open IRC process.
+	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
+
+	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
+	`erc-server-process-alive' function.
+	(erc-coding-system-for-target): Supply a default target if one is
+	not given.
+	(erc-server-send): Simplify slightly.
+	(erc-call-hooks): Use erc-with-server-buffer.
+
+	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
+	higher to avoid an automatic load snafu.
+	(erc-autoaway-some-server-buffer): New function that returns an
+	ERC server buffer with a live connection, or nil otherwise.
+	(erc-autoaway-insinuate-maybe): New function that adds the
+	autoaway reset function to post-command-hook if at least one ERC
+	process is alive.
+	(erc-autoaway-remove-maybe): New function that removes the
+	autoaway reset function from post-command-hook if no ERC process
+	is alive.
+	(autoaway): Don't touch post-command-hook unless an IRC process is
+	already open.  Remove our addition to post-command-hook as soon as
+	there are no more IRC processes open.  Reset the indicators before
+	connecting to an IRC server, which fixes a bug when re-connecting.
+	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
+	there are no more IRC processes open.
+	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
+	argument which is a function call if we can't find one.
+	(erc-autoaway-some-open-server-buffer): New function which returns
+	an ERC server buffer with an open connection and a user that is
+	not away.
+	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
+	(erc-autoaway-set-away): Accept a `notest' argument which is used
+	to avoid testing the same thing twice.
+
 2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 4614bd7..af6f84b 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -40,6 +40,42 @@ yourself back when you type something."
   "The Emacs idletimer.
 This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
 
+(eval-when-compile (defvar erc-autoaway-idle-seconds))
+
+(defun erc-autoaway-reestablish-idletimer ()
+  "Reestablish the emacs idletimer.
+If `erc-autoaway-idle-method' is 'emacs, you must call this
+function each time you change `erc-autoaway-idle-seconds'."
+  (interactive)
+  (when erc-autoaway-idletimer
+    (erc-cancel-timer erc-autoaway-idletimer))
+  (setq erc-autoaway-idletimer
+	(run-with-idle-timer erc-autoaway-idle-seconds
+			     t
+			     'erc-autoaway-set-away
+			     erc-autoaway-idle-seconds)))
+
+(defun erc-autoaway-some-server-buffer ()
+  "Return some ERC server buffer if its connection is alive.
+If none is found, return nil."
+  (car (erc-buffer-list #'erc-open-server-buffer-p)))
+
+(defun erc-autoaway-insinuate-maybe (&optional server &rest ignored)
+  "Add autoaway reset function to `post-command-hook' if at least one
+ERC process is alive.
+
+This is used when `erc-autoaway-idle-method' is 'user."
+  (when (or server (erc-autoaway-some-server-buffer))
+    (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user)))
+
+(defun erc-autoaway-remove-maybe (&rest ignored)
+  "Remove the autoaway reset function from `post-command-hook' if
+no ERC process is alive.
+
+This is used when `erc-autoaway-idle-method' is 'user."
+  (unless (erc-autoaway-some-server-buffer)
+    (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user)))
+
 ;;;###autoload (autoload 'erc-autoaway-mode "erc-autoaway")
 (define-erc-module autoaway nil
   "In ERC autoaway mode, you can be set away automatically.
@@ -65,24 +101,31 @@ set you no longer away.
 Related variables: `erc-public-away-p' and `erc-away-nickname'."
   ;; Enable:
   ((when (boundp 'erc-autoaway-idle-method)
+     (add-hook 'erc-connect-pre-hook 'erc-autoaway-reset-indicators)
+     (setq erc-autoaway-last-sent-time (erc-current-time))
      (cond
       ((eq erc-autoaway-idle-method 'irc)
        (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
        (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
       ((eq erc-autoaway-idle-method 'user)
-       (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
+       (add-hook 'erc-after-connect 'erc-autoaway-insinuate-maybe)
+       (add-hook 'erc-disconnected-hook 'erc-autoaway-remove-maybe)
+       (erc-autoaway-insinuate-maybe))
       ((eq erc-autoaway-idle-method 'emacs)
        (erc-autoaway-reestablish-idletimer)))
      (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
      (add-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators)))
   ;; Disable:
   ((when (boundp 'erc-autoaway-idle-method)
+     (remove-hook 'erc-connect-pre-hook 'erc-autoaway-reset-indicators)
      (cond
       ((eq erc-autoaway-idle-method 'irc)
        (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
        (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
       ((eq erc-autoaway-idle-method 'user)
-       (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user))
+       (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user)
+       (remove-hook 'erc-after-connect 'erc-autoaway-insinuate-maybe)
+       (remove-hook 'erc-disconnected-hook 'erc-autoaway-remove-maybe))
       ((eq erc-autoaway-idle-method 'emacs)
        (erc-cancel-timer erc-autoaway-idletimer)
        (setq erc-autoaway-idletimer nil)))
@@ -133,21 +176,6 @@ See `erc-auto-discard-away'."
   :group 'erc-autoaway
   :type 'regexp)
 
-(eval-when-compile (defvar erc-autoaway-idle-seconds))
-
-(defun erc-autoaway-reestablish-idletimer ()
-  "Reestablish the emacs idletimer.
-If `erc-autoaway-idle-method' is 'emacs, you must call this
-function each time you change `erc-autoaway-idle-seconds'."
-  (interactive)
-  (when erc-autoaway-idletimer
-    (erc-cancel-timer erc-autoaway-idletimer))
-  (setq erc-autoaway-idletimer
-	(run-with-idle-timer erc-autoaway-idle-seconds
-			     t
-			     'erc-autoaway-set-away
-			     erc-autoaway-idle-seconds)))
-
 (defcustom erc-autoaway-idle-seconds 1800
   "*Number of seconds after which ERC will set you automatically away.
 If you are changing this variable using lisp instead of customizing it,
@@ -179,7 +207,7 @@ user's away status.")
 This is one global variable since a user talking on one net can
 talk on another net too."
   (when erc-auto-discard-away
-    (erc-autoaway-set-back))
+    (erc-autoaway-set-back #'erc-autoaway-remove-maybe))
   (setq erc-autoaway-last-sent-time (erc-current-time)))
 
 (defun erc-autoaway-reset-idle-irc (line &rest stuff)
@@ -192,12 +220,24 @@ talk on another net too."
     (erc-autoaway-set-back))
   (setq erc-autoaway-last-sent-time (erc-current-time)))
 
-(defun erc-autoaway-set-back ()
-  "Discard the away state globally."
-  (let ((server-buffer (car (erc-buffer-list #'erc-server-buffer-p))))
-    (when (and erc-autoaway-caused-away
-	       (with-current-buffer server-buffer (erc-away-p)))
-      (erc-cmd-GAWAY ""))))
+(defun erc-autoaway-set-back (&optional none-alive-func)
+  "Discard the away state globally.
+
+NONE-ALIVE-FUNC is the function to call if no ERC processes are alive."
+  (let ((server-buffer (erc-autoaway-some-server-buffer)))
+    (if (and erc-autoaway-caused-away
+	     (buffer-live-p server-buffer)
+	     (with-current-buffer server-buffer erc-away))
+	(erc-cmd-GAWAY "")
+      (when none-alive-func (funcall none-alive-func)))))
+
+(defun erc-autoaway-some-open-server-buffer ()
+  "Return some ERC server buffer if its connection is alive and the
+user is not away.
+If none is found, return nil."
+  (car (erc-buffer-list (lambda ()
+			  (and (erc-open-server-buffer-p)
+			       (not erc-away))))))
 
 (defun erc-autoaway-possibly-set-away (current-time)
   "Set autoaway when `erc-auto-set-away' is true and the idletime is
@@ -206,7 +246,7 @@ exceeds `erc-autoaway-idle-seconds'."
   ;; this function is called from `erc-timer-hook', which is called
   ;; whenever the server sends something to the client.
   (when (and erc-auto-set-away
-	     (not (erc-away-p)))
+	     (erc-autoaway-some-open-server-buffer))
     (let ((idle-time (erc-time-diff erc-autoaway-last-sent-time
 				    current-time)))
       (when (>= idle-time erc-autoaway-idle-seconds)
@@ -214,15 +254,17 @@ exceeds `erc-autoaway-idle-seconds'."
 	 nil 'notice nil
 	 (format "Setting automatically away after %i seconds of idle-time"
 		 idle-time))
-	(erc-autoaway-set-away idle-time)))))
+	(erc-autoaway-set-away idle-time t)))))
+
+(defun erc-autoaway-set-away (idle-time &optional notest)
+  "Set the away state globally.
 
-(defun erc-autoaway-set-away (idle-time)
-  "Set the away state globally."
+If NOTEST is specified, do not check to see whether there is an
+activer server buffer available."
   ;; Note that the idle timer runs, even when Emacs is inactive.  In
   ;; order to prevent flooding when we connect, we test for an
   ;; existing process.
-  (when (and (erc-server-process-alive)
-	     (not (erc-away-p)))
+  (when (or notest (erc-autoaway-some-open-server-buffer))
     (setq erc-autoaway-caused-away t)
     (erc-cmd-GAWAY (format erc-autoaway-message idle-time))))
 
diff --git a/erc-backend.el b/erc-backend.el
index 30ab523..bedddea 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -178,8 +178,11 @@ WALLCHOPS - supports sending messages to all operators in a channel")
   "Mapping of server buffers to their specific ping timer.")
 
 (defvar erc-server-connected nil
-  "Non-nil if the `current-buffer' is associated with an open IRC connection.
-This variable is buffer-local.")
+  "Non-nil if the current buffer has been used by ERC to establish
+an IRC connection.
+
+If you wish to determine whether an IRC connection is currently
+active, use the `erc-server-process-alive' function instead.")
 (make-variable-buffer-local 'erc-server-connected)
 
 (defvar erc-server-quitting nil
@@ -599,6 +602,7 @@ EVENT is the message received from the closed connection process."
   "Return the coding system or cons cell appropriate for TARGET.
 This is determined via `erc-encoding-coding-alist' or
 `erc-server-coding-system'."
+  (unless target (setq target (erc-default-target)))
   (or (when target
         (let ((case-fold-search t))
           (catch 'match
@@ -644,14 +648,11 @@ See `erc-server-flood-margin' for an explanation of the flood
 protection algorithm."
   (erc-log (concat "erc-server-send: " string "(" (buffer-name) ")"))
   (setq erc-server-last-sent-time (erc-current-time))
-  (let ((buf (erc-server-buffer))
-        (encoding (erc-coding-system-for-target
-                   (or target (erc-default-target)))))
+  (let ((encoding (erc-coding-system-for-target target)))
     (when (consp encoding)
       (setq encoding (car encoding)))
-    (if (and buf
-             (erc-server-process-alive))
-        (with-current-buffer buf
+    (if (erc-server-process-alive)
+        (erc-with-server-buffer
           (let ((str (concat string "\r\n")))
             (if forcep
                 (progn
@@ -891,10 +892,8 @@ Finds hooks by looking in the `erc-server-responses' hashtable."
   (let ((hook (or (erc-get-hook (erc-response.command message))
                   'erc-default-server-functions)))
     (run-hook-with-args-until-success hook process message)
-    (let ((server-buffer (erc-server-buffer)))
-      (when (buffer-live-p server-buffer)
-        (with-current-buffer server-buffer
-          (run-hook-with-args 'erc-timer-hook (erc-current-time)))))))
+    (erc-with-server-buffer
+      (run-hook-with-args 'erc-timer-hook (erc-current-time)))))
 
 (add-hook 'erc-default-server-functions 'erc-handle-unknown-server-response)
 
diff --git a/erc-capab.el b/erc-capab.el
index 7f59cd8..6155172 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -96,7 +96,7 @@
    (mapc (lambda (buffer)
            (when buffer
              (with-current-buffer buffer (erc-capab-identify-setup))))
-         (erc-buffer-list 'erc-server-buffer-p)))
+         (erc-buffer-list 'erc-open-server-buffer-p)))
   ((remove-hook 'erc-server-005-functions 'erc-capab-identify-setup)
    (remove-hook 'erc-server-290-functions 'erc-capab-identify-activate)
    ;; we don't remove the `erc-capab-identify-remove/set-identified-flag' hooks
@@ -173,8 +173,7 @@ PARSED is an `erc-parsed' response struct."
 (defun erc-capab-identify-add-prefix ()
   "Add `erc-capab-identify-prefix' to nickname if user is unidentified."
   (when (and erc-capab-identify-prefix
-             (with-current-buffer (erc-server-buffer)
-               erc-capab-identify-activated))
+             (erc-with-server-buffer erc-capab-identify-activated))
     (goto-char (point-min))
     (goto-char (or (erc-capab-find-parsed) (point-min)))
     (let ((nickname (erc-capab-get-unidentified-nickname
diff --git a/erc-chess.el b/erc-chess.el
index f79cf7f..fc61bdc 100644
--- a/erc-chess.el
+++ b/erc-chess.el
@@ -91,12 +91,10 @@ This is the main handler for the erc-chess module."
    ((eq event 'send)
     ;; Transmit the string given in `(car args)' to the nick
     ;; saved in `erc-chess-partner'.
-    (let ((buf (process-buffer erc-server-process))
-	  (nick erc-chess-partner)
+    (let ((nick erc-chess-partner)
 	  (msg (substring (car args) 0 (1- (length (car args))))))
-      (when (buffer-live-p buf)
-	(with-current-buffer buf
-	  (erc-send-ctcp-message nick (concat "CHESS " msg) t)))))
+      (erc-with-server-buffer
+	(erc-send-ctcp-message nick (concat "CHESS " msg) t))))
 
    (t
     (cond
@@ -109,7 +107,7 @@ This is the main handler for the erc-chess module."
       (let* ((buf (process-buffer erc-server-process))
 	     (nick (erc-downcase erc-chess-partner))
 	     (engine (current-buffer)))
-	(with-current-buffer (erc-server-buffer)
+	(erc-with-server-buffer
 	  (let ((elt (assoc nick erc-chess-alist)))
 	    (when (and elt (eq (nth 1 elt) engine))
 	      (message "Removed from erc-chess-alist in destroy event")
@@ -144,7 +142,7 @@ NICK should be the first and only arg to /chess"
   (cond
    ((string-match (concat "^\\s-*\\(" erc-valid-nick-regexp "\\)\\s-*$") line)
     (let ((nick (match-string 1 line)))
-      (with-current-buffer (erc-server-buffer)
+      (erc-with-server-buffer
 	(if (assoc (erc-downcase nick) erc-chess-alist)
 	    ;; Maybe check for correctly connected game, and switch here.
 	    (erc-display-message
diff --git a/erc-compat.el b/erc-compat.el
index ee9bf89..2d2e790 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -386,14 +386,6 @@ avoid corrupting the original SEQ."
 	(setq newseq (cons el newseq))))
     (nreverse newseq)))
 
-;; Provide a simpler replacement for `gensym'.
-(defvar *erc-sym-counter* 0)
-(defun erc-gensym ()
-  "Generate a new uninterned symbol."
-  (let ((num (prog1 *erc-sym-counter*
-	       (setq *erc-sym-counter* (1+ *erc-sym-counter*)))))
-    (make-symbol (format "*erc-sym-%d*" num))))
-
 ;; Copied from cl-extra.el
 (defun erc-subseq (seq start &optional end)
   "Return the subsequence of SEQ from START to END.
diff --git a/erc-dcc.el b/erc-dcc.el
index cf86205..82a8759 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -861,29 +861,29 @@ buffer, and sends back the replies after each block of data per the DCC
 protocol spec.  Well not really.  We write back a reply after each read,
 rather than every 1024 byte block, but nobody seems to care."
   (with-current-buffer (process-buffer proc)
-    (setq buffer-read-only nil) ;; FIXME
-    (goto-char (point-max))
-    (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
-         (erc-display-message
-          nil 'notice erc-server-process
-          'dcc-get-bytes-received
-          ?f (file-name-nondirectory buffer-file-name)
-          ?b (number-to-string erc-dcc-byte-count)))
-    (cond
-     ((and (> (plist-get erc-dcc-entry-data :size) 0)
-           (> erc-dcc-byte-count (plist-get erc-dcc-entry-data :size)))
-      (erc-display-message
-       nil '(error notice) 'active
-       'dcc-get-file-too-long
-       ?f (file-name-nondirectory buffer-file-name))
-      (delete-process proc))
-     (t
-      (process-send-string
-       proc (erc-pack-int erc-dcc-byte-count 4))))))
+    (let ((inhibit-read-only t))
+      (goto-char (point-max))
+      (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
+           (erc-display-message
+            nil 'notice erc-server-process
+            'dcc-get-bytes-received
+            ?f (file-name-nondirectory buffer-file-name)
+            ?b (number-to-string erc-dcc-byte-count)))
+      (cond
+       ((and (> (plist-get erc-dcc-entry-data :size) 0)
+             (> erc-dcc-byte-count (plist-get erc-dcc-entry-data :size)))
+        (erc-display-message
+         nil '(error notice) 'active
+         'dcc-get-file-too-long
+         ?f (file-name-nondirectory buffer-file-name))
+        (delete-process proc))
+       (t
+        (process-send-string
+         proc (erc-pack-int erc-dcc-byte-count 4)))))))
 
 
 (defun erc-dcc-get-sentinel (proc event)
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index a122908..8255b4b 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -127,8 +127,7 @@
 (define-ibuffer-column erc-away (:name "A")
   (if (and (boundp 'erc-server-process)
 	   (processp erc-server-process)
-	   (with-current-buffer (process-buffer erc-server-process)
-	     erc-away))
+	   (erc-away-time))
       "A"
     " "))
 
diff --git a/erc-list.el b/erc-list.el
index 2243a2f..fe83967 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -188,7 +188,7 @@ available channel)."
 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)
-  (with-current-buffer (erc-server-buffer)
+  (erc-with-server-buffer
     (erc-once-with-server-event
      321
      '(progn
diff --git a/erc-log.el b/erc-log.el
index 19e7205..e1b47c8 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -205,7 +205,7 @@ also be a predicate function. To only log when you are not set away, use:
 \(setq erc-enable-logging
       (lambda (buffer)
 	(with-current-buffer buffer
-	  (not erc-away))))"
+	  (null (erc-away-time)))))"
   ;; enable
   ((when erc-log-write-after-insert
      (add-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs))
@@ -218,8 +218,7 @@ also be a predicate function. To only log when you are not set away, use:
    ;; append, so that 'erc-initialize-log-marker runs first
    (add-hook 'erc-connect-pre-hook 'erc-log-setup-logging 'append)
    (dolist (buffer (erc-buffer-list))
-     (when (buffer-live-p buffer)
-       (with-current-buffer buffer (erc-log-setup-logging)))))
+     (with-current-buffer buffer (erc-log-setup-logging))))
   ;; disable
   ((remove-hook 'erc-insert-post-hook 'erc-save-buffer-in-logs)
    (remove-hook 'erc-send-post-hook 'erc-save-buffer-in-logs)
@@ -229,8 +228,7 @@ also be a predicate function. To only log when you are not set away, use:
    (remove-hook 'erc-part-hook 'erc-conditional-save-buffer)
    (remove-hook 'erc-connect-pre-hook 'erc-log-setup-logging)
    (dolist (buffer (erc-buffer-list))
-     (when (buffer-live-p buffer)
-       (with-current-buffer buffer (erc-log-disable-logging))))))
+     (with-current-buffer buffer (erc-log-disable-logging)))))
 
 (define-key erc-mode-map "\C-c\C-l" 'erc-save-buffer-in-logs)
 
diff --git a/erc-match.el b/erc-match.el
index 8d19099..5cc8eca 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -540,7 +540,7 @@ deactivate/activate match logging in the latter. See
     (when (and
 	   (or (eq erc-log-matches-flag t)
 	       (and (eq erc-log-matches-flag 'away)
-		    erc-away))
+		    (erc-away-time)))
 	   match-buffer-name)
       (let ((line (format-spec erc-log-match-format
 		   (format-spec-make
@@ -572,7 +572,7 @@ deactivate/activate match logging in the latter. See
 
 (defun erc-log-matches-come-back (proc parsed)
   "Display a notice that messages were logged while away."
-  (when (and erc-away
+  (when (and (erc-away-time)
 	     (eq erc-log-matches-flag 'away))
     (mapc
      (lambda (match-type)
@@ -583,7 +583,7 @@ deactivate/activate match logging in the latter. See
 				  (with-current-buffer buffer
 				    (get-text-property (1- (point-max))
 						       'timestamp))))
-		  (away-time     (erc-emacs-time-to-erc-time erc-away)))
+		  (away-time (erc-emacs-time-to-erc-time (erc-away-time))))
 	     (when (and away-time last-msg-time
 			(erc-time-gt last-msg-time away-time))
 	       (erc-display-message
diff --git a/erc-netsplit.el b/erc-netsplit.el
index 02fbe96..4e30df9 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -184,7 +184,7 @@ join from that split has been detected or not.")
 ;;;###autoload
 (defun erc-cmd-WHOLEFT ()
   "Show who's gone."
-  (with-current-buffer (erc-server-buffer)
+  (erc-with-server-buffer
     (if (null erc-netsplit-list)
 	(erc-display-message
 	 nil 'notice 'active
diff --git a/erc-networks.el b/erc-networks.el
index b79a56a..387ddbb 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -733,12 +733,12 @@ search for a match in `erc-networks-alist'."
 
 (defun erc-network ()
   "Return the value of `erc-network' for the current server."
-  (with-current-buffer (erc-server-buffer) erc-network))
+  (erc-with-server-buffer erc-network))
 
 (defun erc-current-network ()
   "Deprecated.  Use `erc-network' instead.  Return the name of this server's
 network as a symbol."
-  (with-current-buffer (erc-server-buffer)
+  (erc-with-server-buffer
     (intern (downcase (symbol-name erc-network)))))
 
 (erc-make-obsolete 'erc-current-network 'erc-network
@@ -746,7 +746,7 @@ network as a symbol."
 
 (defun erc-network-name ()
   "Returns the name of the current network as a string."
-  (with-current-buffer (erc-server-buffer) (symbol-name erc-network)))
+  (erc-with-server-buffer (symbol-name erc-network)))
 
 (defun erc-set-network-name (proc parsed)
   "Set `erc-network' to the value returned by `erc-determine-network'."
diff --git a/erc-notify.el b/erc-notify.el
index 1d2bdbd..1c9fc99 100644
--- a/erc-notify.el
+++ b/erc-notify.el
@@ -121,8 +121,7 @@ changes."
 	     (ison-list (delete "" (split-string
 				    (erc-response.contents parsed))))
 	     (new-list ison-list)
-	     (old-list (with-current-buffer (erc-server-buffer)
-			 erc-last-ison)))
+	     (old-list (erc-with-server-buffer erc-last-ison)))
 	(while new-list
 	  (when (not (erc-member-ignore-case (car new-list) old-list))
 	    (run-hook-with-args 'erc-notify-signon-hook server (car new-list))
@@ -204,7 +203,7 @@ with args, toggle notify status of people."
   (cond
    ((null args)
     ;; Print current notificated people (online)
-    (let ((ison (with-current-buffer (erc-server-buffer) erc-last-ison)))
+    (let ((ison (erc-with-server-buffer erc-last-ison)))
       (if (not ison)
 	  (erc-display-message
 	   nil 'notice 'active "No ison-list yet!")
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index efe2a18..31de8a4 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -180,7 +180,7 @@ the most recent speakers are listed first."
   (while (pcomplete-here (pcomplete-erc-nicks))))
 
 (defun pcomplete/erc-mode/UNIGNORE ()
-  (pcomplete-here (with-current-buffer (erc-server-buffer) erc-ignore-list)))
+  (pcomplete-here (erc-with-server-buffer erc-ignore-list)))
 
 ;;; Functions that provide possible completions.
 
@@ -233,7 +233,7 @@ If optional argument IGNORE-SELF is non-nil, don't return the current nick."
 (defun pcomplete-erc-all-nicks (&optional postfix)
   "Returns a list of all nicks on the current server."
   (let (nicks)
-    (with-current-buffer (process-buffer erc-server-process)
+    (erc-with-server-buffer
       (maphash (lambda (nick user)
                  (setq nicks (cons (concat nick postfix) nicks)))
                erc-server-users))
diff --git a/erc-speedbar.el b/erc-speedbar.el
index 254d7fc..2de2c57 100644
--- a/erc-speedbar.el
+++ b/erc-speedbar.el
@@ -113,7 +113,7 @@ This will add a speedbar major display mode."
   (erase-buffer)
   (let (serverp chanp queryp)
     (with-current-buffer buffer
-      (setq serverp (eq buffer (process-buffer erc-server-process)))
+      (setq serverp (erc-server-buffer-p))
       (setq chanp (erc-channel-p (erc-default-target)))
       (setq queryp (erc-query-buffer-p)))
     (cond (serverp
diff --git a/erc-spelling.el b/erc-spelling.el
index ed49758..d2e61e8 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -71,11 +71,7 @@ name here."
       (setq ispell-local-dictionary
             (if dicts
                 (cadr (car dicts))
-              (let ((server (erc-server-buffer)))
-                (if server
-                    (with-current-buffer server
-                      ispell-local-dictionary)
-                  nil))))))
+              (erc-with-server-buffer ispell-local-dictionary)))))
   (setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify)
   (flyspell-mode 1))
 
diff --git a/erc-stamp.el b/erc-stamp.el
index 5d43baa..7d8684a 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -147,7 +147,7 @@ or `erc-send-modify-hook'."
 	(error "Timestamp function unbound"))
       (when (and (fboundp erc-insert-away-timestamp-function)
 		 erc-away-timestamp-format
-		 (with-current-buffer (erc-server-buffer) erc-away)
+		 (erc-away-time)
 		 (not erc-timestamp-format))
 	(funcall erc-insert-away-timestamp-function
 		 (erc-format-timestamp ct erc-away-timestamp-format)))
diff --git a/erc.el b/erc.el
index a3a557b..a7952f4 100644
--- a/erc.el
+++ b/erc.el
@@ -357,6 +357,17 @@ nicknames with erc-server-user struct instances.")
 	      (cdr (assq (aref s (match-beginning 0)) c)))))
     s))
 
+(defmacro erc-with-server-buffer (&rest body)
+  "Execute BODY in the current ERC server buffer.
+If no server buffer exists, return nil."
+  (let ((buffer (make-symbol "buffer")))
+    `(let ((,buffer (erc-server-buffer)))
+       (when (buffer-live-p ,buffer)
+	 (with-current-buffer ,buffer
+	   ,@body)))))
+(put 'erc-with-server-buffer 'lisp-indent-function 0)
+(put 'erc-with-server-buffer 'edebug-form-spec '(body))
+
 (defstruct (erc-server-user (:type vector) :named)
   ;; User data
   nickname host login full-name info
@@ -383,14 +394,14 @@ in the current buffer's `erc-channel-users' hash table."
 (defsubst erc-get-server-user (nick)
   "Finds the USER corresponding to NICK in the current server's
 `erc-server-users' hash table."
-  (with-current-buffer (process-buffer erc-server-process)
+  (erc-with-server-buffer
     (gethash (erc-downcase nick) erc-server-users)))
 
 (defsubst erc-add-server-user (nick user)
   "This function is for internal use only.
 
 Adds USER with nickname NICK to the `erc-server-users' hash table."
-  (with-current-buffer (process-buffer erc-server-process)
+  (erc-with-server-buffer
     (puthash (erc-downcase nick) user erc-server-users)))
 
 (defsubst erc-remove-server-user (nick)
@@ -401,7 +412,7 @@ hash table.  This user is not removed from the
 `erc-channel-users' lists of other buffers.
 
 See also: `erc-remove-user'."
-  (with-current-buffer (process-buffer erc-server-process)
+  (erc-with-server-buffer
     (remhash (erc-downcase nick) erc-server-users)))
 
 (defun erc-change-user-nickname (user new-nick)
@@ -412,7 +423,7 @@ Changes the nickname of USER to NEW-NICK in the
 other buffers are also changed."
   (let ((nick (erc-server-user-nickname user)))
     (setf (erc-server-user-nickname user) new-nick)
-    (with-current-buffer (process-buffer erc-server-process)
+    (erc-with-server-buffer
       (remhash (erc-downcase nick) erc-server-users)
       (puthash (erc-downcase new-nick) user erc-server-users))
     (dolist (buf (erc-server-user-buffers user))
@@ -505,16 +516,15 @@ See also: `erc-sort-channel-users-by-activity'"
 
 (defun erc-get-server-nickname-list ()
   "Returns a list of known nicknames on the current server."
-    (if (erc-server-process-alive)
-	(with-current-buffer (erc-server-buffer)
-	  (let (nicks)
-	    (when (hash-table-p erc-server-users)
-	      (maphash (lambda (n user)
-			 (setq nicks
-			       (cons (erc-server-user-nickname user)
-				     nicks)))
-		       erc-server-users)
-	      nicks)))))
+  (erc-with-server-buffer
+    (let (nicks)
+      (when (hash-table-p erc-server-users)
+	(maphash (lambda (n user)
+		   (setq nicks
+			 (cons (erc-server-user-nickname user)
+			       nicks)))
+		 erc-server-users)
+	nicks))))
 
 (defun erc-get-channel-nickname-list ()
   "Returns a list of known nicknames on the current channel."
@@ -529,16 +539,15 @@ See also: `erc-sort-channel-users-by-activity'"
 
 (defun erc-get-server-nickname-alist ()
   "Returns an alist of known nicknames on the current server."
-    (if (erc-server-process-alive)
-	(with-current-buffer (erc-server-buffer)
-	  (let (nicks)
-	    (when (hash-table-p erc-server-users)
-	      (maphash (lambda (n user)
-			 (setq nicks
-			       (cons (cons (erc-server-user-nickname user) nil)
-				     nicks)))
-		       erc-server-users)
-	      nicks)))))
+  (erc-with-server-buffer
+    (let (nicks)
+      (when (hash-table-p erc-server-users)
+	(maphash (lambda (n user)
+		   (setq nicks
+			 (cons (cons (erc-server-user-nickname user) nil)
+			       nicks)))
+		 erc-server-users)
+	nicks))))
 
 (defun erc-get-channel-nickname-alist ()
   "Returns an alist of known nicknames on the current channel."
@@ -1271,7 +1280,7 @@ capabilities."
   (unless (erc-server-buffer-p)
     (error
      "You should only run `erc-once-with-server-event' in a server buffer"))
-  (let ((fun (erc-gensym))
+  (let ((fun (make-symbol "fun"))
 	(hook (erc-get-hook event)))
      (put fun 'erc-original-buffer (current-buffer))
      (fset fun `(lambda (proc parsed)
@@ -1294,7 +1303,7 @@ not be run.
 
 When FORMS execute, the current buffer is the server buffer associated with the
 connection over which the data was received that triggered EVENT."
-  (let ((fun (erc-gensym))
+  (let ((fun (make-symbol "fun"))
 	(hook (erc-get-hook event)))
      (fset fun `(lambda (proc parsed)
 		  (remove-hook ',hook ',fun)
@@ -1329,6 +1338,14 @@ If BUFFER is nil, the current buffer is used."
     (and (eq major-mode 'erc-mode)
 	 (null (erc-default-target)))))
 
+(defun erc-open-server-buffer-p (&optional buffer)
+  "Return non-nil if argument BUFFER is an ERC server buffer that
+has an open IRC process.
+
+If BUFFER is nil, the current buffer is used."
+  (and (erc-server-buffer-p)
+       (erc-server-process-alive)))
+
 (defun erc-query-buffer-p (&optional buffer)
   "Return non-nil if BUFFER is an ERC query buffer.
 If BUFFER is nil, the current buffer is used."
@@ -1341,7 +1358,7 @@ If BUFFER is nil, the current buffer is used."
 (defun erc-ison-p (nick)
   "Return non-nil if NICK is online."
   (interactive "sNick: ")
-  (with-current-buffer (erc-server-buffer)
+  (erc-with-server-buffer
     (let ((erc-online-p 'unknown))
       (erc-once-with-server-event
        303
@@ -1391,7 +1408,7 @@ server buffer")
 (defun erc-active-buffer ()
   "Return the value of `erc-active-buffer' for the current server.
 Defaults to the server buffer."
-  (with-current-buffer (erc-server-buffer)
+  (erc-with-server-buffer
     (if (buffer-live-p erc-active-buffer)
 	erc-active-buffer
       (setq erc-active-buffer (current-buffer)))))
@@ -1573,10 +1590,10 @@ See `erc-get-buffer' for details.
 See also `with-current-buffer'.
 
 \(fn (TARGET [PROCESS]) BODY...)"
-  (let ((buf (erc-gensym))
-	(proc (erc-gensym))
-	(target (erc-gensym))
-	(process (erc-gensym)))
+  (let ((buf (make-symbol "buf"))
+	(proc (make-symbol "proc"))
+	(target (make-symbol "target"))
+	(process (make-symbol "process")))
     `(let* ((,target ,(car spec))
 	    (,process ,(cadr spec))
 	    (,buf (if (bufferp ,target)
@@ -1586,7 +1603,7 @@ See also `with-current-buffer'.
 					  erc-server-process))))
 		      (if (and ,target ,proc)
 			  (erc-get-buffer ,target ,proc))))))
-       (when ,buf
+       (when (buffer-live-p ,buf)
 	 (with-current-buffer ,buf
 	   ,@body)))))
 (put 'erc-with-buffer 'lisp-indent-function 1)
@@ -1641,8 +1658,8 @@ FORMS will be evaluated in all buffers having the process PROCESS and
 where PRED matches or in all buffers of the server process if PRED is
 nil."
   ;; Make the evaluation have the correct order
-  (let ((pre (erc-gensym))
-	(pro (erc-gensym)))
+  (let ((pre (make-symbol "pre"))
+	(pro (make-symbol "pro")))
     `(let ((,pro ,process)
 	   (,pre ,pred))
        (mapcar (lambda (buffer)
@@ -1722,7 +1739,10 @@ all channel buffers on all servers."
 (make-variable-buffer-local 'erc-invitation)
 
 (defvar erc-away nil
-  "Non-nil indicates that we are away.")
+  "Non-nil indicates that we are away.
+
+Use `erc-away-time' to access this if you might be in a channel
+buffer rather than a server buffer.")
 (make-variable-buffer-local 'erc-away)
 
 (defvar erc-channel-list nil
@@ -1934,10 +1954,6 @@ Returns the buffer for the given server or channel."
     (erc-set-active-buffer buffer)
     ;; last invitation channel
     (setq erc-invitation nil)
-    ;; away flag
-    ;; Should only be used in session-buffers
-    (setq erc-away (let ((serverbuf (erc-server-buffer)))
-		     (and serverbuf (with-current-buffer serverbuf erc-away))))
     ;; Server channel list
     (setq erc-channel-list ())
     ;; login-time 'nick in use' error
@@ -2546,20 +2562,19 @@ If no USER argument is specified, list the contents of `erc-ignore-list'."
 	(erc-display-line
 	 (erc-make-notice (format "Now ignoring %s" user))
 	 'active)
-	(with-current-buffer (erc-server-buffer)
-	  (add-to-list 'erc-ignore-list user)))
-    (if (null (with-current-buffer (erc-server-buffer) erc-ignore-list))
+	(erc-with-server-buffer (add-to-list 'erc-ignore-list user)))
+    (if (null (erc-with-server-buffer erc-ignore-list))
 	(erc-display-line (erc-make-notice "Ignore list is empty") 'active)
       (erc-display-line (erc-make-notice "Ignore list:") 'active)
       (mapc #'(lambda (item)
 		(erc-display-line (erc-make-notice item)
 				  'active))
-	    (with-current-buffer (erc-server-buffer) erc-ignore-list))))
+	    (erc-with-server-buffer erc-ignore-list))))
   t)
 
 (defun erc-cmd-UNIGNORE (user)
   "Remove the user specified in USER from the ignore list."
-  (let ((ignored-nick (car (with-current-buffer (erc-server-buffer)
+  (let ((ignored-nick (car (erc-with-server-buffer
 			     (erc-member-ignore-case user erc-ignore-list)))))
     (if (null ignored-nick)
 	(erc-display-line
@@ -2568,7 +2583,7 @@ If no USER argument is specified, list the contents of `erc-ignore-list'."
       (erc-display-line
        (erc-make-notice (format "No longer ignoring %s" user))
        'active))
-    (with-current-buffer (erc-server-buffer)
+    (erc-with-server-buffer
       (setq erc-ignore-list (delete ignored-nick erc-ignore-list))))
   t)
 
@@ -2627,8 +2642,8 @@ If no reason is given, unset away status."
   "Mark the user as being away everywhere, the reason being indicated by LINE."
   ;; on all server buffers.
   (erc-with-all-buffers-of-server nil
-   #'erc-server-buffer-p
-   (erc-cmd-AWAY line)))
+    #'erc-open-server-buffer-p
+    (erc-cmd-AWAY line)))
 (put 'erc-cmd-GAWAY 'do-not-parse-args t)
 
 (defun erc-cmd-CTCP (nick cmd &rest args)
@@ -2820,10 +2835,9 @@ If SERVER is non-nil, use that, rather than the current server."
 
 (defun erc-cmd-IDLE (nick)
   "Show the length of time NICK has been idle."
-  (let ((serverbuf (erc-server-buffer))
-	(origbuf (current-buffer))
+  (let ((origbuf (current-buffer))
 	symlist)
-    (with-current-buffer serverbuf
+    (erc-with-server-buffer
       (add-to-list 'symlist
 		   (cons (erc-once-with-server-event
 			  311 `(string= ,nick
@@ -2981,8 +2995,8 @@ The rest of LINE is the message to send."
 (defun erc-cmd-NICK (nick)
   "Change current nickname to NICK."
   (erc-log (format "cmd: NICK: %s (erc-bad-nick: %S)" nick erc-bad-nick))
-  (let ((nicklen (cdr (assoc "NICKLEN" (with-current-buffer (erc-server-buffer)
-				    erc-server-parameters)))))
+  (let ((nicklen (cdr (assoc "NICKLEN" (erc-with-server-buffer
+					 erc-server-parameters)))))
     (and nicklen (> (length nick) (string-to-number nicklen))
 	 (erc-display-message
 	  nil 'notice 'active 'nick-too-long
@@ -3152,9 +3166,7 @@ the message given by REASON."
 
 (defun erc-cmd-GQUIT (reason)
   "Disconnect from all servers at once with the same quit REASON."
-  (erc-with-all-buffers-of-server nil #'(lambda ()
-					  (and (erc-server-buffer-p)
-					       (erc-server-process-alive)))
+  (erc-with-all-buffers-of-server nil #'erc-open-server-buffer-p
 				  (erc-cmd-QUIT reason)))
 
 (defalias 'erc-cmd-GQ 'erc-cmd-GQUIT)
@@ -3330,7 +3342,7 @@ The ban list is fetched from the server if necessary."
 	(setq erc-server-367-functions 'erc-banlist-store
 	      erc-channel-banlist nil)
 	;; fetch the ban list then callback
-	(with-current-buffer (erc-server-buffer)
+	(erc-with-server-buffer
 	  (erc-once-with-server-event
 	   368
 	   `(with-current-buffer ,chnl-name
@@ -3400,7 +3412,7 @@ Unban all currently banned users in the current channel."
       (let ((old-367-hook erc-server-367-functions))
 	(setq erc-server-367-functions 'erc-banlist-store)
       ;; fetch the ban list then callback
-      (with-current-buffer (erc-server-buffer)
+      (erc-with-server-buffer
 	(erc-once-with-server-event
 	 368
 	 `(with-current-buffer ,chnl
@@ -3769,7 +3781,7 @@ See also `erc-display-error-notice'."
     (setq erc-nick-change-attempt-count (+ erc-nick-change-attempt-count 1))
     (let ((newnick (nth 1 erc-default-nicks))
 	  (nicklen (cdr (assoc "NICKLEN"
-			       (with-current-buffer (erc-server-buffer)
+			       (erc-with-server-buffer
 				 erc-server-parameters)))))
       (setq erc-bad-nick t)
       ;; try to use a different nick
@@ -4291,8 +4303,10 @@ See also `erc-display-message'."
   nil)
 
 (defun erc-process-away (proc away-p)
-  ;; FIXME: This docstring is AWFUL -- Lawrence 2004-01-08
-  "Process the user being away, or returning from an away break."
+  "Toggle the away status of the user depending on the value of AWAY-P.
+
+If nil, set the user as away.
+If non-nil, return from being away."
   (let ((sessionbuf (process-buffer proc)))
     (when sessionbuf
       (with-current-buffer sessionbuf
@@ -4304,14 +4318,12 @@ See also `erc-display-message'."
 			  erc-nick)))
 	(cond
 	 (away-p
-	  (erc-with-all-buffers-of-server proc nil
-					  (setq erc-away (current-time))))
+	  (setq erc-away (current-time)))
 	 (t
 	  (let ((away-time erc-away))
 	    ;; away must be set to NIL BEFORE sending anything to prevent
 	    ;; an infinite recursion
-	    (erc-with-all-buffers-of-server proc nil
-					    (setq erc-away nil))
+	    (setq erc-away nil)
 	    (save-excursion
 	      (set-buffer (erc-active-buffer))
 	      (when erc-public-away-p
@@ -4993,8 +5005,9 @@ strings over to the next call."
 
 (defun erc-set-current-nick (nick)
   "Set the current nickname to NICK."
-  (with-current-buffer (or (erc-server-buffer)
-			   (current-buffer))
+  (with-current-buffer (if (buffer-live-p (erc-server-buffer))
+			   (erc-server-buffer)
+			 (current-buffer))
     (setq erc-server-current-nick nick)))
 
 (defun erc-current-nick ()
@@ -5074,7 +5087,7 @@ The previous default target of QUERY type gets removed"
 Takes a full SPEC of a user in the form \"nick!login@host\", and
 matches against all the regexp's in `erc-ignore-list'.  If any
 match, returns that regexp."
-  (dolist (ignored (with-current-buffer (erc-server-buffer) erc-ignore-list))
+  (dolist (ignored (erc-with-server-buffer erc-ignore-list))
     (if (string-match ignored spec)
 	;; We have `require'd cl, so we can return from the block named nil
 	(return ignored))))
@@ -5629,12 +5642,12 @@ entry of `channel-members'."
 			     ""))
 	user))))
 
-(defun erc-away-p ()
-  "Return t if the current ERC process is set away."
-  (save-excursion
-    (and (erc-server-buffer-live-p)
-	 (set-buffer (process-buffer erc-server-process))
-	 erc-away)))
+(defun erc-away-time ()
+  "Return non-nil if the current ERC process is set away.
+
+In particular, the time that we were set away is returned.
+See `current-time' for details on the time format."
+  (erc-with-server-buffer erc-away))
 
 ;; Mode line handling
 
@@ -5741,18 +5754,14 @@ format-time-message."
 (defun erc-format-away-status ()
   "Return a formatted `erc-mode-line-away-status-format'
 if `erc-away' is non-nil."
-  (let ((a (when (erc-server-buffer-live-p)
-	     (with-current-buffer (process-buffer erc-server-process)
-	       erc-away))))
+  (let ((a (erc-away-time)))
     (if a
 	(format-time-string erc-mode-line-away-status-format a)
       "")))
 
 (defun erc-format-channel-modes ()
   "Return the current channel's modes and the estimated lag."
-  (let ((lag (when (erc-server-buffer-live-p)
-	       (with-current-buffer (process-buffer erc-server-process)
-		 erc-server-lag))))
+  (let ((lag (erc-with-server-buffer erc-server-lag)))
     (concat (apply 'concat
 		   "(+" erc-channel-modes)
 	    (cond ((and erc-channel-user-limit erc-channel-key)
@@ -6204,8 +6213,7 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
 	       (lambda ()
 		 (and (string-equal erc-session-server host)
 		      (= erc-session-port port)
-		      erc-server-connected
-		      (eq (erc-server-buffer) (current-buffer))))))))
+		      (erc-open-server-buffer-p)))))))
     (with-current-buffer (or server-buffer (current-buffer))
       (if (and server-buffer channel)
 	  (erc-cmd-JOIN channel)



From MAILER-DAEMON Wed Oct 17 10:36:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0P-00038p-5F
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRz-000763-8F
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRw-00073m-LZ
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP0-00053T-Cf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
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@hcoop.net>) id 1IgvOz-0003yr-Ia
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOy-00057k-TP
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:32 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOy-0005vt-Vf
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOy-0005vt-Vf@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:32 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Merged from erc--emacs--22
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, 14 Oct 2007 04:51:39 -0000

commit 1e95fcd18630e9eb8f8b37b6f8fbd9ef524937da
Merge: e2faae9... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Nov 20 02:08:44 2006 +0000

    Merged from erc--emacs--22
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-16
       Apply changes made to ERC in Emacs 22
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-61

diff --cc ChangeLog
index e665922,cef3944..c5b800f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,1067 -1,12 +1,1084 @@@
 +2006-11-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el: Save all log buffers when Emacs exits, in case
 +	someone ignores the warning about open processes.  Remove the
 +	advice code in the commentary.
 +	(erc-save-query-buffers): Docfix.
 +	(erc-log-save-all-buffers): New function that saves all ERC
 +	buffers to logs.
 +	(erc-current-logfile): Fix bug in filename selection, where the
 +	current buffer was erroneously being preferred over the given
 +	buffer.
 +
 +2006-11-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-string-to-port): Avoid error when a numerical port
 +	is passed.  Thanks to Zekeriya KOÇ for the report.
 +
++2006-11-08  "Łukasz Demianiuk"  <ldemianiuk@gmail.com> (tiny change)
++
++	* erc.el (erc-header-line): Fix typo.
++
++2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
++
++	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
++
++	* erc.el (read-passwd):
++	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
++	* erc-truncate.el (truncate): Fix typo in docstring.
++
 +2006-10-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
 +	first loading iswitchb.  Thanks to Leo for the report.
 +
 +2006-10-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-default-port): Make the default be 6667 instead of
 +	ircd. since Mac OS X apparently has problems with looking up that
 +	port name.
 +
 +	* erc-backend.el (353): Receive names after displaying the initial
 +	message, instead of before.
 +
 +2006-10-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-my-nick-face): New face.
 +	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
 +	fixes a bug where the :full-name argument passed to the function
 +	was not respected.
 +	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
 +	make it easier to find messages you sent in conversations when
 +	`erc-show-my-nick' is non-nil.
 +	(erc-compute-server): Doc fix.
 +
 +2006-09-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
 +	parenthesis.  Thanks to Stephan Stahl for the report.
 +
 +2006-09-10  Eric Hanchrow  <offby1@blarg.net>
 +
 +	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
 +	instead of a single user.
 +
 +2006-09-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-generate-new-buffer-name): If this is a server
 +	buffer and a process exists already, create a new buffer.
 +	(erc-open): If the IRC session was continued, restore the old
 +	point.  Thanks to Stephan Stahl for the report.
 +	(erc-member-ignore-case): Coding style tweak.
 +	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
 +	find the user listed verbatim, try to match them against the list
 +	using string-match.  In this case, prompt as to whether the regexp
 +	should be removed.
 +	(erc-ignored-user-p): Remove CL-ism.
 +
 +	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
 +	whether we are already away.
 +
 +	* erc-menu.el: Fix potential compiler warning.
 +
 +2006-09-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: Updated Commentary and URL.
 +	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
 +	(erc-arrange-session-in-multiple-windows): No need to check if
 +	`erc-server-process' is bound.
 +	(erc-server-buffer-live-p): Doc fix.
 +	(erc-part-from-channel): Don't use any initial contents at prompt.
 +	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
 +	(s367): Fixed to support only banmask and channel which is the
 +	standard.  Also, there's no reason to add a message to each banned
 +	user entry trying to persuade the user to use /banlist instead of
 +	/mode #channel +b.  That part of the message was a little
 +	confusing, anyways.
 +	(s367-set-by): New catalog entry.  The user who set the ban and
 +	the time of ban seem to be specific to only certain servers such
 +	as freenode.
 +
 +	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
 +
 +	* erc-backend.el (erc-server-process-alive): No need to check if
 +	`erc-server-process' is bound.
 +	(367): Use s367 or s367-set-by where appropriate.
 +
 +	* erc-compat.el: Fixed URL.
 +
 +	* erc-dcc.el: Updated copyright years.  Added Usage section.
 +	Changed supported Emacs version number from 21.3.50 to 22 in
 +	Commentary.
 +
 +	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
 +	to check if `erc-server-process' is bound.
 +
 +	* erc-nicklist.el: Added to the Commentary section an explanation
 +	that `erc-nicklist-quit' should be called from within the nicklist
 +	buffer.  Set file coding to utf-8 so a contributor's name is
 +	displayed correctly.
 +	(erc-nicklist-icons-directory): Use customize type directory
 +	instead of string.
 +	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
 +	if it wasn't found.  This fixes a bug where an error would occur
 +	when using `string=' on bbdb-nick if it was nil.
 +
 +	* erc-replace.el: Removed URL from file information since it
 +	doesn't exist.
 +
 +	* erc-sound.el: Updated copyright years.  Fixed Commentary and
 +	added Usage section.
 +	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
 +	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
 +	definitions.
 +	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
 +	(erc-ctcp-query-SOUND): Doc fix.
 +	(erc-play-command): Removed, not necessary anymore.
 +	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
 +	higher in code, added docstring.
 +	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
 +	as well since version 21 or earlier.  Removed commented-out older
 +	version of function.
 +
 +	* NEWS: Fixed formatting, added channel tracking change.
 +
 +	* README: Fixed typo.  Added more information to Installation
 +	section.  Updated URL.
 +
 +2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: M-x erc RET can now be used to start ERC.
 +	(erc-open): Renamed from `erc'.
 +	(erc-before-connect): Change erc-select to erc.
 +	(erc): Renamed from `erc-select'.  Use `erc-open'.
 +	(erc-select): Defined as alias of `erc'.
 +	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
 +	(erc-select-ssl): Defined as alias of `erc-ssl'.
 +	(erc-cmd-SERVER): Use `erc'.
 +	(erc-query, erc-handle-irc-url): Use `erc-open'.
 +
 +	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc'.
 +
 +	* erc-networks.el: Updated copyright years.
 +	(erc-server-select): Use keyword arguments when calling `erc'.
 +
 +	* erc.texi (Getting Started, Connecting): Changed erc-select to
 +	erc.
 +
 +	* README: Changed erc-select to erc.
 +
 +	* NEWS: Added note about these changes.
 +
 +	* FOR-RELEASE: Marked this item as done.
 +
 +2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
 +	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
 +	properties to channel name.
 +
 +2006-08-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd): New customization group.
 +	(erc-identd-port): New option that specifies the port to use if
 +	none is given as an argument to erc-identd-start.
 +	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
 +	instead of erc-identd-start so that we deal with the different
 +	meaning of the first argument.
 +	(erc-identd-start): Use erc-identd-port.
 +	(erc-identd-quickstart): New function that ignores any arguments
 +	and calls erc-identd-start.
 +
 +	* erc.el (erc-with-server-buffer): New macro that switches to the
 +	current ERC server buffer and runs some code.  If no server buffer
 +	is available, return nil.  This is a useful way to access
 +	variables in the server buffer.
 +	(erc-get-server-user, erc-add-server-user)
 +	(erc-remove-server-user, erc-change-user-nickname)
 +	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
 +	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
 +	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
 +	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
 +	(erc-format-channel-modes): Use it.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
 +	instead of gensym.
 +	(erc-open-server-buffer-p): New function that returns non-nil if
 +	the given buffer is an ERC server buffer that has an open IRC
 +	process.
 +	(erc-with-buffer): Use buffer-live-p here to set a good example,
 +	though it isn't really needed here.
 +	(erc-away): Mention erc-away-time.
 +	(erc): Don't propagate the erc-away setting, since it makes more
 +	sense to access it from the server buffer.  Set up the prompt
 +	before connecting rather than after.  Run erc-connect-pre-hook
 +	with the buffer as an argument, instead of no arguments.
 +	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
 +	erc-server-buffer-p so that only open connections are set away.
 +	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
 +	(erc-process-away): Docfix.  Don't set erc-away in channel
 +	buffers.
 +	(erc-set-current-nick): Make this uniform with the style used in
 +	erc-current-nick.
 +	(erc-away-time): Rename from erc-away-p, since this is no longer a
 +	boolean-style predicate.
 +	(erc-format-away-status): Use it.
 +	(erc-initialize-log-marker): Accept a `buffer' argument.
 +	(erc-connect-pre-hook): Docfix.
 +	(erc-connection-established): Make sure this runs in the correct
 +	buffer.
 +	(erc-set-initial-user-mode): Accept a `buffer' argument.
 +
 +	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
 +
 +	* erc-spelling.el (erc-spelling-init): Use
 +	erc-with-server-buffer.  Accept `buffer' argument.
 +	(spelling): Call erc-spelling-init with the `buffer' argument.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
 +	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
 +
 +	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
 +	erc-with-server-buffer.
 +
 +	* erc-networks.el (erc-network, erc-current-network)
 +	(erc-network-name): Use erc-with-server-buffer.
 +
 +	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
 +
 +	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
 +	erc-away-time.
 +
 +	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
 +	Pass `buffer' argument to erc-log-setup-logging instead of setting
 +	the current buffer.  Ditto for erc-log-disable-logging.
 +	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
 +	argument.
 +
 +	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
 +
 +	* erc-ibuffer.el (erc-away): Use erc-away-time.
 +
 +	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
 +	read only instead of permanently doing so.
 +
 +	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
 +	Emacs Lisp has make-symbol, which is better.
 +
 +	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
 +	erc-with-server-buffer.
 +
 +	* erc-capab.el (capab-identify): Only deal with server buffers
 +	that have an open IRC process.
 +	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
 +
 +	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
 +	`erc-server-process-alive' function.
 +	(erc-coding-system-for-target): Supply a default target if one is
 +	not given.
 +	(erc-server-send): Simplify slightly.
 +	(erc-call-hooks): Use erc-with-server-buffer.
 +	(erc-server-connect, erc-server-setup-periodical-ping): Accept
 +	`buffer' argument.
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
 +	higher to avoid an automatic load snafu.
 +	(erc-autoaway-some-server-buffer): New function that returns an
 +	ERC server buffer with a live connection, or nil otherwise.
 +	(erc-autoaway-insinuate-maybe): New function that adds the
 +	autoaway reset function to post-command-hook if at least one ERC
 +	process is alive.
 +	(erc-autoaway-remove-maybe): New function that removes the
 +	autoaway reset function from post-command-hook if no ERC process
 +	is alive.
 +	(autoaway): Don't touch post-command-hook unless an IRC process is
 +	already open.  Remove our addition to post-command-hook as soon as
 +	there are no more IRC processes open.  Reset the indicators before
 +	connecting to an IRC server, which fixes a bug when re-connecting.
 +	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
 +	there are no more IRC processes open.
 +	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
 +	argument which is a function call if we can't find one.
 +	(erc-autoaway-some-open-server-buffer): New function which returns
 +	an ERC server buffer with an open connection and a user that is
 +	not away.
 +	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
 +	(erc-autoaway-set-away): Accept a `notest' argument which is used
 +	to avoid testing the same thing twice.
 +	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
 +	higher in file to fix byte-compile warning.
 +
 +2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
 +	`erc-server-reconnect-p' check all condition cases.
 +	(erc-server-reconnect-p): Moved rest of checks from
 +	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
 +
 +2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
 +	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
 +	avoid confusion with rcirc and other clients.
 +
 +	* erc-backend.el (erc-server-banned): New variable.
 +	(erc-server-connect): Set `erc-server-banned' to nil.
 +	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
 +	(erc-server-reconnect-p): New function.  Return non-nil if the
 +	user wants automatic reconnects and if the user has not been
 +	banned from the server.  This should fix a bug where ERC gets into
 +	a loop trying to reconnect with no way to stop it when the user is
 +	denied access to the server due to a server ban.  It might also
 +	help when Tor users are blocked from freenode if freenode servers
 +	send the 465 message before disconnecting.
 +	(465): Handle "banned from server" error notices.
 +
++2006-08-13  Romain Francoise  <romain@orebokech.com>
++
++	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
++	prompt with a space.
++
 +2006-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-timed-out): New variable that
 +	indicates whether the current connection has timed out due to
 +	failure to respond to a ping.
 +	(erc-server-send-ping): Set erc-server-timed-out to t.
 +	(erc-server-connect): Initialize erc-server-timed-out to nil.
 +	(erc-process-sentinel-1): Consult erc-server-timed-out.
 +
 +2006-08-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
 +	avoid errors when inserting disconnect messages and other messages
 +	that begin with newlines.
 +
 +2006-08-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
 +	in several places instead of inserting text.
 +	(erc-process-sentinel): Move to the input-marker before removing
 +	the prompt.
 +
 +	* erc.el (erc-port): Fix customization options.
 +	(erc-display-message): Handle null type explicitly.  Previously,
 +	this was relying on a chance side-effect.  Cosmetic indentation
 +	tweak.
 +	(english): Add 'finished and 'terminated entries to the catalog.
 +	Add initial and terminal newlines to 'disconnected and
 +	'disconnected-noreconnect entries.  Avoid long lines.
 +	(erc-cmd-QUIT): Bind the current erc-server-process to
 +	server-proc.  If the IRC server responds quickly, it is possible
 +	for the connection to close, and hence server buffer to be killed,
 +	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
 +	problem.
 +
 +2006-08-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-send-queue): Update from Circe
 +	version of this function.
 +	(erc-server-ping-timer-alist): New variable that keeps track of
 +	ping timers according to their associated server.
 +	(erc-server-last-received-time): New variable that specifies the
 +	time of the last message we received from the server.  This is
 +	used to detect hung processes.
 +	(erc-server-send-ping): New function that sends a ping to the IRC
 +	process corresponding with the given buffer.  Split from
 +	erc-server-setup-periodical-ping.  If the server buffer no longer
 +	exists, cancel the timer.  If the server process has not given us
 +	a message, including PING responses, since the last PING, kill it.
 +	This is necessary to deal with some aberrant freenode behavior.
 +	Idea taken from rcirc.
 +	(erc-server-setup-periodical-ping): Rename from
 +	erc-server-setup-periodical-server-ping.
 +	(erc-server-filter-function): Use erc-current-time instead of
 +	current-time.
 +
 +	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 +	multi-tty Emacs.
 +	(erc-select-startup-file): Fix bug introduced by recent change.
 +	(erc-cmd-QUIT): If the IRC process has not terminated itself
 +	within 4 seconds of completing our quit-hook, kill it manually.
 +	Freenode in particular needs this.
 +	(erc-connection-established): Use erc-server-setup-periodical-ping
 +	instead of erc-server-setup-periodical-server-ping.
 +
 +2006-08-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-standardize-name): New function that returns
 +	a filename that is safe for use for a log file.
 +	(erc-current-logfile): Use it.
 +
 +	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 +	since that is a fairly standard directory.
 +	(erc-select-startup-file): Re-write to use
 +	convert-standard-filename, which will ensure that MS-DOS systems
 +	look for the _ercrc.el file.
 +
 +2006-08-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.4.
 +
 +	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
 +
 +	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 +	to the wrong buffer.  Thanks to offby1 for the report.
 +
 +	* erc-backend.el (erc-coding-system-for-target): Handle case where
 +	target is nil.  Thanks to Kai Fan for the patch.
 +
 +2006-07-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 +	buffer.  It will be saved automatically killed.  Thanks to Johan
 +	Bockgård and Tassilo Horn for pointing this out.
 +
 +2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (define-erc-module): Make find-function and find-variable
 +	find the names constructed by `define-erc-module' in Emacs 22.
 +
 +2006-07-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (log): Make sure that we enable logging on
 +	already-opened buffers as well, in case the user toggles this
 +	module after loading ERC.  Also be sure to remove logging ability
 +	from all ERC buffers when the module is disabled.
 +	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 +	the empty string.  This should fix some errors that occur when
 +	quitting Emacs without first killing all ERC buffers.
 +	(erc-log-disable-logging): New function that removes the logging
 +	ability from the current buffer.
 +
 +	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
 +
 +2006-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 +	than call toggle-read-only.
 +
 +	* Makefile (debrelease-mwolson): Remove and consolidate with the
 +	`debrelease' target.
 +	(debrevision): Rename from `debrevision-mwolson'.
 +
 +	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
 +	add autoload cookie.
 +
 +2006-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.3.
 +
 +	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
 +
 +	* servers.pl: Add copyright notice.
 +
 +	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 +	from being set automatically away and current buffer is not an ERC
 +	buffer.
 +
 +	* erc-identd.el: Fix compiler error.
 +
 +	* erc.texi (Development): Use @subheading instead of @subsection.
 +	(Advanced Usage): Add menu.
 +	(Connecting): Fully document how to connect to an IRC server.
 +	(Options, Tips and Tricks, Sample Configuration): New unwritten
 +	sections.
 +
 +	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 +	(erc-user-full-name, erc-password): Docfixes and customization
 +	interface tweaks.
 +	(erc-try-new-nick-p): Rename from
 +	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 +	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 +	of `erc-nick-uniquifier', in case someone wants multiple
 +	characters.
 +	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 +	(erc-compute-port): Docfixes.
 +
 +	* FOR-RELEASE: Put in future-first order.
 +
 +	* erc-log.el (log): Move all add-hook calls here, rather than
 +	executing them immediately, and also cause them to be un-hooked
 +	when the module is removed.
 +	(erc-save-buffer-on-part): Move next to
 +	`erc-save-queries-on-quit'.
 +	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 +	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 +	nil.  This makes things fast, but reasonably failsafe, by default.
 +
 +2006-07-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 +	default, since most IRC clients don't do this.
 +	(erc-log-write-after-send): New option that determines whether the
 +	log file will be written to after every sent message.
 +	(erc-log-write-after-insert): New option that determines whether
 +	the log file will be written to when new text is added to a logged
 +	ERC buffer.
 +	(log): Use the aforementioned options.
 +
 +	* erc.texi (Modules): Document the "completion" module.
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 +	have a nil element in the list when ignore-self is non-nil.
 +
 +2006-07-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Use `set' instead of `set-default', since
 +	this setting should never be buffer-local.  Add the `list' and
 +	`page' modules to the list.
 +
 +	* erc.texi (Modules): Add entries for `list' and `page' modules.
 +	Change "spell" to "spelling".
 +	(History): Use past tense throughout.
 +
 +2006-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 +	can happen when doing /PART.
 +
 +	* erc.el (erc-quit-reason-various-alist)
 +	(erc-part-reason-various-alist): In the example, use "^$" as an
 +	example, since "" matches anything.
 +	(erc-quit-reason-various, erc-part-reason-various): If no argument
 +	is given, and no matches are found, use our default reason instead
 +	of "nil".
 +
 +2006-07-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd-start): XEmacs defines neither
 +	`make-network-process' nor `open-network-stream-server', so just
 +	fail silently.
 +
 +2006-06-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* HISTORY: Update.
 +
 +	* erc.texi (Modules): Mention identd.
 +	(Releases): Update mailing list address and download location.
 +	(Development): Refactor.  Provide updated directions for Arch.
 +	Make URLs clickable.
 +	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 +	(Getting Started): Give simpler example.  We do not need to
 +	explicitly load every module.
 +	(History): Update.
 +
 +	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 +	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 +	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 +	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 +	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 +	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 +	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 +	erc.el: Remove version strings.
 +
 +	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 +	module versions anymore.
 +	(erc-version-modules): Remove, since we do not use this function
 +	anymore.
 +	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 +	was only useful back when ERC consisted of one file.
 +	(erc-modules): Add line for identd.
 +	(erc-get-channel-mode-from-keypress): Typo fix.
 +
 +	* erc-imenu.el: Remove unnecessary lines in header.
 +
 +	* erc-goodies.el (erc-handle-irc-url): Docfix.
 +
 +	* erc-identd.el: Define an ERC module for this.
 +	(erc-identd-start): Don't create a process buffer if possible.
 +	Otherwise, use conventional hidden names for process buffers.
 +
 +2006-06-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-coding-system-for-target): Match
 +	case-insensitively.  Use a pattern match instead of `assoc', as
 +	per the documentation for `erc-encoding-coding-alist'.
 +
 +	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 +
 +2006-06-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Update maintainer information and URLs.
 +
 +2006-06-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (upload): Make this work with the GNU upload system.
 +
 +2006-06-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-active-buffer): If the active buffer has been
 +	deleted, default to the server buffer.
 +	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 +	control really toggle, not unconditionally turn off.
 +
 +2006-06-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add items since the 5.1.2 release.
 +
 +	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 +	indicates whether the current away status was caused by this
 +	module.
 +	(erc-autoaway-set-back): Only set back if this module set the user
 +	away.
 +	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 +	(erc-autoaway-reset-indicators): New function that resets some
 +	indicators when the user is no longer away.
 +	(autoaway): Add the above function to the 305 hook.
 +
 +2006-06-05  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc.texi (History): Fix various typos.
 +
 +2006-06-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 +	definition of the autoaway module.
 +	(autoaway): Don't do anything if erc-autoaway-idle-method is
 +	unbound.  This prevents an error on startup.
 +
 +2006-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 +	(erc-autoaway-idle-method): Renamed from
 +	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 +	how to do this, so it's best to make this take symbol values.
 +	Improve documentation.  Remove warning against Emacs idle-time;
 +	the point is moot now that we get user idle time via a different
 +	method.  Make sure we disable and re-enable the module when
 +	changing this value.
 +	(autoaway): Conditionalize on the above option.  If using the idle
 +	timer or user idle methods, don't add anything to the
 +	send-completed or server-001 hooks, since it is unnecessary.
 +	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 +	Docfix.
 +	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 +	(erc-autoaway-reset-idle-irc): Renamed from
 +	`erc-autoaway-reset-idle'.  Don't pass line to
 +	`erc-autoaway-set-away', since it is not used.
 +	(erc-autoaway-reset-idle-user): New function that resets the idle
 +	state for user idle time.
 +	(erc-autoaway-set-back): Remove line argument, since it is not
 +	used.
 +
 +	* Makefile (upload): Make this work for Savannah uploads.
 +
 +	* AUTHORS: Update for Savannah move.  No old entries have been
 +	removed, in case people have not registered yet on Savannah.
 +
 +2006-06-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 +	this are live.
 +
 +2006-05-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* README: Add License information.  Permit images to be used,
 +	distributed, and modified without restriction.
 +
 +2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 +
- 	* erc-goodies.el: (erc-handle-irc-url): New function, suitable as
++	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
 +	a value for `url-irc-function'.
 +
 +2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 +	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 +	current nickname.  Doc fix.
 +	(pcomplete/erc-mode/complete-command): Don't complete the current
 +	nickname.
 +
 +2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 +	build date as it's shown in `emacs-version'.
 +
 +	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 +	with the same face property as the previous character.
 +
 +2006-04-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 +	erc.el: Make sure to include a newline inside of negated classes,
 +	so that a newline is not matched.
 +
 +2006-04-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-connect-function): Don't try to
 +	detect the existence of the `open-network-stream-nowait' function,
 +	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 +
 +2006-03-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.texi: Update direntry.  Remove unneeded local variables.
 +
 +2006-03-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-header-line): New face that will be used to colorize
 +	the text of the header-line, provided that
 +	`erc-header-line-face-method' is non-nil.
 +	(erc-prompt-face): Fix formatting.
 +	(erc-header-line-face-method): New option that determines the
 +	method used for colorizing header-line text.  This may be a
 +	function, nil, or non-nil.
 +	(erc-update-mode-line-buffer): Use the aforementioned option and
 +	face to colorize the header-line text, if that is what the user
 +	wants.
 +	(erc-send-input): If flood control is not activated, don't split
 +	the input line.
 +
 +2006-03-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 +	that fixes the case where there is no leading whitespace.  Only
 +	remove the first space character, though.
 +
 +	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 +	erc-identd-process is set properly.
 +	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 +	(erc-identd-start): Pass :host parameter so this works with Emacs
 +	22.
 +
 +2006-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Nelson Ferreira.  Change contact address.
 +
 +	* erc-bbdb.el: Install patch from Nelson Ferreira.
 +	(erc-bbdb-electric-p): New option that indicates whether to make
 +	the BBDB buffer electric.  Defaults to "not electric".
 +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
 +
 +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
 +	<C-tab> for `erc-button-previous' as it is a more standard key
 +	binding for this type of function.
 +
 +2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Removed things that were accidentally committed on
 +	2006-02-20.  Removed Todo section.
 +	(erc-capab-unidentified): Removed.
 +
 +2006-02-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 +	(erc-capab-unidentified): Fix compiler warning by specifying
 +	group.
 +
 +2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 +	to explain thoughts better.  `erc-server-parameters' is an
 +	associated list when it's set, not a string.
 +
 +2006-02-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +	parameters are strings before using them.  Thanks to Alejandro
 +	Benitez for the report.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.2.
 +
 +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +	<C-tab>.
 +	(erc-button-previous): New function.
 +
 +2006-02-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add category for ERC 5.2.
 +
 +	* erc.el (erc): Move to the end of the buffer when a continued
 +	session is detected.  Thanks to e1f and indio for the report and
 +	testing a potential fix.
 +
 +2006-02-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Prepare a new Debian package.
 +
 +	* Makefile (debprepare): New rule that creates an ERC snapshot
 +	directory for use in both new Debian releases and revisions for
 +	Debian packages.
 +	(debrelease, debrevision-mwolson): Use debprepare.
 +
 +	* NEWS: Bring up-to-date.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
 +	timestamps before rather than after erc-fill-column when
 +	erc-timestamp-right-column is nil.  This way we won't surprise
 +	anyone unpleasantly, or so it is hoped.
 +
 +2006-02-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 +
 +2006-02-12  Michael Olson  <mwolson@gnu.org>
 +
- 	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el,
- 	erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el,
- 	erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el,
- 	erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el,
- 	erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el,
- 	erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el,
- 	erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el: Add
- 	2006 to copyright years, to comply with the changed guidelines.
++	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
++	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
++	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
++	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
++	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
++	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
++	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
++	Add 2006 to copyright years, to comply with the changed guidelines.
 +
 +2006-02-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Handle erc-capab-identify
 +	correctly.  Make some requirements shorter, so that it's easier to
 +	see why they are needed.
 +
 +	* erc-capab.el: Add autoload cookie for capab-identify.
 +	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 +	Minor whitespace fix in code.
 +
 +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
 +	whether we are in Emacs 22, and using X.  Improve documentation.
 +	(erc-insert-aligned): Remove calculation of offset, since
 +	:align-to pos works after all.  Unlike the previous solution, this
 +	one works when erc-stamp.el is compiled.
 +	(erc-insert-timestamp-right): Don't add length of string, and then
 +	later remove its displayed width.  This puts timestamps after
 +	erc-fill-column when erc-timestamp-right-column is nil, rather
 +	than before it.  It also fixes a subtle bug.  Remove use of
 +	`current-window', since there is no variable by that name in
 +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
 +	`erc-fill-column' is non-nil before using it.
 +
 +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Define `list' module which sets the alias
 +	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 +	`erc-list-channels-simple' when disabled.
 +	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 +	(erc-list-channels-simple): New function.
 +
 +	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 +	`capab-identify' description.  Moved customization options left in
 +	source code.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 +
 +	* erc-capab.el: Put a little more detail into Usage section.
 +	(define-erc-module): Run `erc-capab-identify-setup' in all open
 +	server buffers when enabling.
 +	(erc-capab-identify-setup): Make PROC and PARSED optional
 +	arguments.
 +	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 +	should now also match nicknames that are formatted differently
 +	than the default.
 +
 +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 +	before calling `with-current-buffer'.
 +
 +2006-02-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debbuild): Split from debrelease.
 +	(debrevision-mwolson): New rule that causes a Debian revision to
 +	be built.
 +
 +	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 +	Johan Bockgård.
 +	(erc-modules): Change use of 'pcomplete to 'completion.
 +
 +2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Require erc.
 +	(erc-capab-send-identify-messages): Use `erc-server-send'.
 +	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 +	the flags so we can also check whether the `erc-identified' text
 +	property is there at all.
 +	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 +	This fixes a bug where the prefix wasn't inserted when timestamps
 +	are inserted on the right.  Tweaked nickname regexp.
 +	(erc-capab-find-parsed): New function.
 +	(erc-capab-get-unidentified-nickname): Updated to check for 0
 +	flag.  Only get nickname if there's a nickuserhost associated with
 +	this message.
 +
 +	* erc-capab.el: New file.  Adds the new module
 +	`erc-capab-identify', which allows flagging of unidentified users
 +	on servers running an ircd based on dancer - irc.freenode.net, for
 +	example.
 +
 +	* erc.el (erc-modules): Added `capab-identify' to options.
 +	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 +	(erc-version-string): Remove "(CVS)".
 +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
 +	connections work as expected.  Connecting with `open-tls-stream'
 +	only seems to work (if at all?) when using the tls.el located in
 +	lisp/net/ in Emacs22.
 +
 +	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved these functions to erc.el
 +	since they can be useful outside of the text matching module.
 +
 +	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 +	erc-services.el since the file name has changed.
 +
 +	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 +
 +	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 +	to "ERC".
 +
 +2006-02-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 +	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 +	the filenames in DOS.
 +
 +	* erc-goodies.el: Comment fix.
 +
 +	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 +	commentary.  Use define-erc-module so that it's possible to
 +	actually use this.
 +	(erc-hecomplete): Rename function from `erc-complete'.
 +	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 +
 +	* erc-join.el: Rename from erc-autojoin.el.
 +
 +	* erc-networks.el: Rename from erc-nets.el.
 +
 +	* erc-services.el: Rename from erc-nickserv.el.
 +
 +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
 +	the simpler `indent-to' function when
 +	`erc-timestamp-right-align-by-pixel' is nil.
 +	(erc-insert-timestamp-right): If the timestamp goes on the
 +	following line, don't add timestamp properties to the spaces in
 +	front of it.
 +
 +	* erc.el (erc-migrate-modules): New function that eases migration
 +	of module names.
 +	(erc-modules): Call erc-migrate-modules in the :get accessor.
 +	(erc-modules, erc-update-modules): Update for new modules names.
 +
 +2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* FOR-RELEASE: Added two things to do before the next release of
 +	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 +	the `C-c C-SPC' and `C-c C-@' global keybindings.
 +
 +2006-02-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
 +	directory correctly.
 +
 +	* debian/changelog: Update for 5.1.1 release.
 +
 +	* debian/control (Suggests): Suggest emacs-chess instead of
 +	Recommending it.  Thanks to Era Eriksson for the report.
 +
 +	* debian/maint/postinst: Install the Info documentation.
 +
 +	* debian/maint/prerm: Handle removing of Info documentation.
 +
 +	* debian/rules (configure, configure-stamp, build, build-stamp):
 +	Generate HTML and Info documentation.
 +	(binary-erc): Install HTML and Info documentation.
 +
 +	* erc-spelling.el (erc-spelling-init): If
 +	`erc-spelling-dictionaries' is nil, do not set
 +	ispell-local-dictionary.  Before, it was being set to nil, which
 +	was causing a long delay while the ispell process restarted.
 +	(erc-spelling-unhighlight-word): New function that removes
 +	flyspell properties from a spell-checked word.
 +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
 +	that have '/' before them.
 +
 +2006-02-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (VERSION): Update to 5.1.1.
 +
 +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
 +	that Emacs does in its NEWS file.
 +
 +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 +
 +	* erc-complete.el (erc-nick-completion-exclude-myself)
 +	(erc-try-complete-nick): Use better function for getting list of
 +	channel users.
 +
 +	* erc-goodies.el: Docfix.
 +
 +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 +	being treated properly.
 +
 +	* erc.texi (History): Note that ERC is now included with Emacs.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.1.
 +
 +2006-01-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el: Update copyright years.
 +
 +2006-01-30  Simon Josefsson  <jas@extundo.com>
 +
 +	* erc.el (erc-open-ssl-stream): Use tls.el.
 +
 +2006-01-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
 +	that determines whether to use pixel values to align right
 +	timestamps.  The default is not to do so, since it only works with
 +	Emacs22 on X, and even then some people have trouble.
 +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 +
 +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-viper.el: Ensure we only alter Viper's configuration when
 +	necessary, as Viper may already take ERC into account.
 +
 +2006-01-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
 +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
 +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
 +	variable.
 +	(erc-speedbar-goto-buffer): Fix compiler warning.
 +
 +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
 +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
 +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 +	work without compiler warnings.
 +
 +	* man/erc.texi (Obtaining ERC, Installation): Note that these
 +	sections may be skipped if using the version of ERC that comes
 +	with Emacs.
 +
  2006-01-28  Michael Olson  <mwolson@gnu.org>
  
 -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
 -	Space out copyright years like the rest of Emacs.  Use the Emacs
 -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
 -	IRC Client", since there are now several IRC clients for Emacs.
 +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
 +	guidelines.
 +
 +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
 +	the Emacs copyright statement.  Refer to ourselves as ERC rather
 +	than "Emacs IRC Client", since there are now several IRC clients
 +	for Emacs.
 +
 +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
  
 -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
 -	insert spaces instead of using special text property.
 +	* erc-ibuffer.el: Require 'erc.
 +
 +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
 +	it exists.
 +
 +	* erc-stamp.el (erc-insert-aligned): Only use the special text
 +	property when window-system is X.
 +
 +	* erc.texi (History): Note that ERC 5.1 is released.
  
  2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
  
@@@ -1180,10 -125,10 +1197,10 @@@
  2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
  
  	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
--	`case'). Doc fixes.
++	`case').  Doc fixes.
  	(erc-find-parsed-property): Simplify.
--	(erc-track-get-active-buffer): Fix logic. Simplify.
--	(erc-track-switch-buffer): Remove unused variable `dir'. Simplify.
++	(erc-track-get-active-buffer): Fix logic.  Simplify.
++	(erc-track-switch-buffer): Remove unused variable `dir'.  Simplify.
  
  	* erc-speak.el: Doc fixes.
  	(erc-speak-region): `propertize' --> `erc-propertize'.
@@@ -1371,9 -312,3 +1388,10 @@@ See ChangeLog.05 for earlier changes
      Copyright (C) 2006 Free Software Foundation, Inc.
    Copying and distribution of this file, with or without modification,
    are permitted provided the copyright notice and this notice are preserved.
 +
 +;; Local Variables:
 +;; coding: utf-8
++;; add-log-time-zone-rule: t
 +;; End:
 +
 +;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --cc erc-autoaway.el
index 71d219d,810f0b6..3473cc3
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@@ -38,50 -41,20 +38,50 @@@ yourself back when you type something.
  
  (defvar erc-autoaway-idletimer nil
    "The Emacs idletimer.
 -This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
 +This is only used when `erc-autoaway-idle-method' is set to 'emacs.")
  
 -(defcustom erc-autoaway-use-emacs-idle nil
 -  "*If non-nil, the idle time refers to idletime in Emacs.
 -If nil, the idle time refers to idletime on IRC only.
 -The time itself is specified by `erc-autoaway-idle-seconds'.
 -See `erc-autoaway-mode' for more information on the various
 -definitions of being idle.
 +(defvar erc-autoaway-last-sent-time (erc-current-time)
 +  "The last time the user sent something.")
  
 -Note that using Emacs idletime is currently broken for most versions,
 -since process activity (as happens all the time on IRC) makes Emacs
 -non-idle.  Emacs idle-time and user idle-time are just not the same."
 -  :group 'erc-autoaway
 -  :type 'boolean)
 +(defvar erc-autoaway-caused-away nil
 +  "Indicates whether this module was responsible for setting the
 +user's away status.")
 +
 +(eval-when-compile (defvar erc-autoaway-idle-seconds))
 +
 +(defun erc-autoaway-reestablish-idletimer ()
-   "Reestablish the emacs idletimer.
++  "Reestablish the Emacs idletimer.
 +If `erc-autoaway-idle-method' is 'emacs, you must call this
 +function each time you change `erc-autoaway-idle-seconds'."
 +  (interactive)
 +  (when erc-autoaway-idletimer
 +    (erc-cancel-timer erc-autoaway-idletimer))
 +  (setq erc-autoaway-idletimer
 +	(run-with-idle-timer erc-autoaway-idle-seconds
 +			     t
 +			     'erc-autoaway-set-away
 +			     erc-autoaway-idle-seconds)))
 +
 +(defun erc-autoaway-some-server-buffer ()
 +  "Return some ERC server buffer if its connection is alive.
 +If none is found, return nil."
 +  (car (erc-buffer-list #'erc-open-server-buffer-p)))
 +
 +(defun erc-autoaway-insinuate-maybe (&optional server &rest ignored)
 +  "Add autoaway reset function to `post-command-hook' if at least one
 +ERC process is alive.
 +
 +This is used when `erc-autoaway-idle-method' is 'user."
 +  (when (or server (erc-autoaway-some-server-buffer))
 +    (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user)))
 +
 +(defun erc-autoaway-remove-maybe (&rest ignored)
 +  "Remove the autoaway reset function from `post-command-hook' if
 +no ERC process is alive.
 +
 +This is used when `erc-autoaway-idle-method' is 'user."
 +  (unless (erc-autoaway-some-server-buffer)
 +    (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user)))
  
  ;;;###autoload (autoload 'erc-autoaway-mode "erc-autoaway")
  (define-erc-module autoaway nil
diff --cc erc-dcc.el
index 076b002,ac8df65..26d4557
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@@ -810,7 -810,7 +810,7 @@@ other client.
                         (erc-ip-to-decimal (nth 0 contact))
                         (nth 1 contact)
                         size)))
--    (error "`make-network-process' not supported by your emacs.")))
++    (error "`make-network-process' not supported by your Emacs")))
  
  ;;; GET handling
  
diff --cc erc-match.el
index db3e770,a1d1c5a..524474e
--- a/erc-match.el
+++ b/erc-match.el
@@@ -566,7 -588,7 +566,7 @@@ deactivate/activate match logging in th
        (unless buffer-already
  	(insert " == Type \"q\" to dismiss messages ==\n")
  	(erc-view-mode-enter nil (lambda (buffer)
--				   (when (y-or-n-p "Discard messages?")
++				   (when (y-or-n-p "Discard messages? ")
  				     (kill-buffer buffer)))))
        buffer)))
  
diff --cc erc-truncate.el
index 7a1feaa,49cd20d..76475ab
--- a/erc-truncate.el
+++ b/erc-truncate.el
@@@ -48,7 -48,7 +48,7 @@@ Used only when auto-truncation is enabl
  (define-erc-module truncate nil
    "Truncate a query buffer if it gets too large.
  This prevents the query buffer from getting too large, which can
--bring any grown emacs to its knees after a few days worth of
++bring any grown Emacs to its knees after a few days worth of
  tracking heavy-traffic channels."
    ;;enable
    ((add-hook 'erc-insert-post-hook 'erc-truncate-buffer))
diff --cc erc.el
index 64438fe,98a369f..931ffc9
--- a/erc.el
+++ b/erc.el
@@@ -2032,7 -1956,7 +2032,7 @@@ If no buffer matches, return nil.
  
  (if (not (fboundp 'read-passwd))
      (defun read-passwd (prompt)
--      "Substitute for read-passwd in early emacsen"
++      "Substitute for `read-passwd' in early emacsen."
        (read-from-minibuffer prompt)))
  
  (defcustom erc-before-connect nil



From MAILER-DAEMON Wed Oct 17 10:36:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0P-00039Y-VD
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvSn-0007tS-7b
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:52:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPZ-0005Fl-Ab
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005EC-6k
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPV-00045W-Pv
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:07 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPU-0005KQ-R6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPU-0006mR-TA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPU-0006mR-TA@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:04 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Relicense all FSF-assigned parts of
	ERC to GPLv3
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, 14 Oct 2007 04:52:29 -0000

commit 818cc954afe4e0e66fa8ea42d92dd73395f0e3d9
Author: Michael Olson <mwolson@gnu.org>
Date:   Tue Jul 10 01:49:37 2007 +0000

    Relicense all FSF-assigned parts of ERC to GPLv3
    
    
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-155

diff --git a/COPYING b/COPYING
index 3912109..4432540 100644
--- a/COPYING
+++ b/COPYING
@@ -1,284 +1,626 @@
+
 		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+		       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 			    Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -287,15 +629,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program 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 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +646,31 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
index 871d296..330c05f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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.
@@ -502,7 +506,7 @@ See ChangeLog.06 for earlier changes.
 
   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 2, or (at your option)
+  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,
diff --git a/ChangeLog.01 b/ChangeLog.01
index 99c34a2..9c03d79 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -1041,7 +1041,7 @@
 
   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 2, or (at your option)
+  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,
diff --git a/ChangeLog.02 b/ChangeLog.02
index 85be89c..0d793b5 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -2602,7 +2602,7 @@ See ChangeLog.01 for earlier changes.
 
   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 2, or (at your option)
+  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,
diff --git a/ChangeLog.03 b/ChangeLog.03
index aade9cd..61b2b1e 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -2146,7 +2146,7 @@ See ChangeLog.02 for earlier changes.
 
   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 2, or (at your option)
+  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,
diff --git a/ChangeLog.04 b/ChangeLog.04
index feaead1..a707bc3 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -2075,7 +2075,7 @@ See ChangeLog.03 for earlier changes.
 
   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 2, or (at your option)
+  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,
diff --git a/ChangeLog.05 b/ChangeLog.05
index 0d2ff8a..ba6e098 100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@ -1223,7 +1223,7 @@ See ChangeLog.04 for earlier changes.
 
   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 2, or (at your option)
+  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,
diff --git a/ChangeLog.06 b/ChangeLog.06
index f5fc5d0..46b1d38 100644
--- a/ChangeLog.06
+++ b/ChangeLog.06
@@ -1502,7 +1502,7 @@ See ChangeLog.05 for earlier changes.
 
   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 2, or (at your option)
+  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,
diff --git a/NEWS b/NEWS
index 68afde5..b7aa0b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1089,7 +1089,7 @@ 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 2, or (at your option)
+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,
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 91a1150..c70beb1 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-backend.el b/erc-backend.el
index 7798d27..d0ec812 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-bbdb.el b/erc-bbdb.el
index fd5535b..82e5973 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
@@ -263,6 +263,7 @@ counterparts `erc-pals', `erc-dangerous-hosts' and `erc-fools'."
 ;; Local Variables:
 ;; indent-tabs-mode: t
 ;; tab-width: 8
+;; coding: utf-8
 ;; End:
 
 ;; arch-tag: 1edf3729-cd49-47dc-aced-70fcfc28c815
diff --git a/erc-button.el b/erc-button.el
index 3210dd3..81c604d 100644
--- a/erc-button.el
+++ b/erc-button.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-capab.el b/erc-capab.el
index b7ccade..2741029 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -4,7 +4,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-chess.el b/erc-chess.el
index 876b55e..2208fef 100644
--- a/erc-chess.el
+++ b/erc-chess.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-compat.el b/erc-compat.el
index dba5911..672b11e 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-dcc.el b/erc-dcc.el
index 2c906af..ed69e45 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -14,7 +14,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index f63682c..58d886a 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-fill.el b/erc-fill.el
index fc1c71b..98180e9 100644
--- a/erc-fill.el
+++ b/erc-fill.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-goodies.el b/erc-goodies.el
index e7b4de5..064c742 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -12,7 +12,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-hecomplete.el b/erc-hecomplete.el
index e6f91ce..6876637 100644
--- a/erc-hecomplete.el
+++ b/erc-hecomplete.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index 25ad131..ae256b8 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-identd.el b/erc-identd.el
index 1eef505..8fab26d 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-imenu.el b/erc-imenu.el
index 5e00518..cd5923f 100644
--- a/erc-imenu.el
+++ b/erc-imenu.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-join.el b/erc-join.el
index fb59cd9..dcc7e7f 100644
--- a/erc-join.el
+++ b/erc-join.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-lang.el b/erc-lang.el
index c4d103a..e61156f 100644
--- a/erc-lang.el
+++ b/erc-lang.el
@@ -12,7 +12,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-log.el b/erc-log.el
index 1bafca6..e0f5669 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -12,7 +12,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-match.el b/erc-match.el
index 35ba1b1..c147b65 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-menu.el b/erc-menu.el
index 888da70..dd2d9c2 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-netsplit.el b/erc-netsplit.el
index b4c26b1..83bc0df 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-networks.el b/erc-networks.el
index 4631cea..28f6f0d 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-nicklist.el b/erc-nicklist.el
index 8048e2a..2e1d2b6 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-notify.el b/erc-notify.el
index d34e38a..9216631 100644
--- a/erc-notify.el
+++ b/erc-notify.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-page.el b/erc-page.el
index de13c60..535c871 100644
--- a/erc-page.el
+++ b/erc-page.el
@@ -6,7 +6,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index f207bcc..a5a1bba 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-replace.el b/erc-replace.el
index 5e63f8d..8bc5fe3 100644
--- a/erc-replace.el
+++ b/erc-replace.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-ring.el b/erc-ring.el
index 95c313a..ae526c1 100644
--- a/erc-ring.el
+++ b/erc-ring.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-services.el b/erc-services.el
index a2cc1b1..e6f6c40 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -6,7 +6,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-sound.el b/erc-sound.el
index fdac1cc..4d3d792 100644
--- a/erc-sound.el
+++ b/erc-sound.el
@@ -6,7 +6,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-speak.el b/erc-speak.el
index 306580b..35e870d 100644
--- a/erc-speak.el
+++ b/erc-speak.el
@@ -6,7 +6,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-speedbar.el b/erc-speedbar.el
index 0d88589..b11296c 100644
--- a/erc-speedbar.el
+++ b/erc-speedbar.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-spelling.el b/erc-spelling.el
index a15ca17..3445be3 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-stamp.el b/erc-stamp.el
index d753dd0..3b7f5ba 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -10,7 +10,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-track.el b/erc-track.el
index 4a8b673..f72a5be 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -11,7 +11,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-truncate.el b/erc-truncate.el
index 440dc87..599e49e 100644
--- a/erc-truncate.el
+++ b/erc-truncate.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-viper.el b/erc-viper.el
index da83f44..4cbf97e 100644
--- a/erc-viper.el
+++ b/erc-viper.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc-xdcc.el b/erc-xdcc.el
index ea1fa27..0aed112 100644
--- a/erc-xdcc.el
+++ b/erc-xdcc.el
@@ -9,7 +9,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,
diff --git a/erc.el b/erc.el
index 66153d5..5f8efab 100644
--- a/erc.el
+++ b/erc.el
@@ -17,7 +17,7 @@
 
 ;; 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 2, or (at your option)
+;; 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,



From MAILER-DAEMON Wed Oct 17 10:36:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0Q-00039z-6e
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTJ-0008KK-BW
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTH-0008JW-Pb
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvP1-00053W-3z
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:35 -0400
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@hcoop.net>) id 1IgvP0-0003z1-CC
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:34 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvOz-00057w-Jt
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvOz-0005wt-NB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:33 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvOz-0005wt-NB@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:33 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Merged from erc--emacs--22
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, 14 Oct 2007 04:53:01 -0000

commit 8fbc0ebdcaa834edeee3e5699a9194f035a6c37a
Merge: 93c10b6... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Mon Nov 20 05:09:14 2006 +0000

    Merged from erc--emacs--22
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-25
       Display better error message when module not found
    
     * erc@sv.gnu.org/erc--emacs--22--patch-26
       Whitesapce fixup in ChangeLog
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-63

diff --cc ChangeLog
index c5b800f,cef3944..60a9e66
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,1084 -1,12 +1,1089 @@@
++2006-11-20  Michael Olson  <mwolson@gnu.org>
++
++	* erc.el (erc-update-modules): Display better error message when
++	module not found.
++
 +2006-11-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el: Save all log buffers when Emacs exits, in case
 +	someone ignores the warning about open processes.  Remove the
 +	advice code in the commentary.
 +	(erc-save-query-buffers): Docfix.
 +	(erc-log-save-all-buffers): New function that saves all ERC
 +	buffers to logs.
 +	(erc-current-logfile): Fix bug in filename selection, where the
 +	current buffer was erroneously being preferred over the given
 +	buffer.
 +
 +2006-11-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-string-to-port): Avoid error when a numerical port
 +	is passed.  Thanks to Zekeriya KOÇ for the report.
 +
- 2006-11-08  "Łukasz Demianiuk"  <ldemianiuk@gmail.com> (tiny change)
++2006-11-08  Łukasz Demianiuk  <ldemianiuk@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-header-line): Fix typo.
 +
 +2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
 +
 +	* erc.el (read-passwd):
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
 +	* erc-truncate.el (truncate): Fix typo in docstring.
 +
 +2006-10-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
 +	first loading iswitchb.  Thanks to Leo for the report.
 +
 +2006-10-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-default-port): Make the default be 6667 instead of
 +	ircd. since Mac OS X apparently has problems with looking up that
 +	port name.
 +
 +	* erc-backend.el (353): Receive names after displaying the initial
 +	message, instead of before.
 +
 +2006-10-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-my-nick-face): New face.
 +	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
 +	fixes a bug where the :full-name argument passed to the function
 +	was not respected.
 +	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
 +	make it easier to find messages you sent in conversations when
 +	`erc-show-my-nick' is non-nil.
 +	(erc-compute-server): Doc fix.
 +
 +2006-09-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
 +	parenthesis.  Thanks to Stephan Stahl for the report.
 +
 +2006-09-10  Eric Hanchrow  <offby1@blarg.net>
 +
 +	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
 +	instead of a single user.
 +
 +2006-09-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-generate-new-buffer-name): If this is a server
 +	buffer and a process exists already, create a new buffer.
 +	(erc-open): If the IRC session was continued, restore the old
 +	point.  Thanks to Stephan Stahl for the report.
 +	(erc-member-ignore-case): Coding style tweak.
 +	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
 +	find the user listed verbatim, try to match them against the list
 +	using string-match.  In this case, prompt as to whether the regexp
 +	should be removed.
 +	(erc-ignored-user-p): Remove CL-ism.
 +
 +	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
 +	whether we are already away.
 +
 +	* erc-menu.el: Fix potential compiler warning.
 +
 +2006-09-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: Updated Commentary and URL.
 +	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
 +	(erc-arrange-session-in-multiple-windows): No need to check if
 +	`erc-server-process' is bound.
 +	(erc-server-buffer-live-p): Doc fix.
 +	(erc-part-from-channel): Don't use any initial contents at prompt.
 +	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
 +	(s367): Fixed to support only banmask and channel which is the
 +	standard.  Also, there's no reason to add a message to each banned
 +	user entry trying to persuade the user to use /banlist instead of
 +	/mode #channel +b.  That part of the message was a little
 +	confusing, anyways.
 +	(s367-set-by): New catalog entry.  The user who set the ban and
 +	the time of ban seem to be specific to only certain servers such
 +	as freenode.
 +
 +	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
 +
 +	* erc-backend.el (erc-server-process-alive): No need to check if
 +	`erc-server-process' is bound.
 +	(367): Use s367 or s367-set-by where appropriate.
 +
 +	* erc-compat.el: Fixed URL.
 +
 +	* erc-dcc.el: Updated copyright years.  Added Usage section.
 +	Changed supported Emacs version number from 21.3.50 to 22 in
 +	Commentary.
 +
 +	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
 +	to check if `erc-server-process' is bound.
 +
 +	* erc-nicklist.el: Added to the Commentary section an explanation
 +	that `erc-nicklist-quit' should be called from within the nicklist
 +	buffer.  Set file coding to utf-8 so a contributor's name is
 +	displayed correctly.
 +	(erc-nicklist-icons-directory): Use customize type directory
 +	instead of string.
 +	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
 +	if it wasn't found.  This fixes a bug where an error would occur
 +	when using `string=' on bbdb-nick if it was nil.
 +
 +	* erc-replace.el: Removed URL from file information since it
 +	doesn't exist.
 +
 +	* erc-sound.el: Updated copyright years.  Fixed Commentary and
 +	added Usage section.
 +	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
 +	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
 +	definitions.
 +	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
 +	(erc-ctcp-query-SOUND): Doc fix.
 +	(erc-play-command): Removed, not necessary anymore.
 +	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
 +	higher in code, added docstring.
 +	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
 +	as well since version 21 or earlier.  Removed commented-out older
 +	version of function.
 +
 +	* NEWS: Fixed formatting, added channel tracking change.
 +
 +	* README: Fixed typo.  Added more information to Installation
 +	section.  Updated URL.
 +
 +2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: M-x erc RET can now be used to start ERC.
 +	(erc-open): Renamed from `erc'.
 +	(erc-before-connect): Change erc-select to erc.
 +	(erc): Renamed from `erc-select'.  Use `erc-open'.
 +	(erc-select): Defined as alias of `erc'.
 +	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
 +	(erc-select-ssl): Defined as alias of `erc-ssl'.
 +	(erc-cmd-SERVER): Use `erc'.
 +	(erc-query, erc-handle-irc-url): Use `erc-open'.
 +
 +	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc'.
 +
 +	* erc-networks.el: Updated copyright years.
 +	(erc-server-select): Use keyword arguments when calling `erc'.
 +
 +	* erc.texi (Getting Started, Connecting): Changed erc-select to
 +	erc.
 +
 +	* README: Changed erc-select to erc.
 +
 +	* NEWS: Added note about these changes.
 +
 +	* FOR-RELEASE: Marked this item as done.
 +
 +2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
 +	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
 +	properties to channel name.
 +
 +2006-08-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd): New customization group.
 +	(erc-identd-port): New option that specifies the port to use if
 +	none is given as an argument to erc-identd-start.
 +	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
 +	instead of erc-identd-start so that we deal with the different
 +	meaning of the first argument.
 +	(erc-identd-start): Use erc-identd-port.
 +	(erc-identd-quickstart): New function that ignores any arguments
 +	and calls erc-identd-start.
 +
 +	* erc.el (erc-with-server-buffer): New macro that switches to the
 +	current ERC server buffer and runs some code.  If no server buffer
 +	is available, return nil.  This is a useful way to access
 +	variables in the server buffer.
 +	(erc-get-server-user, erc-add-server-user)
 +	(erc-remove-server-user, erc-change-user-nickname)
 +	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
 +	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
 +	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
 +	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
 +	(erc-format-channel-modes): Use it.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
 +	instead of gensym.
 +	(erc-open-server-buffer-p): New function that returns non-nil if
 +	the given buffer is an ERC server buffer that has an open IRC
 +	process.
 +	(erc-with-buffer): Use buffer-live-p here to set a good example,
 +	though it isn't really needed here.
 +	(erc-away): Mention erc-away-time.
 +	(erc): Don't propagate the erc-away setting, since it makes more
 +	sense to access it from the server buffer.  Set up the prompt
 +	before connecting rather than after.  Run erc-connect-pre-hook
 +	with the buffer as an argument, instead of no arguments.
 +	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
 +	erc-server-buffer-p so that only open connections are set away.
 +	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
 +	(erc-process-away): Docfix.  Don't set erc-away in channel
 +	buffers.
 +	(erc-set-current-nick): Make this uniform with the style used in
 +	erc-current-nick.
 +	(erc-away-time): Rename from erc-away-p, since this is no longer a
 +	boolean-style predicate.
 +	(erc-format-away-status): Use it.
 +	(erc-initialize-log-marker): Accept a `buffer' argument.
 +	(erc-connect-pre-hook): Docfix.
 +	(erc-connection-established): Make sure this runs in the correct
 +	buffer.
 +	(erc-set-initial-user-mode): Accept a `buffer' argument.
 +
 +	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
 +
 +	* erc-spelling.el (erc-spelling-init): Use
 +	erc-with-server-buffer.  Accept `buffer' argument.
 +	(spelling): Call erc-spelling-init with the `buffer' argument.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
 +	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
 +
 +	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
 +	erc-with-server-buffer.
 +
 +	* erc-networks.el (erc-network, erc-current-network)
 +	(erc-network-name): Use erc-with-server-buffer.
 +
 +	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
 +
 +	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
 +	erc-away-time.
 +
 +	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
 +	Pass `buffer' argument to erc-log-setup-logging instead of setting
 +	the current buffer.  Ditto for erc-log-disable-logging.
 +	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
 +	argument.
 +
 +	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
 +
 +	* erc-ibuffer.el (erc-away): Use erc-away-time.
 +
 +	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
 +	read only instead of permanently doing so.
 +
 +	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
 +	Emacs Lisp has make-symbol, which is better.
 +
 +	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
 +	erc-with-server-buffer.
 +
 +	* erc-capab.el (capab-identify): Only deal with server buffers
 +	that have an open IRC process.
 +	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
 +
 +	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
 +	`erc-server-process-alive' function.
 +	(erc-coding-system-for-target): Supply a default target if one is
 +	not given.
 +	(erc-server-send): Simplify slightly.
 +	(erc-call-hooks): Use erc-with-server-buffer.
 +	(erc-server-connect, erc-server-setup-periodical-ping): Accept
 +	`buffer' argument.
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
 +	higher to avoid an automatic load snafu.
 +	(erc-autoaway-some-server-buffer): New function that returns an
 +	ERC server buffer with a live connection, or nil otherwise.
 +	(erc-autoaway-insinuate-maybe): New function that adds the
 +	autoaway reset function to post-command-hook if at least one ERC
 +	process is alive.
 +	(erc-autoaway-remove-maybe): New function that removes the
 +	autoaway reset function from post-command-hook if no ERC process
 +	is alive.
 +	(autoaway): Don't touch post-command-hook unless an IRC process is
 +	already open.  Remove our addition to post-command-hook as soon as
 +	there are no more IRC processes open.  Reset the indicators before
 +	connecting to an IRC server, which fixes a bug when re-connecting.
 +	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
 +	there are no more IRC processes open.
 +	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
 +	argument which is a function call if we can't find one.
 +	(erc-autoaway-some-open-server-buffer): New function which returns
 +	an ERC server buffer with an open connection and a user that is
 +	not away.
 +	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
 +	(erc-autoaway-set-away): Accept a `notest' argument which is used
 +	to avoid testing the same thing twice.
 +	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
 +	higher in file to fix byte-compile warning.
 +
 +2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
 +	`erc-server-reconnect-p' check all condition cases.
 +	(erc-server-reconnect-p): Moved rest of checks from
 +	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
 +
 +2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
 +	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
 +	avoid confusion with rcirc and other clients.
 +
 +	* erc-backend.el (erc-server-banned): New variable.
 +	(erc-server-connect): Set `erc-server-banned' to nil.
 +	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
 +	(erc-server-reconnect-p): New function.  Return non-nil if the
 +	user wants automatic reconnects and if the user has not been
 +	banned from the server.  This should fix a bug where ERC gets into
 +	a loop trying to reconnect with no way to stop it when the user is
 +	denied access to the server due to a server ban.  It might also
 +	help when Tor users are blocked from freenode if freenode servers
 +	send the 465 message before disconnecting.
 +	(465): Handle "banned from server" error notices.
 +
 +2006-08-13  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
 +	prompt with a space.
 +
 +2006-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-timed-out): New variable that
 +	indicates whether the current connection has timed out due to
 +	failure to respond to a ping.
 +	(erc-server-send-ping): Set erc-server-timed-out to t.
 +	(erc-server-connect): Initialize erc-server-timed-out to nil.
 +	(erc-process-sentinel-1): Consult erc-server-timed-out.
 +
 +2006-08-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
 +	avoid errors when inserting disconnect messages and other messages
 +	that begin with newlines.
 +
 +2006-08-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
 +	in several places instead of inserting text.
 +	(erc-process-sentinel): Move to the input-marker before removing
 +	the prompt.
 +
 +	* erc.el (erc-port): Fix customization options.
 +	(erc-display-message): Handle null type explicitly.  Previously,
 +	this was relying on a chance side-effect.  Cosmetic indentation
 +	tweak.
 +	(english): Add 'finished and 'terminated entries to the catalog.
 +	Add initial and terminal newlines to 'disconnected and
 +	'disconnected-noreconnect entries.  Avoid long lines.
 +	(erc-cmd-QUIT): Bind the current erc-server-process to
 +	server-proc.  If the IRC server responds quickly, it is possible
 +	for the connection to close, and hence server buffer to be killed,
 +	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
 +	problem.
 +
 +2006-08-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-send-queue): Update from Circe
 +	version of this function.
 +	(erc-server-ping-timer-alist): New variable that keeps track of
 +	ping timers according to their associated server.
 +	(erc-server-last-received-time): New variable that specifies the
 +	time of the last message we received from the server.  This is
 +	used to detect hung processes.
 +	(erc-server-send-ping): New function that sends a ping to the IRC
 +	process corresponding with the given buffer.  Split from
 +	erc-server-setup-periodical-ping.  If the server buffer no longer
 +	exists, cancel the timer.  If the server process has not given us
 +	a message, including PING responses, since the last PING, kill it.
 +	This is necessary to deal with some aberrant freenode behavior.
 +	Idea taken from rcirc.
 +	(erc-server-setup-periodical-ping): Rename from
 +	erc-server-setup-periodical-server-ping.
 +	(erc-server-filter-function): Use erc-current-time instead of
 +	current-time.
 +
 +	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 +	multi-tty Emacs.
 +	(erc-select-startup-file): Fix bug introduced by recent change.
 +	(erc-cmd-QUIT): If the IRC process has not terminated itself
 +	within 4 seconds of completing our quit-hook, kill it manually.
 +	Freenode in particular needs this.
 +	(erc-connection-established): Use erc-server-setup-periodical-ping
 +	instead of erc-server-setup-periodical-server-ping.
 +
 +2006-08-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-standardize-name): New function that returns
 +	a filename that is safe for use for a log file.
 +	(erc-current-logfile): Use it.
 +
 +	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 +	since that is a fairly standard directory.
 +	(erc-select-startup-file): Re-write to use
 +	convert-standard-filename, which will ensure that MS-DOS systems
 +	look for the _ercrc.el file.
 +
 +2006-08-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.4.
 +
 +	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
 +
 +	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 +	to the wrong buffer.  Thanks to offby1 for the report.
 +
 +	* erc-backend.el (erc-coding-system-for-target): Handle case where
 +	target is nil.  Thanks to Kai Fan for the patch.
 +
 +2006-07-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 +	buffer.  It will be saved automatically killed.  Thanks to Johan
 +	Bockgård and Tassilo Horn for pointing this out.
 +
 +2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (define-erc-module): Make find-function and find-variable
 +	find the names constructed by `define-erc-module' in Emacs 22.
 +
 +2006-07-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (log): Make sure that we enable logging on
 +	already-opened buffers as well, in case the user toggles this
 +	module after loading ERC.  Also be sure to remove logging ability
 +	from all ERC buffers when the module is disabled.
 +	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 +	the empty string.  This should fix some errors that occur when
 +	quitting Emacs without first killing all ERC buffers.
 +	(erc-log-disable-logging): New function that removes the logging
 +	ability from the current buffer.
 +
 +	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
 +
 +2006-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 +	than call toggle-read-only.
 +
 +	* Makefile (debrelease-mwolson): Remove and consolidate with the
 +	`debrelease' target.
 +	(debrevision): Rename from `debrevision-mwolson'.
 +
 +	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
 +	add autoload cookie.
 +
 +2006-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.3.
 +
 +	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
 +
 +	* servers.pl: Add copyright notice.
 +
 +	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 +	from being set automatically away and current buffer is not an ERC
 +	buffer.
 +
 +	* erc-identd.el: Fix compiler error.
 +
 +	* erc.texi (Development): Use @subheading instead of @subsection.
 +	(Advanced Usage): Add menu.
 +	(Connecting): Fully document how to connect to an IRC server.
 +	(Options, Tips and Tricks, Sample Configuration): New unwritten
 +	sections.
 +
 +	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 +	(erc-user-full-name, erc-password): Docfixes and customization
 +	interface tweaks.
 +	(erc-try-new-nick-p): Rename from
 +	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 +	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 +	of `erc-nick-uniquifier', in case someone wants multiple
 +	characters.
 +	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 +	(erc-compute-port): Docfixes.
 +
 +	* FOR-RELEASE: Put in future-first order.
 +
 +	* erc-log.el (log): Move all add-hook calls here, rather than
 +	executing them immediately, and also cause them to be un-hooked
 +	when the module is removed.
 +	(erc-save-buffer-on-part): Move next to
 +	`erc-save-queries-on-quit'.
 +	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 +	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 +	nil.  This makes things fast, but reasonably failsafe, by default.
 +
 +2006-07-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 +	default, since most IRC clients don't do this.
 +	(erc-log-write-after-send): New option that determines whether the
 +	log file will be written to after every sent message.
 +	(erc-log-write-after-insert): New option that determines whether
 +	the log file will be written to when new text is added to a logged
 +	ERC buffer.
 +	(log): Use the aforementioned options.
 +
 +	* erc.texi (Modules): Document the "completion" module.
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 +	have a nil element in the list when ignore-self is non-nil.
 +
 +2006-07-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Use `set' instead of `set-default', since
 +	this setting should never be buffer-local.  Add the `list' and
 +	`page' modules to the list.
 +
 +	* erc.texi (Modules): Add entries for `list' and `page' modules.
 +	Change "spell" to "spelling".
 +	(History): Use past tense throughout.
 +
 +2006-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 +	can happen when doing /PART.
 +
 +	* erc.el (erc-quit-reason-various-alist)
 +	(erc-part-reason-various-alist): In the example, use "^$" as an
 +	example, since "" matches anything.
 +	(erc-quit-reason-various, erc-part-reason-various): If no argument
 +	is given, and no matches are found, use our default reason instead
 +	of "nil".
 +
 +2006-07-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd-start): XEmacs defines neither
 +	`make-network-process' nor `open-network-stream-server', so just
 +	fail silently.
 +
 +2006-06-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* HISTORY: Update.
 +
 +	* erc.texi (Modules): Mention identd.
 +	(Releases): Update mailing list address and download location.
 +	(Development): Refactor.  Provide updated directions for Arch.
 +	Make URLs clickable.
 +	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 +	(Getting Started): Give simpler example.  We do not need to
 +	explicitly load every module.
 +	(History): Update.
 +
 +	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 +	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 +	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 +	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 +	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 +	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 +	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 +	erc.el: Remove version strings.
 +
 +	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 +	module versions anymore.
 +	(erc-version-modules): Remove, since we do not use this function
 +	anymore.
 +	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 +	was only useful back when ERC consisted of one file.
 +	(erc-modules): Add line for identd.
 +	(erc-get-channel-mode-from-keypress): Typo fix.
 +
 +	* erc-imenu.el: Remove unnecessary lines in header.
 +
 +	* erc-goodies.el (erc-handle-irc-url): Docfix.
 +
 +	* erc-identd.el: Define an ERC module for this.
 +	(erc-identd-start): Don't create a process buffer if possible.
 +	Otherwise, use conventional hidden names for process buffers.
 +
 +2006-06-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-coding-system-for-target): Match
 +	case-insensitively.  Use a pattern match instead of `assoc', as
 +	per the documentation for `erc-encoding-coding-alist'.
 +
 +	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 +
 +2006-06-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Update maintainer information and URLs.
 +
 +2006-06-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (upload): Make this work with the GNU upload system.
 +
 +2006-06-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-active-buffer): If the active buffer has been
 +	deleted, default to the server buffer.
 +	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 +	control really toggle, not unconditionally turn off.
 +
 +2006-06-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add items since the 5.1.2 release.
 +
 +	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 +	indicates whether the current away status was caused by this
 +	module.
 +	(erc-autoaway-set-back): Only set back if this module set the user
 +	away.
 +	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 +	(erc-autoaway-reset-indicators): New function that resets some
 +	indicators when the user is no longer away.
 +	(autoaway): Add the above function to the 305 hook.
 +
 +2006-06-05  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc.texi (History): Fix various typos.
 +
 +2006-06-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 +	definition of the autoaway module.
 +	(autoaway): Don't do anything if erc-autoaway-idle-method is
 +	unbound.  This prevents an error on startup.
 +
 +2006-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 +	(erc-autoaway-idle-method): Renamed from
 +	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 +	how to do this, so it's best to make this take symbol values.
 +	Improve documentation.  Remove warning against Emacs idle-time;
 +	the point is moot now that we get user idle time via a different
 +	method.  Make sure we disable and re-enable the module when
 +	changing this value.
 +	(autoaway): Conditionalize on the above option.  If using the idle
 +	timer or user idle methods, don't add anything to the
 +	send-completed or server-001 hooks, since it is unnecessary.
 +	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 +	Docfix.
 +	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 +	(erc-autoaway-reset-idle-irc): Renamed from
 +	`erc-autoaway-reset-idle'.  Don't pass line to
 +	`erc-autoaway-set-away', since it is not used.
 +	(erc-autoaway-reset-idle-user): New function that resets the idle
 +	state for user idle time.
 +	(erc-autoaway-set-back): Remove line argument, since it is not
 +	used.
 +
 +	* Makefile (upload): Make this work for Savannah uploads.
 +
 +	* AUTHORS: Update for Savannah move.  No old entries have been
 +	removed, in case people have not registered yet on Savannah.
 +
 +2006-06-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 +	this are live.
 +
 +2006-05-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* README: Add License information.  Permit images to be used,
 +	distributed, and modified without restriction.
 +
 +2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
 +	a value for `url-irc-function'.
 +
 +2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 +	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 +	current nickname.  Doc fix.
 +	(pcomplete/erc-mode/complete-command): Don't complete the current
 +	nickname.
 +
 +2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 +	build date as it's shown in `emacs-version'.
 +
 +	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 +	with the same face property as the previous character.
 +
 +2006-04-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 +	erc.el: Make sure to include a newline inside of negated classes,
 +	so that a newline is not matched.
 +
 +2006-04-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-connect-function): Don't try to
 +	detect the existence of the `open-network-stream-nowait' function,
 +	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 +
 +2006-03-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.texi: Update direntry.  Remove unneeded local variables.
 +
 +2006-03-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-header-line): New face that will be used to colorize
 +	the text of the header-line, provided that
 +	`erc-header-line-face-method' is non-nil.
 +	(erc-prompt-face): Fix formatting.
 +	(erc-header-line-face-method): New option that determines the
 +	method used for colorizing header-line text.  This may be a
 +	function, nil, or non-nil.
 +	(erc-update-mode-line-buffer): Use the aforementioned option and
 +	face to colorize the header-line text, if that is what the user
 +	wants.
 +	(erc-send-input): If flood control is not activated, don't split
 +	the input line.
 +
 +2006-03-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 +	that fixes the case where there is no leading whitespace.  Only
 +	remove the first space character, though.
 +
 +	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 +	erc-identd-process is set properly.
 +	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 +	(erc-identd-start): Pass :host parameter so this works with Emacs
 +	22.
 +
 +2006-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Nelson Ferreira.  Change contact address.
 +
 +	* erc-bbdb.el: Install patch from Nelson Ferreira.
 +	(erc-bbdb-electric-p): New option that indicates whether to make
 +	the BBDB buffer electric.  Defaults to "not electric".
 +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
 +
 +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
 +	<C-tab> for `erc-button-previous' as it is a more standard key
 +	binding for this type of function.
 +
 +2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Removed things that were accidentally committed on
 +	2006-02-20.  Removed Todo section.
 +	(erc-capab-unidentified): Removed.
 +
 +2006-02-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 +	(erc-capab-unidentified): Fix compiler warning by specifying
 +	group.
 +
 +2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 +	to explain thoughts better.  `erc-server-parameters' is an
 +	associated list when it's set, not a string.
 +
 +2006-02-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +	parameters are strings before using them.  Thanks to Alejandro
 +	Benitez for the report.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.2.
 +
 +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +	<C-tab>.
 +	(erc-button-previous): New function.
 +
 +2006-02-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add category for ERC 5.2.
 +
 +	* erc.el (erc): Move to the end of the buffer when a continued
 +	session is detected.  Thanks to e1f and indio for the report and
 +	testing a potential fix.
 +
 +2006-02-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Prepare a new Debian package.
 +
 +	* Makefile (debprepare): New rule that creates an ERC snapshot
 +	directory for use in both new Debian releases and revisions for
 +	Debian packages.
 +	(debrelease, debrevision-mwolson): Use debprepare.
 +
 +	* NEWS: Bring up-to-date.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
 +	timestamps before rather than after erc-fill-column when
 +	erc-timestamp-right-column is nil.  This way we won't surprise
 +	anyone unpleasantly, or so it is hoped.
 +
 +2006-02-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 +
 +2006-02-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
 +	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
 +	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
 +	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
 +	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
 +	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
 +	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
 +	Add 2006 to copyright years, to comply with the changed guidelines.
 +
 +2006-02-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Handle erc-capab-identify
 +	correctly.  Make some requirements shorter, so that it's easier to
 +	see why they are needed.
 +
 +	* erc-capab.el: Add autoload cookie for capab-identify.
 +	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 +	Minor whitespace fix in code.
 +
 +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
 +	whether we are in Emacs 22, and using X.  Improve documentation.
 +	(erc-insert-aligned): Remove calculation of offset, since
 +	:align-to pos works after all.  Unlike the previous solution, this
 +	one works when erc-stamp.el is compiled.
 +	(erc-insert-timestamp-right): Don't add length of string, and then
 +	later remove its displayed width.  This puts timestamps after
 +	erc-fill-column when erc-timestamp-right-column is nil, rather
 +	than before it.  It also fixes a subtle bug.  Remove use of
 +	`current-window', since there is no variable by that name in
 +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
 +	`erc-fill-column' is non-nil before using it.
 +
 +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Define `list' module which sets the alias
 +	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 +	`erc-list-channels-simple' when disabled.
 +	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 +	(erc-list-channels-simple): New function.
 +
 +	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 +	`capab-identify' description.  Moved customization options left in
 +	source code.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 +
 +	* erc-capab.el: Put a little more detail into Usage section.
 +	(define-erc-module): Run `erc-capab-identify-setup' in all open
 +	server buffers when enabling.
 +	(erc-capab-identify-setup): Make PROC and PARSED optional
 +	arguments.
 +	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 +	should now also match nicknames that are formatted differently
 +	than the default.
 +
 +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 +	before calling `with-current-buffer'.
 +
 +2006-02-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debbuild): Split from debrelease.
 +	(debrevision-mwolson): New rule that causes a Debian revision to
 +	be built.
 +
 +	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 +	Johan Bockgård.
 +	(erc-modules): Change use of 'pcomplete to 'completion.
 +
 +2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Require erc.
 +	(erc-capab-send-identify-messages): Use `erc-server-send'.
 +	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 +	the flags so we can also check whether the `erc-identified' text
 +	property is there at all.
 +	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 +	This fixes a bug where the prefix wasn't inserted when timestamps
 +	are inserted on the right.  Tweaked nickname regexp.
 +	(erc-capab-find-parsed): New function.
 +	(erc-capab-get-unidentified-nickname): Updated to check for 0
 +	flag.  Only get nickname if there's a nickuserhost associated with
 +	this message.
 +
 +	* erc-capab.el: New file.  Adds the new module
 +	`erc-capab-identify', which allows flagging of unidentified users
 +	on servers running an ircd based on dancer - irc.freenode.net, for
 +	example.
 +
 +	* erc.el (erc-modules): Added `capab-identify' to options.
 +	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 +	(erc-version-string): Remove "(CVS)".
 +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
 +	connections work as expected.  Connecting with `open-tls-stream'
 +	only seems to work (if at all?) when using the tls.el located in
 +	lisp/net/ in Emacs22.
 +
 +	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved these functions to erc.el
 +	since they can be useful outside of the text matching module.
 +
 +	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 +	erc-services.el since the file name has changed.
 +
 +	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 +
 +	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 +	to "ERC".
 +
 +2006-02-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 +	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 +	the filenames in DOS.
 +
 +	* erc-goodies.el: Comment fix.
 +
 +	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 +	commentary.  Use define-erc-module so that it's possible to
 +	actually use this.
 +	(erc-hecomplete): Rename function from `erc-complete'.
 +	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 +
 +	* erc-join.el: Rename from erc-autojoin.el.
 +
 +	* erc-networks.el: Rename from erc-nets.el.
 +
 +	* erc-services.el: Rename from erc-nickserv.el.
 +
 +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
 +	the simpler `indent-to' function when
 +	`erc-timestamp-right-align-by-pixel' is nil.
 +	(erc-insert-timestamp-right): If the timestamp goes on the
 +	following line, don't add timestamp properties to the spaces in
 +	front of it.
 +
 +	* erc.el (erc-migrate-modules): New function that eases migration
 +	of module names.
 +	(erc-modules): Call erc-migrate-modules in the :get accessor.
 +	(erc-modules, erc-update-modules): Update for new modules names.
 +
 +2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* FOR-RELEASE: Added two things to do before the next release of
 +	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 +	the `C-c C-SPC' and `C-c C-@' global keybindings.
 +
 +2006-02-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
 +	directory correctly.
 +
 +	* debian/changelog: Update for 5.1.1 release.
 +
 +	* debian/control (Suggests): Suggest emacs-chess instead of
 +	Recommending it.  Thanks to Era Eriksson for the report.
 +
 +	* debian/maint/postinst: Install the Info documentation.
 +
 +	* debian/maint/prerm: Handle removing of Info documentation.
 +
 +	* debian/rules (configure, configure-stamp, build, build-stamp):
 +	Generate HTML and Info documentation.
 +	(binary-erc): Install HTML and Info documentation.
 +
 +	* erc-spelling.el (erc-spelling-init): If
 +	`erc-spelling-dictionaries' is nil, do not set
 +	ispell-local-dictionary.  Before, it was being set to nil, which
 +	was causing a long delay while the ispell process restarted.
 +	(erc-spelling-unhighlight-word): New function that removes
 +	flyspell properties from a spell-checked word.
 +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
 +	that have '/' before them.
 +
 +2006-02-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (VERSION): Update to 5.1.1.
 +
 +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
 +	that Emacs does in its NEWS file.
 +
 +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 +
 +	* erc-complete.el (erc-nick-completion-exclude-myself)
 +	(erc-try-complete-nick): Use better function for getting list of
 +	channel users.
 +
 +	* erc-goodies.el: Docfix.
 +
 +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 +	being treated properly.
 +
 +	* erc.texi (History): Note that ERC is now included with Emacs.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.1.
 +
 +2006-01-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el: Update copyright years.
 +
 +2006-01-30  Simon Josefsson  <jas@extundo.com>
 +
 +	* erc.el (erc-open-ssl-stream): Use tls.el.
 +
 +2006-01-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
 +	that determines whether to use pixel values to align right
 +	timestamps.  The default is not to do so, since it only works with
 +	Emacs22 on X, and even then some people have trouble.
 +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 +
 +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-viper.el: Ensure we only alter Viper's configuration when
 +	necessary, as Viper may already take ERC into account.
 +
 +2006-01-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
 +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
 +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
 +	variable.
 +	(erc-speedbar-goto-buffer): Fix compiler warning.
 +
 +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
 +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
 +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 +	work without compiler warnings.
 +
 +	* man/erc.texi (Obtaining ERC, Installation): Note that these
 +	sections may be skipped if using the version of ERC that comes
 +	with Emacs.
 +
  2006-01-28  Michael Olson  <mwolson@gnu.org>
  
 -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
 -	Space out copyright years like the rest of Emacs.  Use the Emacs
 -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
 -	IRC Client", since there are now several IRC clients for Emacs.
 +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
 +	guidelines.
 +
 +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
 +	the Emacs copyright statement.  Refer to ourselves as ERC rather
 +	than "Emacs IRC Client", since there are now several IRC clients
 +	for Emacs.
 +
 +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
  
 -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
 -	insert spaces instead of using special text property.
 +	* erc-ibuffer.el: Require 'erc.
 +
 +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
 +	it exists.
 +
 +	* erc-stamp.el (erc-insert-aligned): Only use the special text
 +	property when window-system is X.
 +
 +	* erc.texi (History): Note that ERC 5.1 is released.
  
  2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
  
diff --cc erc.el
index eb6089a,98a369f..5de73f8
--- a/erc.el
+++ b/erc.el
@@@ -1864,9 -1788,9 +1864,10 @@@ removed from the list will be disabled.
        (condition-case nil
  	  (require (intern req))
  	(error nil))
--      (funcall (or (intern-soft (concat "erc-" (symbol-name mod) "-mode"))
--		   (error "`%s' is not a known ERC module" mod))
--	       1))))
++      (let ((sym (intern-soft (concat "erc-" (symbol-name mod) "-mode"))))
++	(if (fboundp sym)
++	    (funcall sym 1)
++	  (error "`%s' is not a known ERC module" mod))))))
  
  (defun erc-setup-buffer (buffer)
    "Consults `erc-join-buffer' to find out how to display `BUFFER'."



From MAILER-DAEMON Wed Oct 17 10:36:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0N-00038M-HH
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvRS-0006Zc-PH
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvRM-0006Uh-SU
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:51:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPe-0005Ii-KI
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
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@hcoop.net>) id 1IgvPc-00048u-Ow
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:14 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPc-0005Nd-2x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPc-0006yY-4j
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:12 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPc-0006yY-4j@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:12 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Flatten directory structure for
	easier work with git branches
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, 14 Oct 2007 04:51:07 -0000

commit 85bac6a9cc3b6277d8a56fd014a950f6b689453b
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 21:47:50 2007 -0400

    Flatten directory structure for easier work with git branches

diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..f5bf1e8
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,1105 @@
+ERC NEWS                                                       -*- outline -*-
+
+Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+* Changes in ERC 5.2
+
+** M-x erc RET now starts ERC.
+`erc-select' has been changed to `erc'.  `erc-select' still remains as
+an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
+`erc-ssl' with `erc-select-ssl' as its alias.  The function that was
+known as `erc' is now `erc-open'.
+
+** Open query buffers by default when private messages are received.
+The default value of `erc-auto-query' has been changed to 'bury.
+
+** New command: /RECONNECT
+This command tries to reconnect to the current IRC server exactly
+once.  It does not work in server buffers (throws an error before the
+command is run), but works in query and channel buffers.
+
+** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
+
+** Fix buggy interaction with multi-tty Emacs.
+
+** After running /QUIT, make sure that the IRC process is killed within
+4 seconds.  Freenode, in particular, needs this at times.
+
+** If the IRC process has not responded to our PINGs within a certain
+time, kill it and restart the connection.  See
+`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
+`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
+`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
+
+** Avoid getting into an infinite connection loop.
+Previously, this could happen if your nick was banned, you were using
+Tor, incorrect information was entered, or the connection was bad.
+
+** Make ban messages less confusing.
+
+** Restore the point correctly when reconnecting to an IRC server.
+
+** Make /IGNORE and /UNIGNORE prompt to determine whether their
+argument is a user or a regexp.  This results in less-confusing
+behavior when trying to ignore someone who has a bracket in their
+nick.
+
+** Make the default port "6667" rather than "ircd", because some
+operating systems don't know what port "ircd" maps to.
+
+** Fix several bugs in erc-iswitchb (C-c C-b).
+
+** Clean up internal documentation.
+Special thanks go to Juanma Barranquero for the thorough vetting of
+ERC's internal documentation.
+
+** Display a more informative message when a module is not found.
+
+** Fix a bug where paths were being colored like IRC commands.
+
+** In the customize interface for `erc-modules', add the name of the module.
+This makes it easier to find modules by name.
+
+** erc-server-send-ping-interval: Change to use a default of 30 seconds.
+
+** Some files which are included with the release of ERC 5.2 will not
+appear in the version of ERC that is bundled with Emacs 22.  These
+extras files may be found at:
+
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
+
+** Renamed files
+
+Several files were renamed so as to make them distinct to users of the
+MS-DOS operating system.
+
+ o erc-autojoin.el -> erc-join.el
+ o erc-complete.el -> erc-hecomplete.el
+ o erc-nickserv.el -> erc-services.el
+ o ChangeLog.NNNN -> ChangeLog.NN
+
+** Header line changes
+
+*** Remove "[IRC]" from the header line.
+
+*** Add the %l format character to `erc-header-line-format',
+
+*** Document how to remove the header line.
+Namely: (setq erc-header-line-format nil).
+
+** New options
+
+*** erc-server-reconnect-attempts: Determines the number of
+reconnection attempts that ERC will make per server.
+
+*** erc-server-reconnect-timeout: Determines the amount of time,
+in seconds, that ERC will wait between successive reconnect attempts.
+
+*** erc-server-send-ping-timeout: Determines when to consider a connection
+stalled and restart it.  The default is	after 120 seconds.
+
+*** erc-system-name: Determines the system name to use when logging in.
+The default is to figure this out by calling `system-name'.
+
+** New face: `erc-my-nick-face'
+This helps make it easier to distinguish messages sent by yourself
+from messages sent by other users when the value of the variable
+`erc-show-my-nick' is non-nil.
+
+** Namespace changes
+
+*** New macro: `erc-with-server-buffer'
+Switches to the current ERC server buffer and runs some code.  If no
+server buffer is available, return nil.  This is a useful way to
+access variables in the server buffer.
+
+*** New function: `erc-open-server-buffer-p'
+Returns non-nil if the given buffer is an ERC server buffer that has
+an open IRC process.
+
+*** New function: `erc-format-lag-time'
+Returns the estimated lag time to server, `erc-server-lag'.
+
+*** Renamed items
+
+ o `erc-server-setup-periodical-server-ping' is now
+   `erc-server-setup-periodical-ping'
+
+ o `erc-away-p' is now `erc-away-time'
+
+** Changes to the ERC manual
+
+*** New section: Sample Session.
+Describes a sample ERC session for connecting to the #emacs channel on
+Freenode.  Also mention the #erc channel.
+
+*** New section: Special Features.
+Describes some of the special features of ERC.
+
+*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
+interface.
+
+*** Development: Mention ErcDevelopment page on emacswiki.org.
+
+*** Tips and Tricks: Remove empty section for now.
+
+*** Options: Mention how to see available ERC options.
+
+*** Sample Configuration: Add an example of how to configure ERC.
+
+** New modules
+
+*** Autoaway (erc-autoaway.el)
+
+**** Make this much more reliable.
+
+**** Avoid duplicate messages when coming back from being away.
+
+**** Fix bug where autoaway was enabled just by loading the file.
+
+*** BBDB (erc-bbdb.el)
+
+**** Display information on how to cancel merging of info or how to
+create a new John Doe record.
+
+**** Make it so that information from /whois continues to come in, even
+while prompting for a record to merge.
+
+**** Make hitting C-g correctly abort merging the record.
+
+*** Capab identify (erc-capab.el)
+Mark users who haven't identified to NickServ on servers supporting
+CAPAB IDENTIFY-MSG.
+
+** Changes and additions to modules
+
+*** Button (erc-button.el)
+
+**** Make <backtab> go to the previous button.
+
+*** Channel tracking (erc-track.el)
+
+**** Use mouse-face and help-echo for channel names in the mode-line.
+This helps people using a mouse know that they are buttons and can be
+clicked on.
+
+**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
+This is accomplished by moving these bindings to their own global
+minor mode.  Now the default is to check whether the user has bound
+something to C-c C-SPC or C-c C-@.  If they have, prompt them about
+whether to really override that binding.  This also has the effect of
+preventing ERC from clobbering rcirc's keybinding, unless this is
+desired.  See `erc-track-enable-keybindings' for more details.
+
+**** New option: erc-track-enable-keybindings.
+Determine whether or not to enable the C-c C-SPC and C-c C-@
+keybindings.  The default is to ask whether to do this if a binding to
+these keys already exists.  It can also be set to t or nil to always
+bind or never bind, respectively.
+
+**** Remove `track-when-inactive' module.
+See `erc-track-when-inactive' for further details.
+
+**** New option: erc-track-when-inactive.
+This option replaces the track-when-inactive module.  Set it to
+non-nil to track activity even in visible buffers when inactive.  The
+default is nil.
+
+**** Remove the `track-modified-channels' alias for the `track' module.
+
+*** DCC support (erc-dcc.el)
+
+**** Add Usage section to Commentary.
+
+**** Fix a bug in the server message output.
+
+*** Filling (erc-fill.el)
+
+**** Fix bug involving messages that start with one or more blank lines.
+
+*** Identd (erc-identd.el)
+
+**** New option `erc-identd-port'
+Specifies the port to use if none is given as an argument to
+`erc-identd-start'.  This is placed in the new customization group
+`erc-identd'.
+
+**** New function: `erc-identd-quickstart'
+Ignores any arguments and calls `erc-identd-start'.
+
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
+*** Logging (erc-log.el)
+
+**** Make sure filenames are safe to use before writing to them.
+
+**** Save all log buffers when exiting Emacs.
+
+**** erc-generate-log-file-name-function: Add option for
+`erc-generate-log-file-name-network', which is a new function that
+uses the network name rather than the server name when possible.
+
+*** Menu (erc-menu.el)
+
+**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
+and other clients.
+
+**** Make this into a proper module and load it by default.
+
+**** Add "Current channel" submenu.
+
+*** Networks (erc-networks.el)
+
+**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
+
+**** Escape periods in Konfido.Net and Kewl.Org.
+
+*** Internet services / Nickserv (erc-nickserv.el)
+
+**** Add new 'both method for the `erc-nickserv-identify-mode' option
+and make it the default.  This tries to do the right thing both when a
+known nickserv message exists for an IRC network, and when it does
+not.
+
+**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
+
+**** Support authentication on BitlBee.
+
+**** Make source code easier to understand by using accessor functions.
+
+*** Sound support (erc-sound.el)
+
+**** Make this work with both Emacs 21 and Emacs 22.
+
+*** Timestamps (erc-stamp.el)
+
+**** Exclude the newline from the erc-timestamp field.
+
+**** New function: `erc-toggle-timestamps'.
+Toggles display of timestamps.
+
+* Changes in ERC 5.1.4
+
+** Make find-function and find-variable work in Emacs 22 for
+names that are constructed by `define-erc-module'.
+
+** Fix bug introduced in ERC 5.1.3 that caused messages to go the
+wrong buffer.
+
+** Changes and additions to modules
+
+*** Highlighting (erc-match.el)
+
+**** Don't activate view-mode.
+
+*** Logging (erc-log.el)
+
+**** When this module is activated, make sure logging is enabled on
+already-opened buffers.  Ditto for disabling logging when the module
+is deactivated.
+
+**** Fix some errors that occur when exiting Emacs without first
+quitting open IRC servers.
+
+* Changes in ERC 5.1.3
+
+** Fix use of /quote command with no initial whitespace.
+
+** Make it possible to customize the colorization of the header line.
+The `erc-header-line' face is used to color the header line.
+The `erc-header-line-face-method' determines the method to use when
+colorizing the header line.
+
+** Add the new function `erc-handle-irc-url', which is a suitable
+candidate to use for `url-irc-function'.  This permits some
+integration of url.el and ERC.
+
+** Fix several errors that occur when server or channel buffers are killed
+prematurely.
+
+** Fix toggling of flood control.
+
+** Match the patterns in `erc-encoding-coding-alist' as regexps,
+instead of verbatim text.  Also, match case-insensitively.
+
+** The /SMV command has been removed, since we no longer have
+meaningful module-specific version information.
+
+** Fix a "(stringp nil)" error that can happen when doing /PART.
+
+** Use a better example in the `erc-part-reason-various-alist'
+documentation.
+
+** When using `erc-quit-reason-various' and `erc-part-reason-various'
+and no matches are found, default to using the ERC version string
+rather than "nil".
+
+** Add the `list' and `page' modules to the `erc-modules' customize
+interface.
+
+** Changes to the ERC manual
+
+*** Update the list of available modules.
+
+*** Revise information about releases and development.
+
+*** Provide a simpler example in the "Getting Started" chapter.
+
+*** Fully document how to connect to an IRC server in the new
+"Connecting" chapter.
+
+** Changes and additions to modules
+
+*** Autoaway (erc-autoaway.el)
+
+**** Rename the `erc-autoaway-use-emacs-idle' option to
+`erc-autoaway-idle-method'.
+
+**** Add support for autoaway based on user idle time.
+This is now the default.
+
+**** If you set the AWAY status yourself, erc-autoaway will not
+interfere by un-setting AWAY prematurely.
+
+**** If you are set away while visiting a non-ERC buffer,
+erc-autoaway used to fail in bringing the user back.  This is now
+fixed.
+
+*** BBDB (erc-bbdb.el)
+
+**** Add new option `erc-bbdb-electric-p', which determines whether
+to make the BBDB buffer electric.  This defaults to not electric.
+
+*** Button (erc-button.el)
+
+**** Use <backtab> instead of <C-tab> for `erc-button-previous'.
+
+*** Identd (erc-identd.el)
+
+**** Fix a bug that involves starting the identd server.
+
+**** Make this work with Emacs 22.
+
+**** Provide a real ERC module named `identd'.
+
+**** Don't create an extra buffer for the identd process.
+
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
+*** Logging (erc-log.el)
+
+**** By default, don't insert old logs when opening an ERC buffer.
+This may be changed by customizing `erc-log-insert-log-on-open'.
+
+**** New option `erc-log-write-after-send' determines whether the
+log file will be written to after every sent message.  The default is
+not to do this.
+
+**** New option `erc-log-write-after-insert' determines whether the
+log file will be written to when new text is added to a logged ERC
+buffer.  The default is not to do this.  With this option and the
+previous option, logging should no longer slow down ERC as much.
+
+**** Default to saving buffers and queries on quit.
+This may be changed by customizing the `erc-save-buffer-on-quit' and
+`erc-save-queries-on-quit' options, respectively.
+
+**** Only perform logging when the `logging' module is added to
+`erc-modules'.  This prevents logging from being activated just by
+loading the erc-log.el file, and makes logging act like other ERC
+modules.
+
+*** Programmable completion (erc-pcomplete.el)
+
+**** Don't complete the user's current nickname.
+
+* Changes in ERC 5.1.2
+
+** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
+
+** Move to end of prompt when ERC reconnects to a server.
+
+** Changes and additions to modules
+
+*** Spell-checking (erc-spelling.el)
+
+**** Don't spell-check nicks or words that are prefixed with '/'.
+
+**** Remove flyspell properties from words we shouldn't spell-check.
+
+**** Fix an issue that caused the ispell process to reload every time
+we switch to an ERC buffer.
+
+*** Timestamps (erc-stamp.el)
+
+**** Fix an inconsistency in calculating width of right timestamps.
+
+**** Rename option `erc-timestamp-right-align-by-pixel' to
+`erc-timestamp-use-align-to'.  This controls whether to use the more
+fail-proof method of aligning right timestamps, as mentioned below.
+
+**** Fix a right timestamp spacing problem that used to occur when
+erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
+use the method that aligns right timestamps perfectly in Emacs22 with
+X.  If the current version of Emacs doesn't support this method, use
+the simpler method, which is prone to alignment issues for math
+symbols and other variable-width text.
+
+A side effect of using this new method is that there will only be one
+space before a right timestamp in any saved logs.  If this is
+unacceptable, set `erc-timestamp-use-align-to' to nil.
+
+* Changes in ERC 5.1.1
+
+** Fix a requirement on cl.el.
+
+** Use tls.el for SSL connections, rather than ssl.el.
+
+** Changes and additions to modules
+
+*** ibuffer integration (erc-ibuffer.el)
+
+**** Update this to work with the version of ibuffer.el that comes with
+recent Emacs variants.
+
+*** Old completion (erc-complete.el)
+
+**** Fix a few errors.
+
+*** Speedbar (erc-speedbar.el)
+
+**** Make this work with the version of speedbar.el that comes with
+recent Emacs variants.
+
+*** Timestamps (erc-stamp.el)
+
+**** By default, use a more failsafe method of displaying right timestamps.
+To get right timestamps to align perfectly in Emacs22 using X, set the
+new `erc-timestamp-right-align-by-pixel' option to non-nil.
+
+*** Viper compatibility (erc-viper.el)
+
+**** Since most of these changes are now merged into Emacs22, detect
+whether we need these changes and install them only if necessary.
+
+* Changes in ERC 5.1
+
+** Improve XEmacs compatibility.
+
+** Namespace changes
+
+*** Now ERC doesn't use global variable space.
+Renamed all variables that didn't start with "erc-".
+
+  o `away' is now `erc-away'
+
+  o `current-nick' is now `erc-server-current-nick'
+
+  o `last-peers' is now `erc-server-last-peers'
+
+  o `last-ping-time' is now `erc-server-last-ping-time'
+
+  o `last-sent-time' is now `erc-server-last-sent-time'
+
+  o `lines-sent' is now `erc-server-lines-sent'
+
+  o `quitting' is now `erc-server-quitting'
+
+*** Remove the `with-erc-channel-buffer' function.
+
+** Bugfixes
+
+*** Don't inadvertently destroy face properties.
+
+*** Load erc scripts in a safer way.
+
+*** Don't insert a timestamp if text at point is invisible.
+
+*** Don't hide messages from those in `erc-fools' by default.
+Color their nicks instead.
+
+*** Use a more foolproof method of encoding and decoding strings
+before sending to a channel.
+
+** Backend changes
+
+*** Renamed some server-specific variables
+
+  o `erc-announced-server-name' is now `erc-server-announced-name'
+
+  o `erc-auto-reconnect' is now `erc-server-auto-reconnect'
+
+  o `erc-connect-function' is now `erc-server-connect-function'
+
+  o `erc-default-coding-system' is now `erc-server-coding-system'
+
+  o `erc-duplicate-timeout' is now `erc-server-duplicate-timeout'
+
+  o `erc-duplicates' is now `erc-server-duplicates'
+
+  o `erc-lag' is now `erc-server-lag'
+
+  o `erc-prevent-duplicates' is now `erc-server-prevent-duplicates'
+
+  o `erc-previous-read' is now `erc-server-filter-data'
+
+  o `erc-process' is now `erc-server-process'
+
+  o `erc-ping-handler' is now `erc-server-send-ping-handler'
+
+  o `erc-ping-interval' is now `erc-server-send-ping-interval'
+
+*** Renamed some functions
+
+  o `erc-connect' is now `erc-server-connect'
+
+  o `erc-process-filter' is now `erc-server-filter-function'
+
+  o `erc-send-command' is now `erc-server-send'
+
+  o `erc-send-single-line' is now `erc-send-input'
+
+  o `erc-setup-periodical-server-ping' is now
+    `erc-server-setup-periodical-server-ping'
+
+  o `erc-split-command is now `erc-split-line'
+
+*** New options
+
+  o erc-server-flood-margin, erc-server-flood-penalty: New options
+    that allow tweaking of flood control.
+
+  o erc-split-line-length: The maximum line length of a single
+    message.
+
+*** New variables
+
+  o erc-server-flood-last-message, erc-server-flood-queue,
+    erc-server-flood-timer: Flood control.
+
+  o erc-server-processing-p: Indicate when we're currently processing
+    a message.
+
+*** Remove some options
+
+  o `erc-flood-limit'
+  o `erc-flood-limit2'
+
+** New customization group `erc-server' for dealing with IRC servers.
+
+** ERC can now be installed by doing `make install' from the command line.
+
+** ERC now has a manual in erc.texi.
+Type `make doc' to generate HTML and Info versions of it.
+
+** ERC no longer depends on cl.el.
+Only the macros in cl-macs.el are used.
+
+** Fix an edge case when quitting as new messages come in.
+
+** Make flood protection toggle-able as on/off, removing the 'strict option.
+
+** If possible, re-use channel buffers when reconnecting to a server.
+
+** Text in ERC buffers is now read-only by default.
+To get the previous behavior, 
+
+** Changes and additions to modules
+
+*** Auto-join (erc-autojoin.el)
+
+**** Recognize the Azzurra server.
+
+*** BBDB (erc-bbdb.el)
+
+**** When the user types /WHOIS, ask for a record to merge to.
+
+**** Store the displayed name of a BitlBee contact.
+The new `erc-bbdb-bitlbee-name-field' option specifies the field to use
+to store this information.
+
+**** Don't prompt for a name on /JOIN or /NICK.
+
+*** Button (erc-button.el)
+
+**** Fix customization of `erc-button-alist'
+
+**** New option `erc-button-nickname-face' determines the face to use
+when coloring ERC nicknames.
+
+*** Channel tracking (erc-track.el)
+
+**** Remove channels from the modified channels list if not currently
+connected.  This should remove residue from the mode line after
+quitting ERC.
+
+**** Recognize buttonized text
+
+*** Highlighting (erc-match.el)
+
+**** Highlight current nickname by default.
+
+**** Added the option of beeping when certain matches occur.
+Add `erc-beep-on-match' to `erc-text-matched-hook' to enable
+beeping.  Set the new variable `erc-beep-match-types' which match
+types that make beeps.
+
+*** Nicklist (erc-nicklist.el)
+
+**** Fix a couple of errors.
+
+**** Make sure a stray mouse click doesn't trigger an error.
+
+**** Insert icons from the /images directory next to nicks.
+This indicates their away status.  The location is customizable via
+the new `erc-nicklist-icons-directory' option.
+
+If you do not want these icons, set `erc-nicklist-use-icons' to nil.
+
+*** Nickserv identification (erc-nickserv.el)
+
+**** Recognize Azzurra and OFTC networks.
+
+*** Old completion (erc-complete.el)
+
+**** Disable by default.
+
+*** Programmable completion (erc-pcomplete.el)
+
+**** Enable by default.
+
+*** Timestamps (erc-stamp.el)
+
+**** On Emacs22, align right timestamps perfectly, even if variable-width
+characters are used.  If we aren't using Emacs22, move text farther
+away from the right margin when variable-width characters are used.
+It is considered better to misalign the stamp by a bit than to go past
+the right margin.
+
+**** Enable by default
+
+** New modules
+
+*** Spell-checking (erc-spelling.el)
+
+**** Use flyspell in ERC.
+
+*** Viper compatibility (erc-viper.el)
+
+**** Helps ERC work correctly in viper-mode.
+
+* Changes in ERC 5.0.4
+
+** Fix a problem with undo in channels.
+
+* Changes in ERC 5.0.3
+
+** Fix typo in the `ctcp-request-to' entry of the English catalog.
+
+** Debugging with edegug has been made easier in all of the
+erc-with-* and with-erc* macros.
+
+** Non-ASCII character sets should be better supported when sending
+and processing messages.
+
+** A load failure with erc-autoaway.el and Emacs21 has been fixed.
+
+** A few XEmacs warnings were fixed.
+
+** Changes and additions to modules
+
+*** Backend (erc-backend.el)
+
+**** Move the check for hidden messages into `erc-display-message'
+so there isn't so much replicated code.
+
+**** Add `definition-name' property to constructed symbols so that
+`find-function' and `find-variable' will be able to locate them.
+
+**** Make sure logs are inserted info the correct channel buffers.
+There was previously an error when using `erc-insert-log-on-open' in
+combination with autojoin to multiple channels.
+
+*** Button (erc-button.el)
+
+**** The layering of `erc-button-face' on other faces in ERC buffers
+has been improved.
+
+*** Channel tracking (erc-track.el)
+
+**** Use optimal amount of whitespace around modified channels
+indicator.  Previously, there was an additional unnecessary space.
+
+**** Fix an error that occurred when unchecked buffers existed when
+invoking /QUIT.
+
+* Changes in ERC 5.0.2
+
+** If a channel key is required for a certain channel, ERC will prompt
+for one if `erc-prompt-for-channel-key' is non-nil.
+
+** ERC doesn't try to reconnect if the network connection is refused
+when using `open-network-stream-nowait' as the `erc-connect-function'.
+
+** Messages from multiple servers will not go to the currently active
+buffer.  The messages from each server will be contained in the most
+recently active channel/server buffer that corresponds with the
+server.
+
+** Some text messages were cleaned up slightly.
+
+** Button faces should no longer "cover" other faces.
+
+** Made some XEmacs compatibility fixes.
+
+** Nicknames containing a backslash are now correctly highlighted as
+current-nick and buttonized as nicks.
+
+** `erc-server-select' doesn't offer networks without servers as a
+choice anymore.
+
+** Non-ASCII character support has been improved.
+
+** Changes and additions to modules
+
+*** Menu (erc-menu.el)
+
+**** You can now save logs and truncate buffers from the menu-bar.
+
+* Changes in ERC 5.0.1
+
+** Narrowing in ERC buffers no longer causes formatting errors.
+
+** The BBDB module now loads correctly when customizing `erc-modules'.
+
+** The value of `erc-button-face' is now respected.
+
+** Fixed a bug which caused a read-only error during connection.
+
+** Server buffers are now tracked correctly.
+This means that `erc-track-priority-faces-only', `erc-track-exclude',
+and `erc-track-exclude-types' now work with server buffers.
+
+* Changes in ERC 5.0
+
+** Channel members are now stored as a hash-table.
+`erc-server-users' and `erc-channel-users' are now hash-tables, rather
+than alists.  This significantly increases performance, especially in
+large channels.  Each channel member is stored as an `erc-server-user'
+struct, with additional information about the channels they are on
+stored in an `erc-channel-user' struct.  Code using old alist-style
+channel members needs to be updated to work with hash-tables.
+This new code also removes the need for erc-members.el, which has been
+removed.
+
+** The way ERC deals with input from the server has changed.
+All server response code is now in a new file, erc-backend.el.  There
+should be no real user visible changes.  There are, however, a few
+major changes for implementers, and module writers:
+
+*** The PARSED response that all handlers get called with is
+    no longer a vector, but an `erc-response' struct.
+
+    This means LESS MAGIC NUMBERS in the ERC source code, but a few
+    changes in how you get at parsed responses.
+
+    The sender is accessed via `erc-response.sender'.
+
+    The command is accessed via `erc-response.command'.
+
+    The arguments to the command (everything after the command and
+    before the colon) are accessed via `erc-response.command-args'.
+    This is a /list/ of arguments in the order they appear in the
+    unparsed response.
+
+    The contents of the response is accessed via
+    `erc-response.contents'.
+
+    Should, for some reason, you want to do something with the
+    /unparsed/ response, you can get it via `erc-response.unparsed'.
+
+*** The `erc-server-hook-list' mechanism is gone.
+
+    All server response handlers should be defined with
+    `define-erc-response-handler'.  This defines functions and
+    corresponding hook variables.
+
+    The mapping of server commands to hook variables is no longer
+    done via `erc-event-to-hook', but through an #'equal hashtable,
+    `erc-server-responses'.  In order to find a hook you do:
+
+    (erc-get-hook command)
+
+    See the docstring of `define-erc-response-handler' for more
+    information.
+
+*** ALL hook variables have been renamed.
+
+    In accordance with recommendations in the Emacs Lisp manual,
+    the hook variables are no longer called `erc-server-FOO-hook',
+    but rather `erc-server-FOO-functions'.  This is to indicate
+    that the functions they call take arguments.
+
+    All the modules in ERC have been updated to reflect this change,
+    but external module authors should beware.
+
+** The values of `erc-mode-line-format' and `erc-header-line-format'
+are now defined as strings to be formatted using `format-spec'.
+`erc-mode-line-format' does not replace the whole mode-line anymore,
+only `mode-line-buffer-identification' is set.  This way, personal
+mode-line configurations are not modified and all key bindings work as
+expected.  The process status (connecting, closed) is now shown in
+`mode-line-process'.
+
+** Customization of ERC variables has been made easier.  Variables
+have been split into more groups for better organization.
+
+** New variables
+
+  o `erc-send-whitespace-lines' - Set this to send lines even if they
+    are empty.
+
+  o `erc-manual-set-nick-on-bad-nick-p' - If the nickname you chose is
+    already taken or not allowed, your nick is not changed and you can
+    try again manually if this is non-nil.
+
+  o `erc-mode-line-away-status-format' - You can now set what is shown
+    in the mode-line when you are away.
+
+  o `erc-header-line-uses-help-echo-p' - The header-line now uses the
+    help-echo property. You can set this to nil to disable it.
+
+  o `erc-format-query-as-channel-p' - Set this to nil to have messages
+    in the query buffer formatted like private messages.
+
+  o `erc-show-channel-key-p' - The channel key is now shown with the
+    other channel modes in the header line. Set this to nil if you
+    want it hidden.
+
+  o `erc-prompt-for-channel-key' - Set this if you want to be prompted
+    for the channel key (channel's mode is +k) when you call
+    `erc-join-channel' interactively.
+
+  o `erc-kill-server-buffer-on-quit' - If non-nil, kill the server
+    buffer automatically when you quit.
+
+** New hooks
+
+  o `erc-join-hook' - Called when you join a channel.
+
+  o `erc-kick-hook' - Called when you are kicked from a channel. The
+    channel's buffer is sent as an argument to functions called from
+    this hook.
+
+  o `erc-nick-changed-functions' - Whenever your nickname changes
+    successfully, the functions in this hook are run with the
+    arguments NEW-NICK and OLD-NICK.
+
+** New command /WHOAMI - Do a /WHOIS on your current nickname.
+
+** The key binding for changing channel modes is now C-c C-o.
+
+** Removed variables
+
+  o `erc-echo-notices-in-minibuffer-flag' and
+    `erc-echo-notices-in-current-buffer' - You should use
+    `erc-echo-notice-hook' and `erc-echo-notice-always-hook' instead.
+
+  o `erc-prompt-interactive-input' has been removed (commented out)
+    because nickname completion does not work with it.
+
+  o All INFO buffer-related variables and functions have been removed.
+
+** You can now disable modules by setting `erc-modules' with the
+customization interface.
+
+** Changes and additions to modules
+
+*** Autoaway (erc-autoaway.el)
+
+**** New variable `erc-autoaway-no-auto-back-regexp' - Add text which,
+when you type anything matching it, will not automatically discard
+your away status when `erc-auto-discard-away' is non-nil.
+
+*** Filling (erc-fill.el)
+
+**** New variable `erc-fill-variable-maximum-indentation' - Don't
+indent more than this many characters when indenting a message from a
+user with a long nickname.
+
+*** Goodies (erc-goodies.el)
+
+**** Miscellaneous small modules have been moved from erc.el.
+The functions erc-add-scroll-to-bottom, erc-make-read-only,
+erc-send-distinguish-noncommands, erc-interpret-controls, erc-unmorse,
+erc-smiley, and erc-occur, which were defined in the main erc.el file
+have been moved to erc-goodies.el and have mostly been translated to
+the modules scrolltobottom, readonly, noncommands, irccontrols, smiley
+and unmorse.
+
+**** New variables
+
+  o `erc-input-line-position' - The line number to use with
+    `erc-scroll-to-bottom'.
+
+  o `erc-beep-p' - Beep if there is a \C-g control character in a
+    message.
+
+*** Channel lists (erc-list.el)
+
+**** New variable `erc-chanlist-highlight-face' - A face used for
+highlighting the current line.
+
+*** Highlighting (erc-match.el)
+
+**** `erc-current-nick-highlight-type' has new options: 'keyword and
+'nick-or-keyword.
+
+*** Menu (erc-menu.el)
+
+**** The `IRC' menu is now automatically added to `erc-mode' buffers.
+
+*** Networks (erc-nets.el)
+
+**** The functions for determining current network are in this file.
+There were a couple of functions spread about in different files which
+each had a different way of determining the current network.  The
+methods have been combined, and the big list of known networks
+(`erc-networks-alist') is being put to use.  You can access the
+network's name by calling the new function `erc-network'.  This
+returns the name of the current network as a symbol or 'Unknown if it
+could not determine which network it is.
+
+*** Nicklist (erc-nicklist.el)
+
+**** ERC has a new way of displaying nicknames in a channel.
+The new file erc-nicklist.el defines a new command `erc-nicklist'
+which pops up a small Emacs window showing the nicknames of all
+members of the current channel.  The implementation is not complete
+and is rather proof-of-concept for now.  The result is something a bit
+like erc-speedbar, but not quite as invasive, and doesn't require use
+of a new frame.
+
+*** Internet services / Nickserv (erc-nickserv.el)
+
+**** Network detection is now taken care of by erc-nets.el.
+The function `erc-current-network' is deprecated, use `erc-network'
+instead.  The variable `erc-networks' has been removed, use
+`erc-networks-alist'.  The network symbols used in
+`erc-nickserv-alist' now match those in `erc-networks-alist'.
+
+**** New variable `erc-nickserv-identify-mode' - Choose which method
+to use for automatic identification: you can wait for Nickserv to ask
+you to identify (the default), or send an identify message
+automatically after you change your nickname.
+
+*** Speedbar (erc-speedbar.el)
+
+**** New variable `erc-speedbar-sort-users-type' - Sort users in a
+channel by activity, alphabetically, or not at all.
+
+*** Timestamps (erc-stamp.el)
+
+**** `erc-timestamp-only-if-changed-flag' now works when
+`erc-insert-timestamp-function' is set to 'erc-insert-timestamp-left.
+
+**** New variable `erc-timestamp-intangible' - Set this to nil if
+timestamps should not have the 'intangible property.
+
+*** Channel tracking (erc-track.el)
+
+**** Using faces to indicate channel activity in the modeline now works
+in XEmacs.
+
+**** New variables
+
+  o `erc-track-priority-faces-only' - Ignore changes in a channel
+    unless there is a face from the `erc-track-faces-priority-list' in
+    the message.
+
+  o `erc-track-exclude-server-buffer' - Ignore changes in the server
+    buffer.
+
+  o `erc-track-position-in-mode-line' - Set the position in the
+    mode-line where modified channels are shown (only works in GNU
+    Emacs versions above 21.3).
+
+* Changes in ERC 4.0
+
+** The module system has again changed a lot.  You can now customize
+  the variable `erc-modules' and define once and for all which
+  extension modules you want to use.  This unfortunately may require
+  you to change your current erc initialisation code a bit, if you
+  have some existing customsations.  On the other hand, this change
+  makes the configuration of extension modules a lot easier for new
+  users.  In theory, you should be able to configure all aspects of
+  ERC by using the customize interface, you should no longer really
+  need to write Lisp code for trivial customizations.
+
+  By default, the following modules are now loaded: (pcomplete
+  netsplit fill track ring button autojoin)
+
+  Please use M-x customize-variable RET erc-modules RET to change the
+  default if it does not suite your needs.
+
+** THe symbol used in `erc-nickserv-passwords' for debian.org IRC servers
+  (formerly called OpenProjects, now FreeNode) has changed from
+  openprojects to freenode.  You may need to update your configuration
+  for a successful automatic nickserv identification.
+
+* Changes in ERC 3.0.cvs.20030119
+
+** New module erc-dcc:
+
+This finally implements DCC.  It requires server sockets to fully work
+in both directions.  This feature is currently only available in Emacs
+21.3.50 (CVS). Here is a short list of what should work though.
+
+** Compatibility:
+  * Emacs 21.2, DCC get, and accepting DCC chat offers.
+  * XEmacs 21, Only accepting DCC chat offers.
+
+** erc is switching to global-minor-modes for activation of submodules.
+
+This allows you to customize such a mode and get automatic loading of
+the module.  No longer putting a lot of require statments in .emacs.
+At least this is the long-term plan, not all modules are converted
+yet.
+
+** The most important user visible change is that you now need to activate
+erc-completion-mode, to get TAB completion.  The new completion code
+is based on pcomplete.  To get the old code, manually load
+erc-complete and bind TAB to erc-complete in erc-mode-map.
+
+To activate completion on startup, put (erc-completion-mode 1) in your
+.emacs file.
+
+Same applies to timestamps.  You no longer need to (require
+'erc-stamp), you can customize the variable `erc-timestamp-mode', and
+the rest should be automatic.
+
+
+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.
+
+arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1
diff --git a/erc.texi b/erc.texi
new file mode 100644
index 0000000..6b78347
--- /dev/null
+++ b/erc.texi
@@ -0,0 +1,1024 @@
+\input texinfo
+@c %**start of header
+@setfilename ../info/erc
+@settitle ERC Manual
+@c %**end of header
+
+@dircategory Emacs
+@direntry
+* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
+@end direntry
+
+@syncodeindex fn cp
+
+@copying
+This manual is for ERC version 5.2.
+
+Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, Front-Cover texts, or Back-Cover Texts.  A copy of
+the license is included in the section entitled ``GNU Free
+Documentation License'' in the Emacs manual.
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+
+All Emacs Lisp code contained in this document may be used, distributed,
+and modified without restriction.
+@end quotation
+@end copying
+
+@titlepage
+@title ERC manual
+@subtitle a full-featured IRC client
+@subtitle for GNU Emacs and XEmacs
+
+@c The following two commands
+@c start the copyright page.
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@c So the toc is printed at the start
+@contents
+
+@ifnottex
+@node Top, Introduction, (dir), (dir)
+@comment  node-name,  next,  previous,  up
+@top ERC
+
+@insertcopying
+@end ifnottex
+
+@menu
+* Introduction::                What is ERC?
+* Obtaining ERC::               How to get ERC releases and development
+                                  versions.
+* Installation::                Compiling and installing ERC.
+* Getting Started::             Quick Start guide to using ERC.
+* Keystroke Summary::           Keystrokes used in ERC buffers.
+* Modules::                     Available modules for ERC.
+* Advanced Usage::              Cool ways of using ERC.
+* Getting Help and Reporting Bugs::  
+* History::                     The history of ERC.
+* GNU Free Documentation License:: The license for this documentation.
+* Concept Index::               Search for terms.
+
+@detailmenu
+ --- The Detailed Node Listing ---
+
+Obtaining ERC
+
+* Releases::                    Released versions of ERC.
+* Development::                 Latest unreleased development changes.
+
+Getting Started
+
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
+
+Advanced Usage
+
+* Connecting::                  Ways of connecting to an IRC server.
+* Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
+
+@end detailmenu
+@end menu
+
+@node Introduction, Obtaining ERC, Top, Top
+@comment  node-name,  next,  previous,  up
+@chapter Introduction
+
+ERC is a powerful, modular, and extensible IRC client for Emacs.
+
+It comes with the following capabilities enabled by default.
+
+@itemize @bullet
+@item Flood control
+@item Timestamps
+@item Join channels automatically
+@item Buttonize URLs, nicknames, and other text
+@item Wrap long lines
+@item Highlight or remove IRC control characters
+@item Highlight pals, fools, and other keywords
+@item Detect netsplits
+@item Complete nicknames and commands in a programmable fashion
+@item Make displayed lines read-only
+@item Input history
+@item Track channel activity in the mode-line
+
+@end itemize
+
+@node Obtaining ERC, Installation, Introduction, Top
+@comment  node-name,  next,  previous,  up
+@chapter Obtaining ERC
+
+@menu
+* Releases::                    Released versions of ERC.
+* Development::                 Latest unreleased development changes.
+@end menu
+
+Note that some ERC files are not included with Emacs due to copyright or
+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}
+@end itemize
+
+The rest of this chapter may be skipped if you are using the version of
+ERC that comes with Emacs.
+
+@node Releases, Development, Obtaining ERC, Obtaining ERC
+@comment  node-name,  next,  previous,  up
+@section Releases
+
+Choose to install a release if you want to minimize risk.
+
+Errors are corrected in development first.  User-visible changes will be
+announced on the @email{erc-discuss@@gnu.org} mailing list.
+@pxref{Getting Help and Reporting Bugs}.
+
+@cindex releases, Debian package
+@cindex Debian package for ERC
+Debian users can get ERC via apt-get.  The @file{erc} package is
+available in the official Debian repository.
+
+@cindex releases, from source
+Alternatively, you can download the latest release from
+@uref{http://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
+
+@node Development,  , Releases, Obtaining ERC
+@comment  node-name,  next,  previous,  up
+@section Development
+@cindex development
+
+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
+
+ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
+up-to-date involves the following steps.
+
+@enumerate
+@cindex GNU Arch, installing
+@item Install arch
+
+@itemize @bullet
+@item Debian: @kbd{apt-get install tla}.
+@item Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
+@end itemize
+
+@cindex GNU Arch, downloading ERC
+@item Register the archive.
+@example
+tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
+@end example
+
+@item Download the ERC source code.
+@example
+# Download ERC into the @file{erc} directory.
+tla get erc@@sv.gnu.org/erc--main--0 erc
+@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.
+
+@example
+# Change to the source directory you are interested in.
+cd erc/
+
+# Display the summary of changes
+tla missing --summary
+@end example
+
+@cindex GNU Arch, updating ERC
+@item Update to the latest version by replaying missing changes.
+@example
+cd erc
+tla update
+@end example
+
+@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.
+
+@subheading Development snapshots
+
+@cindex development snapshot
+Alternatively, the latest development snapshot may be downloaded in both
+``.tar.gz'' and ``.zip'' forms.
+
+@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
+
+
+@node Installation, Getting Started, Obtaining ERC, Top
+@comment  node-name,  next,  previous,  up
+@chapter Installation
+
+ERC may be compiled and installed on your machine.
+
+This section may be skipped if you are using the version of ERC that
+comes with Emacs.
+
+@subsubheading Compilation
+
+This is an optional step, since Emacs Lisp source code does not
+necessarily have to be byte-compiled.  It will yield a speed increase,
+though.
+
+A working copy of Emacs or XEmacs is needed in order to compile ERC.  By
+default, the program that is installed with the name @command{emacs}
+will be used.
+
+If you want to use the @command{xemacs} binary to perform the
+compilation, you would need to edit @file{Makefile} in the top-level
+directory as follows.  You can put either a full path to an Emacs or
+XEmacs binary or just the command name, as long as it is in the
+@env{PATH}.
+
+@example
+EMACS    = xemacs
+SITEFLAG = -no-site-file
+@end example
+
+Running @code{make} should compile the ERC source files in the
+@file{lisp} directory.
+
+@subsubheading Installation
+
+ERC may be installed into your file hierarchy by doing the following.
+
+Edit the @file{Makefile} file so that @env{ELISPDIR} points to where you
+want the source and compiled ERC files to be installed and
+@env{INFODIR} indicates where to put the ERC manual.  Of course, you
+will want to edit @env{EMACS} and @env{SITEFLAG} as shown in the
+Compilation section if you are using XEmacs.
+
+If you are installing ERC on a Debian system, you might want to change
+the value of @env{INSTALLINFO} as specified in @file{Makefile}.
+
+Run @code{make} as a normal user.
+
+Run @code{make install} as the root user if you have chosen installation
+locations that require this.
+
+
+@node Getting Started, Keystroke Summary, Installation, Top
+@comment  node-name,  next,  previous,  up
+@chapter Getting Started
+@cindex settings
+
+To use ERC, add the directory containing its files to your
+@code{load-path} variable, in your @file{.emacs} file.  Then, load ERC
+itself.  An example follows.
+
+@lisp
+(require 'erc)
+@end lisp
+
+Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
+prompt for the server to connect to.
+
+If you want to place ERC settings in their own file, you can place them
+in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
+
+If you would rather use the Customize interface to change how ERC works,
+do @kbd{M-x customize-group RET erc RET}.  In particular, ERC comes with
+lots of modules that may be enabled or disabled; to select which ones
+you want, do @kbd{M-x customize-variable RET erc-modules RET}.
+
+@menu
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
+@end menu
+
+@node Sample Session, Special Features, Getting Started, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Sample Session
+
+This is an example ERC session which shows how to connect to the #emacs
+channel on Freenode.  Another IRC channel on Freenode that may be of
+interest is #erc, which is a channel where ERC users and developers hang
+out.
+
+@itemize @bullet
+
+@item Connect to Freenode
+
+Run @kbd{M-x erc}.  Use ``irc.freenode.net'' as the IRC server, ``6667''
+as the port, and choose a nickname.
+
+@item Get used to the interface
+
+Switch to the ``irc.freenode.net:6667'' buffer, if you're not already
+there.  You will see first some messages about checking for ident, and
+then a bunch of other messages that describe the current IRC server.
+
+@item Join the #emacs channel
+
+In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}.  Depending
+on how you've set up ERC, either a new buffer for ``#emacs'' will be
+displayed, or a new buffer called ``#emacs'' will be created in the
+background.  If the latter, switch to the ``#emacs'' buffer.  You will
+see the channel topic and a list of the people who are currently on the
+channel.
+
+@item Register your nickname with Freenode
+
+If you would like to be able to talk with people privately on the
+Freenode network, you will have to ``register'' your nickname.  To do
+so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg
+NickServ register <password>'', replacing ``<password>'' with your
+desired password.  It should tell you that the operation was successful.
+
+@item Talk to people in the channel
+
+If you switch back to the ``#emacs'' buffer, you can type a message, and
+everyone on the channel will see it.
+
+@item Open a query buffer to talk to someone
+
+If you want to talk with someone in private (this should usually not be
+done for technical help, only for personal questions), type ``/query
+<nick>'', replacing ``<nick>'' with the nickname of the person you would
+like to talk to.  Depending on how ERC is set up, you will either see a
+new buffer with the name of the person, or such a buffer will be created
+in the background and you will have to switch to it.  Begin typing
+messages, and you will be able to have a conversation.
+
+Note that if the other person is not registered, you will not be able to
+talk with them.
+
+@end itemize
+
+@node Special Features, , Sample Session, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Special Features
+
+ERC has some features that distinguish it from some IRC clients.
+
+@itemize @bullet
+
+@item multiple channels and multiple servers
+
+Every channel is put in a separate buffer.  Several IRC servers may be
+connected to at the same time.
+
+@cindex query buffers
+@item private message separation
+
+Private conversations are treated as channels, and are put into separate
+buffers in Emacs.  We call these ``query buffers''.
+
+@item highlighting
+
+Some occurences of words can be highlighted, which makes it easier to
+track different kinds of conversations.
+
+@item notification
+
+ERC can notify you that certain users are online.
+
+@item channel tracking
+
+Channels can be hidden and conversation continue in the background.  You
+are notified when something is said in such a channel that is not
+currently visible.  This makes it easy to get Real Work done while still
+maintaining an IRC presence.
+
+@item nick completion
+
+ERC can complete words upon hitting @kbd{TAB}, which eases the writing
+of nicknames in messages.
+
+@cindex history ring
+@item history
+
+Past actions are kept in history rings for future use.  To navigate a
+history ring, hit @kbd{M-p} to go backwards and @kbd{M-n} to go
+forwards.
+
+@item multiple languages
+
+Different channels and servers may have different language encodings.
+
+In addition, it is possible to translate the messages that ERC uses into
+multiple languages.  Please contact the developers of ERC at
+@email{erc-discuss@@gnu.org} if you are interested in helping with the
+translation effort.
+
+@item user scripting
+
+Users can load scripts (e.g. auto greeting scripts) when ERC starts up.
+
+It is also possible to make custom IRC commands, if you know a little
+Emacs Lisp.  Just make an Emacs Lisp function and call it
+@code{erc-cmd-NEWCOMMAND}, where @code{NEWCOMMAND} is the name of the
+new command in capital letters.
+
+@item auto reconnect
+
+If the connection goes away at some point, ERC will try to reconnect
+automatically.  If it fails to reconnect, and you want to try to
+manually reestablish the connection at some later point, switch to an
+ERC  buffer and run the @code{/RECONNECT} command.
+
+@end itemize
+
+
+@node Keystroke Summary, Modules, Getting Started, Top
+@comment  node-name,  next,  previous,  up
+@chapter Keys Used in ERC
+@cindex keystrokes
+
+This is a summary of keystrokes available in every ERC buffer.
+
+@table @kbd
+
+@item C-a or <home> (`erc-bol')
+Go to beginning of line or end of prompt.
+
+@item RET (`erc-send-current-line')
+Send the current line
+
+@item TAB (`erc-complete-word')
+If at prompt, complete the current word.
+Otherwise, move to the next link or button.
+
+@item M-TAB (`ispell-complete-word')
+Complete the given word, using ispell.
+
+@item C-c C-a (`erc-bol')
+Go to beginning of line or end of prompt.
+
+@item C-c C-b (`erc-iswitchb')
+Use `iswitchb-read-buffer' to prompt for a ERC buffer to switch to.
+
+@item C-c C-c (`erc-toggle-interpret-controls')
+Toggle interpretation of control sequences in messages.
+
+@item C-c C-d (`erc-input-action')
+Interactively input a user action and send it to IRC.
+
+@item C-c C-e (`erc-toggle-ctcp-autoresponse')
+Toggle automatic CTCP replies (like VERSION and PING).
+
+@item C-c C-f (`erc-toggle-flood-control')
+Toggle use of flood control on sent messages.
+
+@item C-c TAB (`erc-invite-only-mode')
+Turn on the invite only mode (+i) for the current channel.
+
+@item C-c C-j (`erc-join-channel')
+Join channel.  If point is at the beginning of a channel name, use that
+as default.
+
+@item C-c C-k (`erc-go-to-log-matches-buffer')
+Interactively open an erc-log-matches buffer
+
+@item C-c C-l (`erc-save-buffer-in-logs')
+Append buffer contents to the log file, if logging is enabled.
+
+@item C-c C-n (`erc-channel-names')
+Run "/names #channel" in the current channel.
+
+@item C-c C-o (`erc-get-channel-mode-from-keypress')
+Read a key sequence and call the corresponding channel mode function.
+After doing @kbd{C-c C-o}, type in a channel mode letter.
+
+@kbd{C-g} means quit.
+@kbd{RET} lets you type more than one mode at a time.
+If @kbd{l} is pressed, @code{erc-set-channel-limit} gets called.
+If @kbd{k} is pressed, @code{erc-set-channel-key} gets called.
+Anything else will be sent to `erc-toggle-channel-mode'.
+
+@item C-c C-p (`erc-part-from-channel')
+Part from the current channel and prompt for a reason.
+
+@item C-c C-q (`erc-quit-server')
+Disconnect from current server after prompting for reason.
+
+@item C-c C-r (`erc-remove-text-properties-region')
+Clears the region (start,end) in object from all colors, etc.
+
+@item C-c C-t (`erc-set-topic')
+Prompt for a topic for the current channel.
+
+@item C-c C-u (`erc-kill-input')
+Kill current input line using `erc-bol' followed by `kill-line'.
+
+@end table
+
+
+@node Modules, Advanced Usage, Keystroke Summary, Top
+@comment  node-name,  next,  previous,  up
+@chapter Modules
+@cindex modules
+
+One way to add functionality to ERC is to customize which of its many
+modules are loaded.
+
+There is a spiffy customize interface, which may be reached by typing
+@kbd{M-x customize-option erc-modules RET}.  Alternatively, set
+@code{erc-modules} manually and then call @code{erc-update-modules}.
+
+The following is a list of available modules.
+
+@table @code
+
+@cindex modules, autoaway
+@item autoaway
+Set away status automatically
+
+@cindex modules, autojoin
+@item autojoin
+Join channels automatically
+
+@cindex modules, bbdb
+@item bbdb
+Integrate with the Big Brother Database
+
+@cindex modules, button
+@item button
+Buttonize URLs, nicknames, and other text
+
+@cindex modules, capab-identify
+@item capab-identify
+Mark unidentified users on freenode and other servers supporting CAPAB.
+
+@cindex modules, completion
+@cindex modules, pcomplete
+@item completion (aka pcomplete)
+Complete nicknames and commands (programmable)
+
+@cindex modules, fill
+@item fill
+Wrap long lines
+
+@cindex modules, hecomplete
+@item hecomplete
+Complete nicknames and commands (old).  This is the old module---you
+might prefer the ``completion'' module instead.
+
+@cindex modules, identd
+@item identd
+Launch an identd server on port 8113
+
+@cindex modules, irccontrols
+@item irccontrols
+Highlight or remove IRC control characters
+
+@cindex modules, log
+@item log
+Save buffers in logs
+
+@cindex modules, match
+@item match
+Highlight pals, fools, and other keywords
+
+@cindex modules, menu
+@item menu
+Display a menu in ERC buffers
+
+@cindex modules, netsplit
+@item netsplit
+Detect netsplits
+
+@cindex modules, noncommands
+@item noncommands
+Don't display non-IRC commands after evaluation
+
+@cindex modules, notify
+@item notify
+Notify when the online status of certain users changes
+
+@cindex modules, page
+@item page
+Process CTCP PAGE requests from IRC
+
+@cindex modules, readonly
+@item readonly
+Make displayed lines read-only
+
+@cindex modules, replace
+@item replace
+Replace text in messages
+
+@cindex modules, ring
+@item ring
+Enable an input history
+
+@cindex modules, scrolltobottom
+@item scrolltobottom
+Scroll to the bottom of the buffer
+
+@cindex modules, services
+@item services
+Identify to Nickserv (IRC Services) automatically
+
+@cindex modules, smiley
+@item smiley
+Convert smileys to pretty icons
+
+@cindex modules, sound
+@item sound
+Play sounds when you receive CTCP SOUND requests
+
+@cindex modules, spelling
+@item spelling
+Check spelling of messages
+
+@cindex modules, stamp
+@item stamp
+Add timestamps to messages
+
+@cindex modules, track
+@item track
+Track channel activity in the mode-line
+
+@cindex modules, truncate
+@item truncate
+Truncate buffers to a certain size
+
+@cindex modules, unmorse
+@item unmorse
+Translate morse code in messages
+
+@end table
+
+@c PRE5_3: Document every option of every module in its own subnode
+
+
+@node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
+@comment  node-name,  next,  previous,  up
+@chapter Advanced Usage
+@cindex advanced topics
+
+@menu
+* Connecting::                  Ways of connecting to an IRC server.
+* Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
+@end menu
+
+@node Connecting, Sample Configuration, Advanced Usage, Advanced Usage
+@comment  node-name,  next,  previous,  up
+@section Connecting to an IRC Server
+@cindex connecting
+
+The easiest way to connect to an IRC server is to call @kbd{M-x erc}.
+If you want to assign this function to a keystroke, the following will
+help you figure out its parameters.
+
+@defun erc
+Select connection parameters and run ERC.
+Non-interactively, it takes the following keyword arguments.
+
+@itemize @bullet
+@item @var{server}
+@item @var{port}
+@item @var{nick}
+@item @var{password}
+@item @var{full-name}
+@end itemize
+
+That is, if called with the following arguments, @var{server} and
+@var{full-name} will be set to those values, whereas
+@code{erc-compute-port}, @code{erc-compute-nick} and
+@code{erc-compute-full-name} will be invoked for the values of the other
+parameters.
+
+@example
+(erc :server "irc.freenode.net" :full-name "Harry S Truman")
+@end example
+@end defun
+
+@subheading Server
+
+@defun erc-compute-server &optional server
+Return an IRC server name.
+
+This tries a number of increasingly more default methods until a non-nil
+value is found.
+
+@itemize @bullet
+@item @var{server} (the argument passed to this function)
+@item The @code{erc-server} option
+@item The value of the IRCSERVER environment variable
+@item The @code{erc-default-server} variable
+@end itemize
+
+@end defun
+
+@defopt erc-server nil
+IRC server to use if one is not provided.
+@end defopt
+
+@subheading Port
+
+@defun erc-compute-port &optional port
+Return a port for an IRC server.
+
+This tries a number of increasingly more default methods until a non-nil
+value is found.
+
+@itemize @bullet
+@item @var{port} (the argument passed to this function)
+@item The @code{erc-port} option
+@item The @code{erc-default-port} variable
+@end itemize
+
+@end defun
+
+@defopt erc-port
+IRC port to use if not specified.
+
+This can be either a string or a number.
+@end defopt
+
+@subheading Nick
+
+@defun erc-compute-nick &optional nick
+Return user's IRC nick.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
+@itemize
+@item @var{nick} (the argument passed to this function)
+@item The @code{erc-nick} option
+@item The value of the IRCNICK environment variable
+@item The result from the @code{user-login-name} function
+@end itemize
+
+@end defun
+
+@defopt erc-nick
+Nickname to use if one is not provided.
+
+This can be either a string, or a list of strings.
+In the latter case, if the first nick in the list is already in use,
+other nicks are tried in the list order.
+@end defopt
+
+@defopt erc-nick-uniquifier
+The string to append to the nick if it is already in use.
+@end defopt
+
+@defopt erc-try-new-nick-p
+If the nickname you chose isn't available, and this option is non-nil,
+ERC should automatically attempt to connect with another nickname.
+
+You can manually set another nickname with the /NICK command.
+@end defopt
+
+@subheading Full name
+
+@defun erc-compute-full-name &optional full-name
+Return user's full name.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
+@itemize @bullet
+@item @var{full-name} (the argument passed to this function)
+@item The @code{erc-user-full-name} option
+@item The value of the IRCNAME environment variable
+@item The result from the @code{user-full-name} function
+@end itemize
+
+@end defun
+
+@defopt erc-user-full-name
+User full name.
+
+This can be either a string or a function to call.
+@end defopt
+
+@node Sample Configuration, Options, Connecting, Advanced Usage
+@comment  node-name,  next,  previous,  up
+@section Sample Configuration
+@cindex configuration, sample
+
+Here is an example of configuration settings for ERC.  This can go into
+your Emacs configuration file.  Everything after the @code{(require
+'erc)} command can optionally go into @file{~/.emacs.d/.ercrc.el}.
+
+@lisp
+;;; Sample ERC configuration
+
+;; Add the ERC directory to load path -- you don't need this if you are
+;; using the version of ERC that comes with Emacs
+(add-to-list 'load-path "~/elisp/erc")
+
+;; Load ERC
+(require 'erc)
+
+;; Load authentication info from an external source.  Put sensitive
+;; passwords and the like in here.
+(load "~/.emacs.d/.erc-auth")
+
+;; This is an example of how to make a new command.  Type "/uptime" to
+;; use it.
+(defun erc-cmd-UPTIME (&rest ignore)
+  "Display the uptime of the system, as well as some load-related
+stuff, to the current ERC buffer."
+  (let ((uname-output
+         (replace-regexp-in-string
+          ", load average: " "] @{Load average@} ["
+          ;; Collapse spaces, remove
+          (replace-regexp-in-string
+           " +" " "
+           ;; Remove beginning and trailing whitespace
+           (replace-regexp-in-string
+            "^ +\\|[ \n]+$" ""
+            (shell-command-to-string "uptime"))))))
+    (erc-send-message
+     (concat "@{Uptime@} [" uname-output "]"))))
+
+;; This causes ERC to connect to the Freenode network upon hitting
+;; C-c e f.  Replace MYNICK with your IRC nick.
+(global-set-key "\C-cef" (lambda () (interactive)
+                           (erc :server "irc.freenode.net" :port "6667"
+                                :nick "MYNICK")))
+
+;; This causes ERC to connect to the IRC server on your own machine (if
+;; you have one) upon hitting C-c e b.  Replace MYNICK with your IRC
+;; nick.  Often, people like to run bitlbee (http://bitlbee.org/) as an
+;; AIM/Jabber/MSN to IRC gateway, so that they can use ERC to chat with
+;; people on those networks.
+(global-set-key "\C-ceb" (lambda () (interactive)
+                           (erc :server "localhost" :port "6667"
+                                :nick "MYNICK")))
+
+;; Make C-c RET (or C-c C-RET) send messages instead of RET. This has
+;; been commented out to avoid confusing new users.
+;; (define-key erc-mode-map (kbd "RET") nil)
+;; (define-key erc-mode-map (kbd "C-c RET") 'erc-send-current-line)
+;; (define-key erc-mode-map (kbd "C-c C-RET") 'erc-send-current-line)
+
+;;; Options
+
+;; Join the #emacs and #erc channels whenever connecting to Freenode.
+(setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
+
+;; Interpret mIRC-style color commands in IRC chats
+(setq erc-interpret-mirc-color t)
+
+;; The following are commented out by default, but users of other
+;; non-Emacs IRC clients might find them useful.
+;; Kill buffers for channels after /part
+;; (setq erc-kill-buffer-on-part t)
+;; Kill buffers for private queries after quitting the server
+;; (setq erc-kill-queries-on-quit t)
+;; Kill buffers for server messages after quitting the server
+;; (setq erc-kill-server-buffer-on-quit t)
+@end lisp
+
+@node Options, , Sample Configuration, Advanced Usage
+@comment  node-name,  next,  previous,  up
+@section Options
+@cindex options
+
+@c PRE5_3: (Node) Document every ERC option (module options go in
+@c previous chapter)
+
+This section has not yet been written.  For now, the easiest way to
+check out the available options for ERC is to do
+@kbd{M-x customize-group erc RET}.
+
+
+@node Getting Help and Reporting Bugs, History, Advanced Usage, Top
+@comment  node-name,  next,  previous,  up
+@chapter Getting Help and Reporting Bugs
+@cindex help, getting
+@cindex bugs, reporting
+
+After you have read this guide, if you still have questions about ERC,
+or if you have bugs to report, there are several places you can go.
+
+@itemize @bullet
+
+@item
+@uref{http://www.emacswiki.org/cgi-bin/wiki/ERC} is the
+emacswiki.org page for ERC.  Anyone may add tips, hints, or bug
+descriptions to it.
+
+@item
+There are several mailing lists for ERC.  To subscribe, visit
+@uref{http://savannah.gnu.org/mail/?group=erc}.
+
+The mailing lists are also available on Gmane.
+(@url{http://gmane.org/}).  Gmane provides additional methods for
+accessing the mailing lists, adding content to them, and searching them.
+
+@enumerate
+@item gmane.emacs.erc.announce: Announcements
+
+@item gmane.emacs.erc.discuss: General discussion
+
+@item gmane.emacs.erc.cvs: Log messages for changes to the ERC source code
+
+@end enumerate
+
+@item
+You can visit the IRC Freenode channel @samp{#emacs}. Many of the
+contributors are frequently around and willing to answer your
+questions.
+
+@end itemize
+
+
+@node History, GNU Free Documentation License, Getting Help and Reporting Bugs, Top
+@comment  node-name,  next,  previous,  up
+@chapter History
+@cindex history, of ERC
+
+ERC was originally written by Alexander L. Belikoff
+@email{abel@@bfr.co.il} and Sergey Berezin
+@email{sergey.berezin@@cs.cmu.edu}.  They stopped development around
+December 1999.  Their last released version was ERC 2.0.
+
+P.S.: If one of the original developers of ERC reads this, we'd like to
+receive additional information for this file and hear comments in
+general.
+
+@itemize
+@item 2001
+
+In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder
+@email{alex@@gnu.org} took over development and created a ERC Project at
+@uref{http://sourceforge.net/projects/erc}.
+
+In reaction to a mail about the new ERC development effort, Sergey
+Berezin said, ``First of all, I'm glad that my version of ERC is being
+used out there.  The thing is, I do not have free time and enough
+incentive anymore to work on ERC, so I would be happy if you guys take
+over the project entirely.''
+
+So we happily hacked away on ERC, and soon after (September 2001)
+released the next "stable" version, 2.1.
+
+Most of the development of the new ERC happened on #emacs on
+irc.openprojects.net.  Over time, many people contributed code, ideas,
+bugfixes, and a lot of alpha/beta/gamma testing.
+
+See the @file{CREDITS} file for a list of contributors.
+
+@item 2003
+
+ERC 3.0 was released.
+
+@item 2004
+
+ERC 4.0 was released.
+
+@item 2005
+
+ERC 5.0 was released.  Michael Olson @email{mwolson@@gnu.org} became
+the release manager and eventually the maintainer.
+
+After some discussion between him and the Emacs developers, it was
+decided to include ERC in Emacs.
+
+@item 2006
+
+ERC 5.1 was released.  It was subsequently included in Emacs 22.
+
+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.
+
+@end itemize
+
+@node GNU Free Documentation License, Concept Index, History, Top
+@unnumbered GNU Free Documentation License
+@include doclicense.texi
+
+@node Concept Index,  , GNU Free Documentation License, Top
+@comment  node-name,  next,  previous,  up
+@unnumbered Index
+
+@printindex cp
+
+@bye
+
+@ignore
+   arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
+@end ignore
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
deleted file mode 100644
index f5bf1e8..0000000
--- a/etc/ERC-NEWS
+++ /dev/null
@@ -1,1105 +0,0 @@
-ERC NEWS                                                       -*- outline -*-
-
-Copyright (C) 2006, 2007  Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-* Changes in ERC 5.2
-
-** M-x erc RET now starts ERC.
-`erc-select' has been changed to `erc'.  `erc-select' still remains as
-an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
-`erc-ssl' with `erc-select-ssl' as its alias.  The function that was
-known as `erc' is now `erc-open'.
-
-** Open query buffers by default when private messages are received.
-The default value of `erc-auto-query' has been changed to 'bury.
-
-** New command: /RECONNECT
-This command tries to reconnect to the current IRC server exactly
-once.  It does not work in server buffers (throws an error before the
-command is run), but works in query and channel buffers.
-
-** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
-
-** Fix buggy interaction with multi-tty Emacs.
-
-** After running /QUIT, make sure that the IRC process is killed within
-4 seconds.  Freenode, in particular, needs this at times.
-
-** If the IRC process has not responded to our PINGs within a certain
-time, kill it and restart the connection.  See
-`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
-`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
-`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
-
-** Avoid getting into an infinite connection loop.
-Previously, this could happen if your nick was banned, you were using
-Tor, incorrect information was entered, or the connection was bad.
-
-** Make ban messages less confusing.
-
-** Restore the point correctly when reconnecting to an IRC server.
-
-** Make /IGNORE and /UNIGNORE prompt to determine whether their
-argument is a user or a regexp.  This results in less-confusing
-behavior when trying to ignore someone who has a bracket in their
-nick.
-
-** Make the default port "6667" rather than "ircd", because some
-operating systems don't know what port "ircd" maps to.
-
-** Fix several bugs in erc-iswitchb (C-c C-b).
-
-** Clean up internal documentation.
-Special thanks go to Juanma Barranquero for the thorough vetting of
-ERC's internal documentation.
-
-** Display a more informative message when a module is not found.
-
-** Fix a bug where paths were being colored like IRC commands.
-
-** In the customize interface for `erc-modules', add the name of the module.
-This makes it easier to find modules by name.
-
-** erc-server-send-ping-interval: Change to use a default of 30 seconds.
-
-** Some files which are included with the release of ERC 5.2 will not
-appear in the version of ERC that is bundled with Emacs 22.  These
-extras files may be found at:
-
- o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
- o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
-
-** Renamed files
-
-Several files were renamed so as to make them distinct to users of the
-MS-DOS operating system.
-
- o erc-autojoin.el -> erc-join.el
- o erc-complete.el -> erc-hecomplete.el
- o erc-nickserv.el -> erc-services.el
- o ChangeLog.NNNN -> ChangeLog.NN
-
-** Header line changes
-
-*** Remove "[IRC]" from the header line.
-
-*** Add the %l format character to `erc-header-line-format',
-
-*** Document how to remove the header line.
-Namely: (setq erc-header-line-format nil).
-
-** New options
-
-*** erc-server-reconnect-attempts: Determines the number of
-reconnection attempts that ERC will make per server.
-
-*** erc-server-reconnect-timeout: Determines the amount of time,
-in seconds, that ERC will wait between successive reconnect attempts.
-
-*** erc-server-send-ping-timeout: Determines when to consider a connection
-stalled and restart it.  The default is	after 120 seconds.
-
-*** erc-system-name: Determines the system name to use when logging in.
-The default is to figure this out by calling `system-name'.
-
-** New face: `erc-my-nick-face'
-This helps make it easier to distinguish messages sent by yourself
-from messages sent by other users when the value of the variable
-`erc-show-my-nick' is non-nil.
-
-** Namespace changes
-
-*** New macro: `erc-with-server-buffer'
-Switches to the current ERC server buffer and runs some code.  If no
-server buffer is available, return nil.  This is a useful way to
-access variables in the server buffer.
-
-*** New function: `erc-open-server-buffer-p'
-Returns non-nil if the given buffer is an ERC server buffer that has
-an open IRC process.
-
-*** New function: `erc-format-lag-time'
-Returns the estimated lag time to server, `erc-server-lag'.
-
-*** Renamed items
-
- o `erc-server-setup-periodical-server-ping' is now
-   `erc-server-setup-periodical-ping'
-
- o `erc-away-p' is now `erc-away-time'
-
-** Changes to the ERC manual
-
-*** New section: Sample Session.
-Describes a sample ERC session for connecting to the #emacs channel on
-Freenode.  Also mention the #erc channel.
-
-*** New section: Special Features.
-Describes some of the special features of ERC.
-
-*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
-interface.
-
-*** Development: Mention ErcDevelopment page on emacswiki.org.
-
-*** Tips and Tricks: Remove empty section for now.
-
-*** Options: Mention how to see available ERC options.
-
-*** Sample Configuration: Add an example of how to configure ERC.
-
-** New modules
-
-*** Autoaway (erc-autoaway.el)
-
-**** Make this much more reliable.
-
-**** Avoid duplicate messages when coming back from being away.
-
-**** Fix bug where autoaway was enabled just by loading the file.
-
-*** BBDB (erc-bbdb.el)
-
-**** Display information on how to cancel merging of info or how to
-create a new John Doe record.
-
-**** Make it so that information from /whois continues to come in, even
-while prompting for a record to merge.
-
-**** Make hitting C-g correctly abort merging the record.
-
-*** Capab identify (erc-capab.el)
-Mark users who haven't identified to NickServ on servers supporting
-CAPAB IDENTIFY-MSG.
-
-** Changes and additions to modules
-
-*** Button (erc-button.el)
-
-**** Make <backtab> go to the previous button.
-
-*** Channel tracking (erc-track.el)
-
-**** Use mouse-face and help-echo for channel names in the mode-line.
-This helps people using a mouse know that they are buttons and can be
-clicked on.
-
-**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
-This is accomplished by moving these bindings to their own global
-minor mode.  Now the default is to check whether the user has bound
-something to C-c C-SPC or C-c C-@.  If they have, prompt them about
-whether to really override that binding.  This also has the effect of
-preventing ERC from clobbering rcirc's keybinding, unless this is
-desired.  See `erc-track-enable-keybindings' for more details.
-
-**** New option: erc-track-enable-keybindings.
-Determine whether or not to enable the C-c C-SPC and C-c C-@
-keybindings.  The default is to ask whether to do this if a binding to
-these keys already exists.  It can also be set to t or nil to always
-bind or never bind, respectively.
-
-**** Remove `track-when-inactive' module.
-See `erc-track-when-inactive' for further details.
-
-**** New option: erc-track-when-inactive.
-This option replaces the track-when-inactive module.  Set it to
-non-nil to track activity even in visible buffers when inactive.  The
-default is nil.
-
-**** Remove the `track-modified-channels' alias for the `track' module.
-
-*** DCC support (erc-dcc.el)
-
-**** Add Usage section to Commentary.
-
-**** Fix a bug in the server message output.
-
-*** Filling (erc-fill.el)
-
-**** Fix bug involving messages that start with one or more blank lines.
-
-*** Identd (erc-identd.el)
-
-**** New option `erc-identd-port'
-Specifies the port to use if none is given as an argument to
-`erc-identd-start'.  This is placed in the new customization group
-`erc-identd'.
-
-**** New function: `erc-identd-quickstart'
-Ignores any arguments and calls `erc-identd-start'.
-
-*** Channel lists (erc-list.el)
-
-**** Enable by default, except in the version of ERC bundled with Emacs 22.
-
-*** Logging (erc-log.el)
-
-**** Make sure filenames are safe to use before writing to them.
-
-**** Save all log buffers when exiting Emacs.
-
-**** erc-generate-log-file-name-function: Add option for
-`erc-generate-log-file-name-network', which is a new function that
-uses the network name rather than the server name when possible.
-
-*** Menu (erc-menu.el)
-
-**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
-and other clients.
-
-**** Make this into a proper module and load it by default.
-
-**** Add "Current channel" submenu.
-
-*** Networks (erc-networks.el)
-
-**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
-
-**** Escape periods in Konfido.Net and Kewl.Org.
-
-*** Internet services / Nickserv (erc-nickserv.el)
-
-**** Add new 'both method for the `erc-nickserv-identify-mode' option
-and make it the default.  This tries to do the right thing both when a
-known nickserv message exists for an IRC network, and when it does
-not.
-
-**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
-
-**** Support authentication on BitlBee.
-
-**** Make source code easier to understand by using accessor functions.
-
-*** Sound support (erc-sound.el)
-
-**** Make this work with both Emacs 21 and Emacs 22.
-
-*** Timestamps (erc-stamp.el)
-
-**** Exclude the newline from the erc-timestamp field.
-
-**** New function: `erc-toggle-timestamps'.
-Toggles display of timestamps.
-
-* Changes in ERC 5.1.4
-
-** Make find-function and find-variable work in Emacs 22 for
-names that are constructed by `define-erc-module'.
-
-** Fix bug introduced in ERC 5.1.3 that caused messages to go the
-wrong buffer.
-
-** Changes and additions to modules
-
-*** Highlighting (erc-match.el)
-
-**** Don't activate view-mode.
-
-*** Logging (erc-log.el)
-
-**** When this module is activated, make sure logging is enabled on
-already-opened buffers.  Ditto for disabling logging when the module
-is deactivated.
-
-**** Fix some errors that occur when exiting Emacs without first
-quitting open IRC servers.
-
-* Changes in ERC 5.1.3
-
-** Fix use of /quote command with no initial whitespace.
-
-** Make it possible to customize the colorization of the header line.
-The `erc-header-line' face is used to color the header line.
-The `erc-header-line-face-method' determines the method to use when
-colorizing the header line.
-
-** Add the new function `erc-handle-irc-url', which is a suitable
-candidate to use for `url-irc-function'.  This permits some
-integration of url.el and ERC.
-
-** Fix several errors that occur when server or channel buffers are killed
-prematurely.
-
-** Fix toggling of flood control.
-
-** Match the patterns in `erc-encoding-coding-alist' as regexps,
-instead of verbatim text.  Also, match case-insensitively.
-
-** The /SMV command has been removed, since we no longer have
-meaningful module-specific version information.
-
-** Fix a "(stringp nil)" error that can happen when doing /PART.
-
-** Use a better example in the `erc-part-reason-various-alist'
-documentation.
-
-** When using `erc-quit-reason-various' and `erc-part-reason-various'
-and no matches are found, default to using the ERC version string
-rather than "nil".
-
-** Add the `list' and `page' modules to the `erc-modules' customize
-interface.
-
-** Changes to the ERC manual
-
-*** Update the list of available modules.
-
-*** Revise information about releases and development.
-
-*** Provide a simpler example in the "Getting Started" chapter.
-
-*** Fully document how to connect to an IRC server in the new
-"Connecting" chapter.
-
-** Changes and additions to modules
-
-*** Autoaway (erc-autoaway.el)
-
-**** Rename the `erc-autoaway-use-emacs-idle' option to
-`erc-autoaway-idle-method'.
-
-**** Add support for autoaway based on user idle time.
-This is now the default.
-
-**** If you set the AWAY status yourself, erc-autoaway will not
-interfere by un-setting AWAY prematurely.
-
-**** If you are set away while visiting a non-ERC buffer,
-erc-autoaway used to fail in bringing the user back.  This is now
-fixed.
-
-*** BBDB (erc-bbdb.el)
-
-**** Add new option `erc-bbdb-electric-p', which determines whether
-to make the BBDB buffer electric.  This defaults to not electric.
-
-*** Button (erc-button.el)
-
-**** Use <backtab> instead of <C-tab> for `erc-button-previous'.
-
-*** Identd (erc-identd.el)
-
-**** Fix a bug that involves starting the identd server.
-
-**** Make this work with Emacs 22.
-
-**** Provide a real ERC module named `identd'.
-
-**** Don't create an extra buffer for the identd process.
-
-*** Channel lists (erc-list.el)
-
-**** Enable by default, except in the version of ERC bundled with Emacs 22.
-
-*** Logging (erc-log.el)
-
-**** By default, don't insert old logs when opening an ERC buffer.
-This may be changed by customizing `erc-log-insert-log-on-open'.
-
-**** New option `erc-log-write-after-send' determines whether the
-log file will be written to after every sent message.  The default is
-not to do this.
-
-**** New option `erc-log-write-after-insert' determines whether the
-log file will be written to when new text is added to a logged ERC
-buffer.  The default is not to do this.  With this option and the
-previous option, logging should no longer slow down ERC as much.
-
-**** Default to saving buffers and queries on quit.
-This may be changed by customizing the `erc-save-buffer-on-quit' and
-`erc-save-queries-on-quit' options, respectively.
-
-**** Only perform logging when the `logging' module is added to
-`erc-modules'.  This prevents logging from being activated just by
-loading the erc-log.el file, and makes logging act like other ERC
-modules.
-
-*** Programmable completion (erc-pcomplete.el)
-
-**** Don't complete the user's current nickname.
-
-* Changes in ERC 5.1.2
-
-** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
-
-** Move to end of prompt when ERC reconnects to a server.
-
-** Changes and additions to modules
-
-*** Spell-checking (erc-spelling.el)
-
-**** Don't spell-check nicks or words that are prefixed with '/'.
-
-**** Remove flyspell properties from words we shouldn't spell-check.
-
-**** Fix an issue that caused the ispell process to reload every time
-we switch to an ERC buffer.
-
-*** Timestamps (erc-stamp.el)
-
-**** Fix an inconsistency in calculating width of right timestamps.
-
-**** Rename option `erc-timestamp-right-align-by-pixel' to
-`erc-timestamp-use-align-to'.  This controls whether to use the more
-fail-proof method of aligning right timestamps, as mentioned below.
-
-**** Fix a right timestamp spacing problem that used to occur when
-erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
-use the method that aligns right timestamps perfectly in Emacs22 with
-X.  If the current version of Emacs doesn't support this method, use
-the simpler method, which is prone to alignment issues for math
-symbols and other variable-width text.
-
-A side effect of using this new method is that there will only be one
-space before a right timestamp in any saved logs.  If this is
-unacceptable, set `erc-timestamp-use-align-to' to nil.
-
-* Changes in ERC 5.1.1
-
-** Fix a requirement on cl.el.
-
-** Use tls.el for SSL connections, rather than ssl.el.
-
-** Changes and additions to modules
-
-*** ibuffer integration (erc-ibuffer.el)
-
-**** Update this to work with the version of ibuffer.el that comes with
-recent Emacs variants.
-
-*** Old completion (erc-complete.el)
-
-**** Fix a few errors.
-
-*** Speedbar (erc-speedbar.el)
-
-**** Make this work with the version of speedbar.el that comes with
-recent Emacs variants.
-
-*** Timestamps (erc-stamp.el)
-
-**** By default, use a more failsafe method of displaying right timestamps.
-To get right timestamps to align perfectly in Emacs22 using X, set the
-new `erc-timestamp-right-align-by-pixel' option to non-nil.
-
-*** Viper compatibility (erc-viper.el)
-
-**** Since most of these changes are now merged into Emacs22, detect
-whether we need these changes and install them only if necessary.
-
-* Changes in ERC 5.1
-
-** Improve XEmacs compatibility.
-
-** Namespace changes
-
-*** Now ERC doesn't use global variable space.
-Renamed all variables that didn't start with "erc-".
-
-  o `away' is now `erc-away'
-
-  o `current-nick' is now `erc-server-current-nick'
-
-  o `last-peers' is now `erc-server-last-peers'
-
-  o `last-ping-time' is now `erc-server-last-ping-time'
-
-  o `last-sent-time' is now `erc-server-last-sent-time'
-
-  o `lines-sent' is now `erc-server-lines-sent'
-
-  o `quitting' is now `erc-server-quitting'
-
-*** Remove the `with-erc-channel-buffer' function.
-
-** Bugfixes
-
-*** Don't inadvertently destroy face properties.
-
-*** Load erc scripts in a safer way.
-
-*** Don't insert a timestamp if text at point is invisible.
-
-*** Don't hide messages from those in `erc-fools' by default.
-Color their nicks instead.
-
-*** Use a more foolproof method of encoding and decoding strings
-before sending to a channel.
-
-** Backend changes
-
-*** Renamed some server-specific variables
-
-  o `erc-announced-server-name' is now `erc-server-announced-name'
-
-  o `erc-auto-reconnect' is now `erc-server-auto-reconnect'
-
-  o `erc-connect-function' is now `erc-server-connect-function'
-
-  o `erc-default-coding-system' is now `erc-server-coding-system'
-
-  o `erc-duplicate-timeout' is now `erc-server-duplicate-timeout'
-
-  o `erc-duplicates' is now `erc-server-duplicates'
-
-  o `erc-lag' is now `erc-server-lag'
-
-  o `erc-prevent-duplicates' is now `erc-server-prevent-duplicates'
-
-  o `erc-previous-read' is now `erc-server-filter-data'
-
-  o `erc-process' is now `erc-server-process'
-
-  o `erc-ping-handler' is now `erc-server-send-ping-handler'
-
-  o `erc-ping-interval' is now `erc-server-send-ping-interval'
-
-*** Renamed some functions
-
-  o `erc-connect' is now `erc-server-connect'
-
-  o `erc-process-filter' is now `erc-server-filter-function'
-
-  o `erc-send-command' is now `erc-server-send'
-
-  o `erc-send-single-line' is now `erc-send-input'
-
-  o `erc-setup-periodical-server-ping' is now
-    `erc-server-setup-periodical-server-ping'
-
-  o `erc-split-command is now `erc-split-line'
-
-*** New options
-
-  o erc-server-flood-margin, erc-server-flood-penalty: New options
-    that allow tweaking of flood control.
-
-  o erc-split-line-length: The maximum line length of a single
-    message.
-
-*** New variables
-
-  o erc-server-flood-last-message, erc-server-flood-queue,
-    erc-server-flood-timer: Flood control.
-
-  o erc-server-processing-p: Indicate when we're currently processing
-    a message.
-
-*** Remove some options
-
-  o `erc-flood-limit'
-  o `erc-flood-limit2'
-
-** New customization group `erc-server' for dealing with IRC servers.
-
-** ERC can now be installed by doing `make install' from the command line.
-
-** ERC now has a manual in erc.texi.
-Type `make doc' to generate HTML and Info versions of it.
-
-** ERC no longer depends on cl.el.
-Only the macros in cl-macs.el are used.
-
-** Fix an edge case when quitting as new messages come in.
-
-** Make flood protection toggle-able as on/off, removing the 'strict option.
-
-** If possible, re-use channel buffers when reconnecting to a server.
-
-** Text in ERC buffers is now read-only by default.
-To get the previous behavior, 
-
-** Changes and additions to modules
-
-*** Auto-join (erc-autojoin.el)
-
-**** Recognize the Azzurra server.
-
-*** BBDB (erc-bbdb.el)
-
-**** When the user types /WHOIS, ask for a record to merge to.
-
-**** Store the displayed name of a BitlBee contact.
-The new `erc-bbdb-bitlbee-name-field' option specifies the field to use
-to store this information.
-
-**** Don't prompt for a name on /JOIN or /NICK.
-
-*** Button (erc-button.el)
-
-**** Fix customization of `erc-button-alist'
-
-**** New option `erc-button-nickname-face' determines the face to use
-when coloring ERC nicknames.
-
-*** Channel tracking (erc-track.el)
-
-**** Remove channels from the modified channels list if not currently
-connected.  This should remove residue from the mode line after
-quitting ERC.
-
-**** Recognize buttonized text
-
-*** Highlighting (erc-match.el)
-
-**** Highlight current nickname by default.
-
-**** Added the option of beeping when certain matches occur.
-Add `erc-beep-on-match' to `erc-text-matched-hook' to enable
-beeping.  Set the new variable `erc-beep-match-types' which match
-types that make beeps.
-
-*** Nicklist (erc-nicklist.el)
-
-**** Fix a couple of errors.
-
-**** Make sure a stray mouse click doesn't trigger an error.
-
-**** Insert icons from the /images directory next to nicks.
-This indicates their away status.  The location is customizable via
-the new `erc-nicklist-icons-directory' option.
-
-If you do not want these icons, set `erc-nicklist-use-icons' to nil.
-
-*** Nickserv identification (erc-nickserv.el)
-
-**** Recognize Azzurra and OFTC networks.
-
-*** Old completion (erc-complete.el)
-
-**** Disable by default.
-
-*** Programmable completion (erc-pcomplete.el)
-
-**** Enable by default.
-
-*** Timestamps (erc-stamp.el)
-
-**** On Emacs22, align right timestamps perfectly, even if variable-width
-characters are used.  If we aren't using Emacs22, move text farther
-away from the right margin when variable-width characters are used.
-It is considered better to misalign the stamp by a bit than to go past
-the right margin.
-
-**** Enable by default
-
-** New modules
-
-*** Spell-checking (erc-spelling.el)
-
-**** Use flyspell in ERC.
-
-*** Viper compatibility (erc-viper.el)
-
-**** Helps ERC work correctly in viper-mode.
-
-* Changes in ERC 5.0.4
-
-** Fix a problem with undo in channels.
-
-* Changes in ERC 5.0.3
-
-** Fix typo in the `ctcp-request-to' entry of the English catalog.
-
-** Debugging with edegug has been made easier in all of the
-erc-with-* and with-erc* macros.
-
-** Non-ASCII character sets should be better supported when sending
-and processing messages.
-
-** A load failure with erc-autoaway.el and Emacs21 has been fixed.
-
-** A few XEmacs warnings were fixed.
-
-** Changes and additions to modules
-
-*** Backend (erc-backend.el)
-
-**** Move the check for hidden messages into `erc-display-message'
-so there isn't so much replicated code.
-
-**** Add `definition-name' property to constructed symbols so that
-`find-function' and `find-variable' will be able to locate them.
-
-**** Make sure logs are inserted info the correct channel buffers.
-There was previously an error when using `erc-insert-log-on-open' in
-combination with autojoin to multiple channels.
-
-*** Button (erc-button.el)
-
-**** The layering of `erc-button-face' on other faces in ERC buffers
-has been improved.
-
-*** Channel tracking (erc-track.el)
-
-**** Use optimal amount of whitespace around modified channels
-indicator.  Previously, there was an additional unnecessary space.
-
-**** Fix an error that occurred when unchecked buffers existed when
-invoking /QUIT.
-
-* Changes in ERC 5.0.2
-
-** If a channel key is required for a certain channel, ERC will prompt
-for one if `erc-prompt-for-channel-key' is non-nil.
-
-** ERC doesn't try to reconnect if the network connection is refused
-when using `open-network-stream-nowait' as the `erc-connect-function'.
-
-** Messages from multiple servers will not go to the currently active
-buffer.  The messages from each server will be contained in the most
-recently active channel/server buffer that corresponds with the
-server.
-
-** Some text messages were cleaned up slightly.
-
-** Button faces should no longer "cover" other faces.
-
-** Made some XEmacs compatibility fixes.
-
-** Nicknames containing a backslash are now correctly highlighted as
-current-nick and buttonized as nicks.
-
-** `erc-server-select' doesn't offer networks without servers as a
-choice anymore.
-
-** Non-ASCII character support has been improved.
-
-** Changes and additions to modules
-
-*** Menu (erc-menu.el)
-
-**** You can now save logs and truncate buffers from the menu-bar.
-
-* Changes in ERC 5.0.1
-
-** Narrowing in ERC buffers no longer causes formatting errors.
-
-** The BBDB module now loads correctly when customizing `erc-modules'.
-
-** The value of `erc-button-face' is now respected.
-
-** Fixed a bug which caused a read-only error during connection.
-
-** Server buffers are now tracked correctly.
-This means that `erc-track-priority-faces-only', `erc-track-exclude',
-and `erc-track-exclude-types' now work with server buffers.
-
-* Changes in ERC 5.0
-
-** Channel members are now stored as a hash-table.
-`erc-server-users' and `erc-channel-users' are now hash-tables, rather
-than alists.  This significantly increases performance, especially in
-large channels.  Each channel member is stored as an `erc-server-user'
-struct, with additional information about the channels they are on
-stored in an `erc-channel-user' struct.  Code using old alist-style
-channel members needs to be updated to work with hash-tables.
-This new code also removes the need for erc-members.el, which has been
-removed.
-
-** The way ERC deals with input from the server has changed.
-All server response code is now in a new file, erc-backend.el.  There
-should be no real user visible changes.  There are, however, a few
-major changes for implementers, and module writers:
-
-*** The PARSED response that all handlers get called with is
-    no longer a vector, but an `erc-response' struct.
-
-    This means LESS MAGIC NUMBERS in the ERC source code, but a few
-    changes in how you get at parsed responses.
-
-    The sender is accessed via `erc-response.sender'.
-
-    The command is accessed via `erc-response.command'.
-
-    The arguments to the command (everything after the command and
-    before the colon) are accessed via `erc-response.command-args'.
-    This is a /list/ of arguments in the order they appear in the
-    unparsed response.
-
-    The contents of the response is accessed via
-    `erc-response.contents'.
-
-    Should, for some reason, you want to do something with the
-    /unparsed/ response, you can get it via `erc-response.unparsed'.
-
-*** The `erc-server-hook-list' mechanism is gone.
-
-    All server response handlers should be defined with
-    `define-erc-response-handler'.  This defines functions and
-    corresponding hook variables.
-
-    The mapping of server commands to hook variables is no longer
-    done via `erc-event-to-hook', but through an #'equal hashtable,
-    `erc-server-responses'.  In order to find a hook you do:
-
-    (erc-get-hook command)
-
-    See the docstring of `define-erc-response-handler' for more
-    information.
-
-*** ALL hook variables have been renamed.
-
-    In accordance with recommendations in the Emacs Lisp manual,
-    the hook variables are no longer called `erc-server-FOO-hook',
-    but rather `erc-server-FOO-functions'.  This is to indicate
-    that the functions they call take arguments.
-
-    All the modules in ERC have been updated to reflect this change,
-    but external module authors should beware.
-
-** The values of `erc-mode-line-format' and `erc-header-line-format'
-are now defined as strings to be formatted using `format-spec'.
-`erc-mode-line-format' does not replace the whole mode-line anymore,
-only `mode-line-buffer-identification' is set.  This way, personal
-mode-line configurations are not modified and all key bindings work as
-expected.  The process status (connecting, closed) is now shown in
-`mode-line-process'.
-
-** Customization of ERC variables has been made easier.  Variables
-have been split into more groups for better organization.
-
-** New variables
-
-  o `erc-send-whitespace-lines' - Set this to send lines even if they
-    are empty.
-
-  o `erc-manual-set-nick-on-bad-nick-p' - If the nickname you chose is
-    already taken or not allowed, your nick is not changed and you can
-    try again manually if this is non-nil.
-
-  o `erc-mode-line-away-status-format' - You can now set what is shown
-    in the mode-line when you are away.
-
-  o `erc-header-line-uses-help-echo-p' - The header-line now uses the
-    help-echo property. You can set this to nil to disable it.
-
-  o `erc-format-query-as-channel-p' - Set this to nil to have messages
-    in the query buffer formatted like private messages.
-
-  o `erc-show-channel-key-p' - The channel key is now shown with the
-    other channel modes in the header line. Set this to nil if you
-    want it hidden.
-
-  o `erc-prompt-for-channel-key' - Set this if you want to be prompted
-    for the channel key (channel's mode is +k) when you call
-    `erc-join-channel' interactively.
-
-  o `erc-kill-server-buffer-on-quit' - If non-nil, kill the server
-    buffer automatically when you quit.
-
-** New hooks
-
-  o `erc-join-hook' - Called when you join a channel.
-
-  o `erc-kick-hook' - Called when you are kicked from a channel. The
-    channel's buffer is sent as an argument to functions called from
-    this hook.
-
-  o `erc-nick-changed-functions' - Whenever your nickname changes
-    successfully, the functions in this hook are run with the
-    arguments NEW-NICK and OLD-NICK.
-
-** New command /WHOAMI - Do a /WHOIS on your current nickname.
-
-** The key binding for changing channel modes is now C-c C-o.
-
-** Removed variables
-
-  o `erc-echo-notices-in-minibuffer-flag' and
-    `erc-echo-notices-in-current-buffer' - You should use
-    `erc-echo-notice-hook' and `erc-echo-notice-always-hook' instead.
-
-  o `erc-prompt-interactive-input' has been removed (commented out)
-    because nickname completion does not work with it.
-
-  o All INFO buffer-related variables and functions have been removed.
-
-** You can now disable modules by setting `erc-modules' with the
-customization interface.
-
-** Changes and additions to modules
-
-*** Autoaway (erc-autoaway.el)
-
-**** New variable `erc-autoaway-no-auto-back-regexp' - Add text which,
-when you type anything matching it, will not automatically discard
-your away status when `erc-auto-discard-away' is non-nil.
-
-*** Filling (erc-fill.el)
-
-**** New variable `erc-fill-variable-maximum-indentation' - Don't
-indent more than this many characters when indenting a message from a
-user with a long nickname.
-
-*** Goodies (erc-goodies.el)
-
-**** Miscellaneous small modules have been moved from erc.el.
-The functions erc-add-scroll-to-bottom, erc-make-read-only,
-erc-send-distinguish-noncommands, erc-interpret-controls, erc-unmorse,
-erc-smiley, and erc-occur, which were defined in the main erc.el file
-have been moved to erc-goodies.el and have mostly been translated to
-the modules scrolltobottom, readonly, noncommands, irccontrols, smiley
-and unmorse.
-
-**** New variables
-
-  o `erc-input-line-position' - The line number to use with
-    `erc-scroll-to-bottom'.
-
-  o `erc-beep-p' - Beep if there is a \C-g control character in a
-    message.
-
-*** Channel lists (erc-list.el)
-
-**** New variable `erc-chanlist-highlight-face' - A face used for
-highlighting the current line.
-
-*** Highlighting (erc-match.el)
-
-**** `erc-current-nick-highlight-type' has new options: 'keyword and
-'nick-or-keyword.
-
-*** Menu (erc-menu.el)
-
-**** The `IRC' menu is now automatically added to `erc-mode' buffers.
-
-*** Networks (erc-nets.el)
-
-**** The functions for determining current network are in this file.
-There were a couple of functions spread about in different files which
-each had a different way of determining the current network.  The
-methods have been combined, and the big list of known networks
-(`erc-networks-alist') is being put to use.  You can access the
-network's name by calling the new function `erc-network'.  This
-returns the name of the current network as a symbol or 'Unknown if it
-could not determine which network it is.
-
-*** Nicklist (erc-nicklist.el)
-
-**** ERC has a new way of displaying nicknames in a channel.
-The new file erc-nicklist.el defines a new command `erc-nicklist'
-which pops up a small Emacs window showing the nicknames of all
-members of the current channel.  The implementation is not complete
-and is rather proof-of-concept for now.  The result is something a bit
-like erc-speedbar, but not quite as invasive, and doesn't require use
-of a new frame.
-
-*** Internet services / Nickserv (erc-nickserv.el)
-
-**** Network detection is now taken care of by erc-nets.el.
-The function `erc-current-network' is deprecated, use `erc-network'
-instead.  The variable `erc-networks' has been removed, use
-`erc-networks-alist'.  The network symbols used in
-`erc-nickserv-alist' now match those in `erc-networks-alist'.
-
-**** New variable `erc-nickserv-identify-mode' - Choose which method
-to use for automatic identification: you can wait for Nickserv to ask
-you to identify (the default), or send an identify message
-automatically after you change your nickname.
-
-*** Speedbar (erc-speedbar.el)
-
-**** New variable `erc-speedbar-sort-users-type' - Sort users in a
-channel by activity, alphabetically, or not at all.
-
-*** Timestamps (erc-stamp.el)
-
-**** `erc-timestamp-only-if-changed-flag' now works when
-`erc-insert-timestamp-function' is set to 'erc-insert-timestamp-left.
-
-**** New variable `erc-timestamp-intangible' - Set this to nil if
-timestamps should not have the 'intangible property.
-
-*** Channel tracking (erc-track.el)
-
-**** Using faces to indicate channel activity in the modeline now works
-in XEmacs.
-
-**** New variables
-
-  o `erc-track-priority-faces-only' - Ignore changes in a channel
-    unless there is a face from the `erc-track-faces-priority-list' in
-    the message.
-
-  o `erc-track-exclude-server-buffer' - Ignore changes in the server
-    buffer.
-
-  o `erc-track-position-in-mode-line' - Set the position in the
-    mode-line where modified channels are shown (only works in GNU
-    Emacs versions above 21.3).
-
-* Changes in ERC 4.0
-
-** The module system has again changed a lot.  You can now customize
-  the variable `erc-modules' and define once and for all which
-  extension modules you want to use.  This unfortunately may require
-  you to change your current erc initialisation code a bit, if you
-  have some existing customsations.  On the other hand, this change
-  makes the configuration of extension modules a lot easier for new
-  users.  In theory, you should be able to configure all aspects of
-  ERC by using the customize interface, you should no longer really
-  need to write Lisp code for trivial customizations.
-
-  By default, the following modules are now loaded: (pcomplete
-  netsplit fill track ring button autojoin)
-
-  Please use M-x customize-variable RET erc-modules RET to change the
-  default if it does not suite your needs.
-
-** THe symbol used in `erc-nickserv-passwords' for debian.org IRC servers
-  (formerly called OpenProjects, now FreeNode) has changed from
-  openprojects to freenode.  You may need to update your configuration
-  for a successful automatic nickserv identification.
-
-* Changes in ERC 3.0.cvs.20030119
-
-** New module erc-dcc:
-
-This finally implements DCC.  It requires server sockets to fully work
-in both directions.  This feature is currently only available in Emacs
-21.3.50 (CVS). Here is a short list of what should work though.
-
-** Compatibility:
-  * Emacs 21.2, DCC get, and accepting DCC chat offers.
-  * XEmacs 21, Only accepting DCC chat offers.
-
-** erc is switching to global-minor-modes for activation of submodules.
-
-This allows you to customize such a mode and get automatic loading of
-the module.  No longer putting a lot of require statments in .emacs.
-At least this is the long-term plan, not all modules are converted
-yet.
-
-** The most important user visible change is that you now need to activate
-erc-completion-mode, to get TAB completion.  The new completion code
-is based on pcomplete.  To get the old code, manually load
-erc-complete and bind TAB to erc-complete in erc-mode-map.
-
-To activate completion on startup, put (erc-completion-mode 1) in your
-.emacs file.
-
-Same applies to timestamps.  You no longer need to (require
-'erc-stamp), you can customize the variable `erc-timestamp-mode', and
-the rest should be automatic.
-
-
-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.
-
-arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1
diff --git a/etc/images/icq-offline.png b/etc/images/icq-offline.png
deleted file mode 100644
index 5100f1a..0000000
Binary files a/etc/images/icq-offline.png and /dev/null differ
diff --git a/etc/images/icq-online.png b/etc/images/icq-online.png
deleted file mode 100644
index 4fa44c6..0000000
Binary files a/etc/images/icq-online.png and /dev/null differ
diff --git a/etc/images/irc-offline.png b/etc/images/irc-offline.png
deleted file mode 100644
index 30ce279..0000000
Binary files a/etc/images/irc-offline.png and /dev/null differ
diff --git a/etc/images/irc-online.png b/etc/images/irc-online.png
deleted file mode 100644
index 94ef41b..0000000
Binary files a/etc/images/irc-online.png and /dev/null differ
diff --git a/etc/images/msn-offline.png b/etc/images/msn-offline.png
deleted file mode 100644
index e6854ec..0000000
Binary files a/etc/images/msn-offline.png and /dev/null differ
diff --git a/etc/images/msn-online.png b/etc/images/msn-online.png
deleted file mode 100644
index cef3075..0000000
Binary files a/etc/images/msn-online.png and /dev/null differ
diff --git a/images/icq-offline.png b/images/icq-offline.png
new file mode 100644
index 0000000..5100f1a
Binary files /dev/null and b/images/icq-offline.png differ
diff --git a/images/icq-online.png b/images/icq-online.png
new file mode 100644
index 0000000..4fa44c6
Binary files /dev/null and b/images/icq-online.png differ
diff --git a/images/irc-offline.png b/images/irc-offline.png
new file mode 100644
index 0000000..30ce279
Binary files /dev/null and b/images/irc-offline.png differ
diff --git a/images/irc-online.png b/images/irc-online.png
new file mode 100644
index 0000000..94ef41b
Binary files /dev/null and b/images/irc-online.png differ
diff --git a/images/msn-offline.png b/images/msn-offline.png
new file mode 100644
index 0000000..e6854ec
Binary files /dev/null and b/images/msn-offline.png differ
diff --git a/images/msn-online.png b/images/msn-online.png
new file mode 100644
index 0000000..cef3075
Binary files /dev/null and b/images/msn-online.png differ
diff --git a/man/erc.texi b/man/erc.texi
deleted file mode 100644
index 6b78347..0000000
--- a/man/erc.texi
+++ /dev/null
@@ -1,1024 +0,0 @@
-\input texinfo
-@c %**start of header
-@setfilename ../info/erc
-@settitle ERC Manual
-@c %**end of header
-
-@dircategory Emacs
-@direntry
-* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
-@end direntry
-
-@syncodeindex fn cp
-
-@copying
-This manual is for ERC version 5.2.
-
-Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, Front-Cover texts, or Back-Cover Texts.  A copy of
-the license is included in the section entitled ``GNU Free
-Documentation License'' in the Emacs manual.
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-
-All Emacs Lisp code contained in this document may be used, distributed,
-and modified without restriction.
-@end quotation
-@end copying
-
-@titlepage
-@title ERC manual
-@subtitle a full-featured IRC client
-@subtitle for GNU Emacs and XEmacs
-
-@c The following two commands
-@c start the copyright page.
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
-@c So the toc is printed at the start
-@contents
-
-@ifnottex
-@node Top, Introduction, (dir), (dir)
-@comment  node-name,  next,  previous,  up
-@top ERC
-
-@insertcopying
-@end ifnottex
-
-@menu
-* Introduction::                What is ERC?
-* Obtaining ERC::               How to get ERC releases and development
-                                  versions.
-* Installation::                Compiling and installing ERC.
-* Getting Started::             Quick Start guide to using ERC.
-* Keystroke Summary::           Keystrokes used in ERC buffers.
-* Modules::                     Available modules for ERC.
-* Advanced Usage::              Cool ways of using ERC.
-* Getting Help and Reporting Bugs::  
-* History::                     The history of ERC.
-* GNU Free Documentation License:: The license for this documentation.
-* Concept Index::               Search for terms.
-
-@detailmenu
- --- The Detailed Node Listing ---
-
-Obtaining ERC
-
-* Releases::                    Released versions of ERC.
-* Development::                 Latest unreleased development changes.
-
-Getting Started
-
-* Sample Session::              Example of connecting to the #emacs channel
-* Special Features::            Differences from standalone IRC clients
-
-Advanced Usage
-
-* Connecting::                  Ways of connecting to an IRC server.
-* Sample Configuration::        An example configuration file.
-* Options::                     Options that are available for ERC.
-
-@end detailmenu
-@end menu
-
-@node Introduction, Obtaining ERC, Top, Top
-@comment  node-name,  next,  previous,  up
-@chapter Introduction
-
-ERC is a powerful, modular, and extensible IRC client for Emacs.
-
-It comes with the following capabilities enabled by default.
-
-@itemize @bullet
-@item Flood control
-@item Timestamps
-@item Join channels automatically
-@item Buttonize URLs, nicknames, and other text
-@item Wrap long lines
-@item Highlight or remove IRC control characters
-@item Highlight pals, fools, and other keywords
-@item Detect netsplits
-@item Complete nicknames and commands in a programmable fashion
-@item Make displayed lines read-only
-@item Input history
-@item Track channel activity in the mode-line
-
-@end itemize
-
-@node Obtaining ERC, Installation, Introduction, Top
-@comment  node-name,  next,  previous,  up
-@chapter Obtaining ERC
-
-@menu
-* Releases::                    Released versions of ERC.
-* Development::                 Latest unreleased development changes.
-@end menu
-
-Note that some ERC files are not included with Emacs due to copyright or
-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}
-@end itemize
-
-The rest of this chapter may be skipped if you are using the version of
-ERC that comes with Emacs.
-
-@node Releases, Development, Obtaining ERC, Obtaining ERC
-@comment  node-name,  next,  previous,  up
-@section Releases
-
-Choose to install a release if you want to minimize risk.
-
-Errors are corrected in development first.  User-visible changes will be
-announced on the @email{erc-discuss@@gnu.org} mailing list.
-@pxref{Getting Help and Reporting Bugs}.
-
-@cindex releases, Debian package
-@cindex Debian package for ERC
-Debian users can get ERC via apt-get.  The @file{erc} package is
-available in the official Debian repository.
-
-@cindex releases, from source
-Alternatively, you can download the latest release from
-@uref{http://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
-
-@node Development,  , Releases, Obtaining ERC
-@comment  node-name,  next,  previous,  up
-@section Development
-@cindex development
-
-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
-
-ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
-up-to-date involves the following steps.
-
-@enumerate
-@cindex GNU Arch, installing
-@item Install arch
-
-@itemize @bullet
-@item Debian: @kbd{apt-get install tla}.
-@item Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
-@end itemize
-
-@cindex GNU Arch, downloading ERC
-@item Register the archive.
-@example
-tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
-@end example
-
-@item Download the ERC source code.
-@example
-# Download ERC into the @file{erc} directory.
-tla get erc@@sv.gnu.org/erc--main--0 erc
-@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.
-
-@example
-# Change to the source directory you are interested in.
-cd erc/
-
-# Display the summary of changes
-tla missing --summary
-@end example
-
-@cindex GNU Arch, updating ERC
-@item Update to the latest version by replaying missing changes.
-@example
-cd erc
-tla update
-@end example
-
-@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.
-
-@subheading Development snapshots
-
-@cindex development snapshot
-Alternatively, the latest development snapshot may be downloaded in both
-``.tar.gz'' and ``.zip'' forms.
-
-@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
-
-
-@node Installation, Getting Started, Obtaining ERC, Top
-@comment  node-name,  next,  previous,  up
-@chapter Installation
-
-ERC may be compiled and installed on your machine.
-
-This section may be skipped if you are using the version of ERC that
-comes with Emacs.
-
-@subsubheading Compilation
-
-This is an optional step, since Emacs Lisp source code does not
-necessarily have to be byte-compiled.  It will yield a speed increase,
-though.
-
-A working copy of Emacs or XEmacs is needed in order to compile ERC.  By
-default, the program that is installed with the name @command{emacs}
-will be used.
-
-If you want to use the @command{xemacs} binary to perform the
-compilation, you would need to edit @file{Makefile} in the top-level
-directory as follows.  You can put either a full path to an Emacs or
-XEmacs binary or just the command name, as long as it is in the
-@env{PATH}.
-
-@example
-EMACS    = xemacs
-SITEFLAG = -no-site-file
-@end example
-
-Running @code{make} should compile the ERC source files in the
-@file{lisp} directory.
-
-@subsubheading Installation
-
-ERC may be installed into your file hierarchy by doing the following.
-
-Edit the @file{Makefile} file so that @env{ELISPDIR} points to where you
-want the source and compiled ERC files to be installed and
-@env{INFODIR} indicates where to put the ERC manual.  Of course, you
-will want to edit @env{EMACS} and @env{SITEFLAG} as shown in the
-Compilation section if you are using XEmacs.
-
-If you are installing ERC on a Debian system, you might want to change
-the value of @env{INSTALLINFO} as specified in @file{Makefile}.
-
-Run @code{make} as a normal user.
-
-Run @code{make install} as the root user if you have chosen installation
-locations that require this.
-
-
-@node Getting Started, Keystroke Summary, Installation, Top
-@comment  node-name,  next,  previous,  up
-@chapter Getting Started
-@cindex settings
-
-To use ERC, add the directory containing its files to your
-@code{load-path} variable, in your @file{.emacs} file.  Then, load ERC
-itself.  An example follows.
-
-@lisp
-(require 'erc)
-@end lisp
-
-Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
-prompt for the server to connect to.
-
-If you want to place ERC settings in their own file, you can place them
-in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
-
-If you would rather use the Customize interface to change how ERC works,
-do @kbd{M-x customize-group RET erc RET}.  In particular, ERC comes with
-lots of modules that may be enabled or disabled; to select which ones
-you want, do @kbd{M-x customize-variable RET erc-modules RET}.
-
-@menu
-* Sample Session::              Example of connecting to the #emacs channel
-* Special Features::            Differences from standalone IRC clients
-@end menu
-
-@node Sample Session, Special Features, Getting Started, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Sample Session
-
-This is an example ERC session which shows how to connect to the #emacs
-channel on Freenode.  Another IRC channel on Freenode that may be of
-interest is #erc, which is a channel where ERC users and developers hang
-out.
-
-@itemize @bullet
-
-@item Connect to Freenode
-
-Run @kbd{M-x erc}.  Use ``irc.freenode.net'' as the IRC server, ``6667''
-as the port, and choose a nickname.
-
-@item Get used to the interface
-
-Switch to the ``irc.freenode.net:6667'' buffer, if you're not already
-there.  You will see first some messages about checking for ident, and
-then a bunch of other messages that describe the current IRC server.
-
-@item Join the #emacs channel
-
-In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}.  Depending
-on how you've set up ERC, either a new buffer for ``#emacs'' will be
-displayed, or a new buffer called ``#emacs'' will be created in the
-background.  If the latter, switch to the ``#emacs'' buffer.  You will
-see the channel topic and a list of the people who are currently on the
-channel.
-
-@item Register your nickname with Freenode
-
-If you would like to be able to talk with people privately on the
-Freenode network, you will have to ``register'' your nickname.  To do
-so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg
-NickServ register <password>'', replacing ``<password>'' with your
-desired password.  It should tell you that the operation was successful.
-
-@item Talk to people in the channel
-
-If you switch back to the ``#emacs'' buffer, you can type a message, and
-everyone on the channel will see it.
-
-@item Open a query buffer to talk to someone
-
-If you want to talk with someone in private (this should usually not be
-done for technical help, only for personal questions), type ``/query
-<nick>'', replacing ``<nick>'' with the nickname of the person you would
-like to talk to.  Depending on how ERC is set up, you will either see a
-new buffer with the name of the person, or such a buffer will be created
-in the background and you will have to switch to it.  Begin typing
-messages, and you will be able to have a conversation.
-
-Note that if the other person is not registered, you will not be able to
-talk with them.
-
-@end itemize
-
-@node Special Features, , Sample Session, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Special Features
-
-ERC has some features that distinguish it from some IRC clients.
-
-@itemize @bullet
-
-@item multiple channels and multiple servers
-
-Every channel is put in a separate buffer.  Several IRC servers may be
-connected to at the same time.
-
-@cindex query buffers
-@item private message separation
-
-Private conversations are treated as channels, and are put into separate
-buffers in Emacs.  We call these ``query buffers''.
-
-@item highlighting
-
-Some occurences of words can be highlighted, which makes it easier to
-track different kinds of conversations.
-
-@item notification
-
-ERC can notify you that certain users are online.
-
-@item channel tracking
-
-Channels can be hidden and conversation continue in the background.  You
-are notified when something is said in such a channel that is not
-currently visible.  This makes it easy to get Real Work done while still
-maintaining an IRC presence.
-
-@item nick completion
-
-ERC can complete words upon hitting @kbd{TAB}, which eases the writing
-of nicknames in messages.
-
-@cindex history ring
-@item history
-
-Past actions are kept in history rings for future use.  To navigate a
-history ring, hit @kbd{M-p} to go backwards and @kbd{M-n} to go
-forwards.
-
-@item multiple languages
-
-Different channels and servers may have different language encodings.
-
-In addition, it is possible to translate the messages that ERC uses into
-multiple languages.  Please contact the developers of ERC at
-@email{erc-discuss@@gnu.org} if you are interested in helping with the
-translation effort.
-
-@item user scripting
-
-Users can load scripts (e.g. auto greeting scripts) when ERC starts up.
-
-It is also possible to make custom IRC commands, if you know a little
-Emacs Lisp.  Just make an Emacs Lisp function and call it
-@code{erc-cmd-NEWCOMMAND}, where @code{NEWCOMMAND} is the name of the
-new command in capital letters.
-
-@item auto reconnect
-
-If the connection goes away at some point, ERC will try to reconnect
-automatically.  If it fails to reconnect, and you want to try to
-manually reestablish the connection at some later point, switch to an
-ERC  buffer and run the @code{/RECONNECT} command.
-
-@end itemize
-
-
-@node Keystroke Summary, Modules, Getting Started, Top
-@comment  node-name,  next,  previous,  up
-@chapter Keys Used in ERC
-@cindex keystrokes
-
-This is a summary of keystrokes available in every ERC buffer.
-
-@table @kbd
-
-@item C-a or <home> (`erc-bol')
-Go to beginning of line or end of prompt.
-
-@item RET (`erc-send-current-line')
-Send the current line
-
-@item TAB (`erc-complete-word')
-If at prompt, complete the current word.
-Otherwise, move to the next link or button.
-
-@item M-TAB (`ispell-complete-word')
-Complete the given word, using ispell.
-
-@item C-c C-a (`erc-bol')
-Go to beginning of line or end of prompt.
-
-@item C-c C-b (`erc-iswitchb')
-Use `iswitchb-read-buffer' to prompt for a ERC buffer to switch to.
-
-@item C-c C-c (`erc-toggle-interpret-controls')
-Toggle interpretation of control sequences in messages.
-
-@item C-c C-d (`erc-input-action')
-Interactively input a user action and send it to IRC.
-
-@item C-c C-e (`erc-toggle-ctcp-autoresponse')
-Toggle automatic CTCP replies (like VERSION and PING).
-
-@item C-c C-f (`erc-toggle-flood-control')
-Toggle use of flood control on sent messages.
-
-@item C-c TAB (`erc-invite-only-mode')
-Turn on the invite only mode (+i) for the current channel.
-
-@item C-c C-j (`erc-join-channel')
-Join channel.  If point is at the beginning of a channel name, use that
-as default.
-
-@item C-c C-k (`erc-go-to-log-matches-buffer')
-Interactively open an erc-log-matches buffer
-
-@item C-c C-l (`erc-save-buffer-in-logs')
-Append buffer contents to the log file, if logging is enabled.
-
-@item C-c C-n (`erc-channel-names')
-Run "/names #channel" in the current channel.
-
-@item C-c C-o (`erc-get-channel-mode-from-keypress')
-Read a key sequence and call the corresponding channel mode function.
-After doing @kbd{C-c C-o}, type in a channel mode letter.
-
-@kbd{C-g} means quit.
-@kbd{RET} lets you type more than one mode at a time.
-If @kbd{l} is pressed, @code{erc-set-channel-limit} gets called.
-If @kbd{k} is pressed, @code{erc-set-channel-key} gets called.
-Anything else will be sent to `erc-toggle-channel-mode'.
-
-@item C-c C-p (`erc-part-from-channel')
-Part from the current channel and prompt for a reason.
-
-@item C-c C-q (`erc-quit-server')
-Disconnect from current server after prompting for reason.
-
-@item C-c C-r (`erc-remove-text-properties-region')
-Clears the region (start,end) in object from all colors, etc.
-
-@item C-c C-t (`erc-set-topic')
-Prompt for a topic for the current channel.
-
-@item C-c C-u (`erc-kill-input')
-Kill current input line using `erc-bol' followed by `kill-line'.
-
-@end table
-
-
-@node Modules, Advanced Usage, Keystroke Summary, Top
-@comment  node-name,  next,  previous,  up
-@chapter Modules
-@cindex modules
-
-One way to add functionality to ERC is to customize which of its many
-modules are loaded.
-
-There is a spiffy customize interface, which may be reached by typing
-@kbd{M-x customize-option erc-modules RET}.  Alternatively, set
-@code{erc-modules} manually and then call @code{erc-update-modules}.
-
-The following is a list of available modules.
-
-@table @code
-
-@cindex modules, autoaway
-@item autoaway
-Set away status automatically
-
-@cindex modules, autojoin
-@item autojoin
-Join channels automatically
-
-@cindex modules, bbdb
-@item bbdb
-Integrate with the Big Brother Database
-
-@cindex modules, button
-@item button
-Buttonize URLs, nicknames, and other text
-
-@cindex modules, capab-identify
-@item capab-identify
-Mark unidentified users on freenode and other servers supporting CAPAB.
-
-@cindex modules, completion
-@cindex modules, pcomplete
-@item completion (aka pcomplete)
-Complete nicknames and commands (programmable)
-
-@cindex modules, fill
-@item fill
-Wrap long lines
-
-@cindex modules, hecomplete
-@item hecomplete
-Complete nicknames and commands (old).  This is the old module---you
-might prefer the ``completion'' module instead.
-
-@cindex modules, identd
-@item identd
-Launch an identd server on port 8113
-
-@cindex modules, irccontrols
-@item irccontrols
-Highlight or remove IRC control characters
-
-@cindex modules, log
-@item log
-Save buffers in logs
-
-@cindex modules, match
-@item match
-Highlight pals, fools, and other keywords
-
-@cindex modules, menu
-@item menu
-Display a menu in ERC buffers
-
-@cindex modules, netsplit
-@item netsplit
-Detect netsplits
-
-@cindex modules, noncommands
-@item noncommands
-Don't display non-IRC commands after evaluation
-
-@cindex modules, notify
-@item notify
-Notify when the online status of certain users changes
-
-@cindex modules, page
-@item page
-Process CTCP PAGE requests from IRC
-
-@cindex modules, readonly
-@item readonly
-Make displayed lines read-only
-
-@cindex modules, replace
-@item replace
-Replace text in messages
-
-@cindex modules, ring
-@item ring
-Enable an input history
-
-@cindex modules, scrolltobottom
-@item scrolltobottom
-Scroll to the bottom of the buffer
-
-@cindex modules, services
-@item services
-Identify to Nickserv (IRC Services) automatically
-
-@cindex modules, smiley
-@item smiley
-Convert smileys to pretty icons
-
-@cindex modules, sound
-@item sound
-Play sounds when you receive CTCP SOUND requests
-
-@cindex modules, spelling
-@item spelling
-Check spelling of messages
-
-@cindex modules, stamp
-@item stamp
-Add timestamps to messages
-
-@cindex modules, track
-@item track
-Track channel activity in the mode-line
-
-@cindex modules, truncate
-@item truncate
-Truncate buffers to a certain size
-
-@cindex modules, unmorse
-@item unmorse
-Translate morse code in messages
-
-@end table
-
-@c PRE5_3: Document every option of every module in its own subnode
-
-
-@node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
-@comment  node-name,  next,  previous,  up
-@chapter Advanced Usage
-@cindex advanced topics
-
-@menu
-* Connecting::                  Ways of connecting to an IRC server.
-* Sample Configuration::        An example configuration file.
-* Options::                     Options that are available for ERC.
-@end menu
-
-@node Connecting, Sample Configuration, Advanced Usage, Advanced Usage
-@comment  node-name,  next,  previous,  up
-@section Connecting to an IRC Server
-@cindex connecting
-
-The easiest way to connect to an IRC server is to call @kbd{M-x erc}.
-If you want to assign this function to a keystroke, the following will
-help you figure out its parameters.
-
-@defun erc
-Select connection parameters and run ERC.
-Non-interactively, it takes the following keyword arguments.
-
-@itemize @bullet
-@item @var{server}
-@item @var{port}
-@item @var{nick}
-@item @var{password}
-@item @var{full-name}
-@end itemize
-
-That is, if called with the following arguments, @var{server} and
-@var{full-name} will be set to those values, whereas
-@code{erc-compute-port}, @code{erc-compute-nick} and
-@code{erc-compute-full-name} will be invoked for the values of the other
-parameters.
-
-@example
-(erc :server "irc.freenode.net" :full-name "Harry S Truman")
-@end example
-@end defun
-
-@subheading Server
-
-@defun erc-compute-server &optional server
-Return an IRC server name.
-
-This tries a number of increasingly more default methods until a non-nil
-value is found.
-
-@itemize @bullet
-@item @var{server} (the argument passed to this function)
-@item The @code{erc-server} option
-@item The value of the IRCSERVER environment variable
-@item The @code{erc-default-server} variable
-@end itemize
-
-@end defun
-
-@defopt erc-server nil
-IRC server to use if one is not provided.
-@end defopt
-
-@subheading Port
-
-@defun erc-compute-port &optional port
-Return a port for an IRC server.
-
-This tries a number of increasingly more default methods until a non-nil
-value is found.
-
-@itemize @bullet
-@item @var{port} (the argument passed to this function)
-@item The @code{erc-port} option
-@item The @code{erc-default-port} variable
-@end itemize
-
-@end defun
-
-@defopt erc-port
-IRC port to use if not specified.
-
-This can be either a string or a number.
-@end defopt
-
-@subheading Nick
-
-@defun erc-compute-nick &optional nick
-Return user's IRC nick.
-
-This tries a number of increasingly more default methods until a
-non-nil value is found.
-
-@itemize
-@item @var{nick} (the argument passed to this function)
-@item The @code{erc-nick} option
-@item The value of the IRCNICK environment variable
-@item The result from the @code{user-login-name} function
-@end itemize
-
-@end defun
-
-@defopt erc-nick
-Nickname to use if one is not provided.
-
-This can be either a string, or a list of strings.
-In the latter case, if the first nick in the list is already in use,
-other nicks are tried in the list order.
-@end defopt
-
-@defopt erc-nick-uniquifier
-The string to append to the nick if it is already in use.
-@end defopt
-
-@defopt erc-try-new-nick-p
-If the nickname you chose isn't available, and this option is non-nil,
-ERC should automatically attempt to connect with another nickname.
-
-You can manually set another nickname with the /NICK command.
-@end defopt
-
-@subheading Full name
-
-@defun erc-compute-full-name &optional full-name
-Return user's full name.
-
-This tries a number of increasingly more default methods until a
-non-nil value is found.
-
-@itemize @bullet
-@item @var{full-name} (the argument passed to this function)
-@item The @code{erc-user-full-name} option
-@item The value of the IRCNAME environment variable
-@item The result from the @code{user-full-name} function
-@end itemize
-
-@end defun
-
-@defopt erc-user-full-name
-User full name.
-
-This can be either a string or a function to call.
-@end defopt
-
-@node Sample Configuration, Options, Connecting, Advanced Usage
-@comment  node-name,  next,  previous,  up
-@section Sample Configuration
-@cindex configuration, sample
-
-Here is an example of configuration settings for ERC.  This can go into
-your Emacs configuration file.  Everything after the @code{(require
-'erc)} command can optionally go into @file{~/.emacs.d/.ercrc.el}.
-
-@lisp
-;;; Sample ERC configuration
-
-;; Add the ERC directory to load path -- you don't need this if you are
-;; using the version of ERC that comes with Emacs
-(add-to-list 'load-path "~/elisp/erc")
-
-;; Load ERC
-(require 'erc)
-
-;; Load authentication info from an external source.  Put sensitive
-;; passwords and the like in here.
-(load "~/.emacs.d/.erc-auth")
-
-;; This is an example of how to make a new command.  Type "/uptime" to
-;; use it.
-(defun erc-cmd-UPTIME (&rest ignore)
-  "Display the uptime of the system, as well as some load-related
-stuff, to the current ERC buffer."
-  (let ((uname-output
-         (replace-regexp-in-string
-          ", load average: " "] @{Load average@} ["
-          ;; Collapse spaces, remove
-          (replace-regexp-in-string
-           " +" " "
-           ;; Remove beginning and trailing whitespace
-           (replace-regexp-in-string
-            "^ +\\|[ \n]+$" ""
-            (shell-command-to-string "uptime"))))))
-    (erc-send-message
-     (concat "@{Uptime@} [" uname-output "]"))))
-
-;; This causes ERC to connect to the Freenode network upon hitting
-;; C-c e f.  Replace MYNICK with your IRC nick.
-(global-set-key "\C-cef" (lambda () (interactive)
-                           (erc :server "irc.freenode.net" :port "6667"
-                                :nick "MYNICK")))
-
-;; This causes ERC to connect to the IRC server on your own machine (if
-;; you have one) upon hitting C-c e b.  Replace MYNICK with your IRC
-;; nick.  Often, people like to run bitlbee (http://bitlbee.org/) as an
-;; AIM/Jabber/MSN to IRC gateway, so that they can use ERC to chat with
-;; people on those networks.
-(global-set-key "\C-ceb" (lambda () (interactive)
-                           (erc :server "localhost" :port "6667"
-                                :nick "MYNICK")))
-
-;; Make C-c RET (or C-c C-RET) send messages instead of RET. This has
-;; been commented out to avoid confusing new users.
-;; (define-key erc-mode-map (kbd "RET") nil)
-;; (define-key erc-mode-map (kbd "C-c RET") 'erc-send-current-line)
-;; (define-key erc-mode-map (kbd "C-c C-RET") 'erc-send-current-line)
-
-;;; Options
-
-;; Join the #emacs and #erc channels whenever connecting to Freenode.
-(setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
-
-;; Interpret mIRC-style color commands in IRC chats
-(setq erc-interpret-mirc-color t)
-
-;; The following are commented out by default, but users of other
-;; non-Emacs IRC clients might find them useful.
-;; Kill buffers for channels after /part
-;; (setq erc-kill-buffer-on-part t)
-;; Kill buffers for private queries after quitting the server
-;; (setq erc-kill-queries-on-quit t)
-;; Kill buffers for server messages after quitting the server
-;; (setq erc-kill-server-buffer-on-quit t)
-@end lisp
-
-@node Options, , Sample Configuration, Advanced Usage
-@comment  node-name,  next,  previous,  up
-@section Options
-@cindex options
-
-@c PRE5_3: (Node) Document every ERC option (module options go in
-@c previous chapter)
-
-This section has not yet been written.  For now, the easiest way to
-check out the available options for ERC is to do
-@kbd{M-x customize-group erc RET}.
-
-
-@node Getting Help and Reporting Bugs, History, Advanced Usage, Top
-@comment  node-name,  next,  previous,  up
-@chapter Getting Help and Reporting Bugs
-@cindex help, getting
-@cindex bugs, reporting
-
-After you have read this guide, if you still have questions about ERC,
-or if you have bugs to report, there are several places you can go.
-
-@itemize @bullet
-
-@item
-@uref{http://www.emacswiki.org/cgi-bin/wiki/ERC} is the
-emacswiki.org page for ERC.  Anyone may add tips, hints, or bug
-descriptions to it.
-
-@item
-There are several mailing lists for ERC.  To subscribe, visit
-@uref{http://savannah.gnu.org/mail/?group=erc}.
-
-The mailing lists are also available on Gmane.
-(@url{http://gmane.org/}).  Gmane provides additional methods for
-accessing the mailing lists, adding content to them, and searching them.
-
-@enumerate
-@item gmane.emacs.erc.announce: Announcements
-
-@item gmane.emacs.erc.discuss: General discussion
-
-@item gmane.emacs.erc.cvs: Log messages for changes to the ERC source code
-
-@end enumerate
-
-@item
-You can visit the IRC Freenode channel @samp{#emacs}. Many of the
-contributors are frequently around and willing to answer your
-questions.
-
-@end itemize
-
-
-@node History, GNU Free Documentation License, Getting Help and Reporting Bugs, Top
-@comment  node-name,  next,  previous,  up
-@chapter History
-@cindex history, of ERC
-
-ERC was originally written by Alexander L. Belikoff
-@email{abel@@bfr.co.il} and Sergey Berezin
-@email{sergey.berezin@@cs.cmu.edu}.  They stopped development around
-December 1999.  Their last released version was ERC 2.0.
-
-P.S.: If one of the original developers of ERC reads this, we'd like to
-receive additional information for this file and hear comments in
-general.
-
-@itemize
-@item 2001
-
-In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder
-@email{alex@@gnu.org} took over development and created a ERC Project at
-@uref{http://sourceforge.net/projects/erc}.
-
-In reaction to a mail about the new ERC development effort, Sergey
-Berezin said, ``First of all, I'm glad that my version of ERC is being
-used out there.  The thing is, I do not have free time and enough
-incentive anymore to work on ERC, so I would be happy if you guys take
-over the project entirely.''
-
-So we happily hacked away on ERC, and soon after (September 2001)
-released the next "stable" version, 2.1.
-
-Most of the development of the new ERC happened on #emacs on
-irc.openprojects.net.  Over time, many people contributed code, ideas,
-bugfixes, and a lot of alpha/beta/gamma testing.
-
-See the @file{CREDITS} file for a list of contributors.
-
-@item 2003
-
-ERC 3.0 was released.
-
-@item 2004
-
-ERC 4.0 was released.
-
-@item 2005
-
-ERC 5.0 was released.  Michael Olson @email{mwolson@@gnu.org} became
-the release manager and eventually the maintainer.
-
-After some discussion between him and the Emacs developers, it was
-decided to include ERC in Emacs.
-
-@item 2006
-
-ERC 5.1 was released.  It was subsequently included in Emacs 22.
-
-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.
-
-@end itemize
-
-@node GNU Free Documentation License, Concept Index, History, Top
-@unnumbered GNU Free Documentation License
-@include doclicense.texi
-
-@node Concept Index,  , GNU Free Documentation License, Top
-@comment  node-name,  next,  previous,  up
-@unnumbered Index
-
-@printindex cp
-
-@bye
-
-@ignore
-   arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
-@end ignore
diff --git a/scripts/common.defs b/scripts/common.defs
index 08872da..37707b5 100644
--- a/scripts/common.defs
+++ b/scripts/common.defs
@@ -1,6 +1,51 @@
 # Common definitions for syncing ERC             -*- Shell-script -*-
 
-EMACS=~/proj/emacs/emacs
-ETC=$EMACS/etc
-LISP=$EMACS/lisp
-MAN=$EMACS/man
+EMACS=~/proj/emacs/emacs/git
+
+# Contents
+
+IMAGES="images/icq-offline.png
+images/icq-online.png
+images/irc-offline.png
+images/irc-online.png
+images/msn-offline.png
+images/msn-online.png"
+
+NEWS="NEWS"
+
+LISP="erc-autoaway.el
+erc-backend.el
+erc-button.el
+erc-capab.el
+erc-compat.el
+erc-dcc.el
+erc-ezbounce.el
+erc-fill.el
+erc-goodies.el
+erc-hecomplete.el
+erc-ibuffer.el
+erc-identd.el
+erc-imenu.el
+erc-join.el
+erc-lang.el
+erc-log.el
+erc-match.el
+erc-menu.el
+erc-netsplit.el
+erc-networks.el
+erc-notify.el
+erc-page.el
+erc-pcomplete.el
+erc-replace.el
+erc-ring.el
+erc-services.el
+erc-sound.el
+erc-speedbar.el
+erc-spelling.el
+erc-stamp.el
+erc-track.el
+erc-truncate.el
+erc-xdcc.el
+erc.el"
+
+MAN="erc.texi"
diff --git a/scripts/sync-from-emacs b/scripts/sync-from-emacs
index 3527bd7..a5b2a5b 100755
--- a/scripts/sync-from-emacs
+++ b/scripts/sync-from-emacs
@@ -3,7 +3,7 @@
 # Load common definitions
 . scripts/common.defs
 
-(cd $LISP/erc && find . -maxdepth 1 -mindepth 1 -type f -exec cp {} $OLDPWD \;)
-cp $ETC/ERC-NEWS etc/
-cp $MAN/erc.texi man/
+(cd $EMACS/lisp/erc && find . -maxdepth 1 -mindepth 1 -type f -exec cp {} $OLDPWD \;)
+cp $EMACS/etc/ERC-NEWS NEWS
+cp $EMACS/doc/misc/erc.texi .
 rm -f *.elc
diff --git a/scripts/sync-to-emacs b/scripts/sync-to-emacs
index 354953b..9ce9659 100755
--- a/scripts/sync-to-emacs
+++ b/scripts/sync-to-emacs
@@ -3,6 +3,19 @@
 # Load common definitions
 . scripts/common.defs
 
-find . -maxdepth 1 -mindepth 1 -type f -exec cp {} $LISP/erc \;
-find ./etc -maxdepth 1 -mindepth 1 -type f -exec cp {} $ETC \;
-find ./man -maxdepth 1 -mindepth 1 -type f -exec cp {} $MAN \;
+IFS="
+"
+
+for i in $LISP; do
+    cp $i $EMACS/lisp/erc
+done
+
+for i in $MAN; do
+    cp $i $EMACS/doc/misc
+done
+
+for i in $IMAGES; do
+    # Do nothing
+done
+
+cp $NEWS $EMACS/etc/ERC-NEWS



From MAILER-DAEMON Wed Oct 17 10:36:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0W-0003Cs-SL
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTM-0008Ma-Vs
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPN-00059N-VA
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPM-000596-PB
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
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@hcoop.net>) id 1IgvPL-00044o-U0
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPL-0005GO-7R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPL-0006WR-9m
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:55 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPL-0006WR-9m@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:55 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Merged from erc--main--0
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, 14 Oct 2007 04:53:05 -0000

commit c95cfefcc40d02593fb6a58b1afd72db784aa486
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 01:35:43 2007 +0000

    Merged from erc--main--0
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--main--0--patch-116
       Docfixes
    
     * erc@sv.gnu.org/erc--main--0--patch-117
       Autoload erc-select; erc-auto-query => 'bury; freenode suffix.
    
     * erc@sv.gnu.org/erc--main--0--patch-118
       capab-identify: Added a prefix face.  Renamed two internal functions.
    
     * erc@sv.gnu.org/erc--main--0--patch-119
       Fixed a bug in the `erc-autoaway-idle-method' :set definition.
    
     * erc@sv.gnu.org/erc--main--0--patch-120
       manual: Work on FOR-RELEASE items
    
     * erc@sv.gnu.org/erc--main--0--patch-121
       erc-track: Assimilate two modules into one
    
     * erc@sv.gnu.org/erc--main--0--patch-122
       erc-track: Fix mentions of erc-track-when-inactive-mode
    
     * erc@sv.gnu.org/erc--main--0--patch-123
       erc-log: Add choice to have log files with network name
    
     * erc@sv.gnu.org/erc--main--0--patch-124
       erc-track: Make C-c C-SPC comply with Emacs devel rules
    
     * erc@sv.gnu.org/erc--main--0--patch-125
       erc-bbdb: Make it easier to cancel merging /whois info
    
     * erc@sv.gnu.org/erc--main--0--patch-126
       manual: Update sample session
    
     * erc@sv.gnu.org/erc--main--0--patch-127
       manual: Finish some FOR-RELEASE items and defer others to 5.3.
    
     * erc@sv.gnu.org/erc--main--0--patch-128
       NEWS: Update for the 5.2 release
    
     * erc@sv.gnu.org/erc--main--0--patch-129
       Make extras tarball
    
     * erc@sv.gnu.org/erc--main--0--patch-130
       NEWS: Mention renamed files
    
     * erc@sv.gnu.org/erc--main--0--patch-131
       erc-list: Update copyright notice
    
     * erc@sv.gnu.org/erc--main--0--patch-132
       Release ERC 5.2
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-13

diff --git a/ChangeLog b/ChangeLog
index ce56964..2ad7799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,152 @@
+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.2006.
+	(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.
+
+	* 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
diff --git a/FOR-RELEASE b/FOR-RELEASE
index 8d8c486..392d2e8 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -2,20 +2,25 @@ Tasks that need to be accomplished in order for a release to happen.
 
 * 5.3 release (future)
 
+** Documentation
+
+*** Finish items marked with "@c PRE5_3" in the documentation.
+
 ** Source
 
 *** Make erc-backend not need to (require) any other part of ERC.
 This will hopefully increase the chance that it will be useful for
 other IRC clients, like Circe.
 
+*** Make erc-nicklist into a proper ERC module.
+
 * 5.2 release
 
 ** Documentation
 
-*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
-the release of 5.2.
+*** [DONE] Finish items marked with "@c PRE5_2" in the documentation.
 
-*** Update NEWS for changes since 5.1.4.
+*** [DONE] Update NEWS for changes since 5.1.4.
 
 ** Source
 
@@ -31,16 +36,25 @@ erc--main--0 branch.
 *** [DONE] Make M-x erc start a session.
 New users never think of using M-x erc-select.
 
-*** Change keybinding definitions for `erc-track-switch-buffer'.
+*** [DONE] Change keybinding definitions for `erc-track-switch-buffer'.
 `C-c C-SPC' / `C-c C-@' is set as a global keybinding and is known to
 conflict with rcirc, for example.  Would setting `erc-track-mode-map'
 work?  Otherwise we could encourage people to use something like
 `C-c e SPC' or `C-c c'.
 
-*** Make a tarball with the modules that weren't included with
+Solution: We went with a global minor mode which does nothing but set
+the global-level C-c C-SPC and C-c C-@ keybindings.  It defaults to
+warning the user if one of their keybindings would be overridden, so
+this solution should be OK to install in Emacs.
+
+*** [DONE] Make a tarball with the modules that weren't included with
 Emacs 22 that can be downloaded from GNU's ftp server.
 
-* 5.1 release
+This is now available as "erc-5.2-extras.(tar.gz|zip)" at
+ftp.gnu.org/gnu/erc/.  It may be built with "make extras" and uploaded
+with "make upload-extras".
+
+* 5.1 release (old)
 
 ** [DONE] Documentation
 
diff --git a/Makefile b/Makefile
index 449ff29..dbd9ab6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
-VERSION=5.1.4
+VERSION=5.2
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.3-2
+LASTUPLOAD = 5.1.4-4
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
-UNCOMPILED = erc-chess.el erc-bbdb.el erc-ibuffer.el erc-speak.el \
+UNCOMPILED = erc-bbdb.el erc-chess.el erc-ibuffer.el erc-speak.el \
 		erc-speedbar.el erc-compat.el
-TESTING = erc-members.el erc-macs.el
+
+# Files to include in the extras pack for Emacs 22
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-speak.el \
+		 README.extras COPYING
+
 ALLSOURCE = $(wildcard *.el)
-SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED) $(TESTING),$(ALLSOURCE))
+SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED), $(ALLSOURCE))
 TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
-MISC	= AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
-		ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
-		ChangeLog.2001 servers.pl erc-auto.in erc.texi
+MISC	= AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
+		ChangeLog.2006 ChangeLog.2005 ChangeLog.2004 \
+		ChangeLog.2003 ChangeLog.2002 ChangeLog.2001 \
+		servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
 SITEFLAG    = --no-site-file
@@ -133,14 +138,21 @@ debrevision:
 
 release: autoloads distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
-	cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../erc-$(VERSION)
-	cp -r images ../erc-$(VERSION)
+	cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../$(SNAPDIR)
+	cp -r images ../$(SNAPDIR)
 	test -d ../$(SNAPDIR)/images/CVS && \
 	  rm -R ../$(SNAPDIR)/images/CVS || :
 	test -d ../$(SNAPDIR)/images/.arch-ids && \
 	  rm -R ../$(SNAPDIR)/images/.arch-ids || :
-	(cd .. && tar czf erc-$(VERSION).tar.gz erc-$(VERSION)/*; \
-	  zip -r erc-$(VERSION).zip erc-$(VERSION))
+	(cd .. && tar czf erc-$(VERSION).tar.gz $(SNAPDIR)/*; \
+	  zip -r erc-$(VERSION).zip $(SNAPDIR))
+
+extras:
+	-rm -Rf ../$(SNAPDIR)-extras
+	mkdir ../$(SNAPDIR)-extras && chmod 0755 ../$(SNAPDIR)-extras
+	cp $(EXTRAS) ../$(SNAPDIR)-extras
+	(cd .. && tar czf erc-$(VERSION)-extras.tar.gz $(SNAPDIR)-extras/*; \
+	  zip -r erc-$(VERSION)-extras.zip $(SNAPDIR)-extras)
 
 upload:
 	(cd .. && gpg --detach erc-$(VERSION).tar.gz && \
@@ -156,3 +168,18 @@ upload:
 	  echo close >> upload.lftp ; \
 	  lftp -f upload.lftp ; \
 	  rm -f upload.lftp)
+
+upload-extras:
+	(cd .. && gpg --detach erc-$(VERSION)-extras.tar.gz && \
+	  gpg --detach erc-$(VERSION)-extras.zip && \
+	  echo "Directory: erc" | gpg --clearsign > \
+	    erc-$(VERSION)-extras.tar.gz.directive.asc && \
+	  cp erc-$(VERSION)-extras.tar.gz.directive.asc \
+	    erc-$(VERSION)-extras.zip.directive.asc && \
+	  echo open ftp://ftp-upload.gnu.org > upload.lftp ; \
+	  echo cd /incoming/ftp >> upload.lftp ; \
+	  echo mput erc-$(VERSION)-extras.zip* >> upload.lftp ; \
+	  echo mput erc-$(VERSION)-extras.tar.gz* >> upload.lftp ; \
+	  echo close >> upload.lftp ; \
+	  lftp -f upload.lftp ; \
+	  rm -f upload.lftp)
diff --git a/NEWS b/NEWS
index 6215c54..bce99d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 ERC NEWS                                                       -*- outline -*-
 
-* Changes in ERC 5.2 (unreleased)
+* Changes in ERC 5.2
 
 ** M-x erc RET now starts ERC.
 `erc-select' has been changed to `erc'.  `erc-select' still remains as
@@ -8,39 +8,276 @@ an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
 `erc-ssl' with `erc-select-ssl' as its alias.  The function that was
 known as `erc' is now `erc-open'.
 
+** Open query buffers by default when private messages are received.
+The default value of `erc-auto-query' has been changed to 'bury.
+
 ** New command: /RECONNECT
 This command tries to reconnect to the current IRC server exactly
 once.  It does not work in server buffers (throws an error before the
 command is run), but works in query and channel buffers.
 
+** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
+
+** Fix buggy interaction with multi-tty Emacs.
+
+** After running /QUIT, make sure that the IRC process is killed within
+4 seconds.  Freenode, in particular, needs this at times.
+
+** If the IRC process has not responded to our PINGs within a certain
+time, kill it and restart the connection.  See
+`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
+`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
+`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
+
+** Avoid getting into an infinite connection loop.
+Previously, this could happen if your nick was banned, you were using
+Tor, incorrect information was entered, or the connection was bad.
+
+** Make ban messages less confusing.
+
+** Restore the point correctly when reconnecting to an IRC server.
+
+** Make /IGNORE and /UNIGNORE prompt to determine whether their
+argument is a user or a regexp.  This results in less-confusing
+behavior when trying to ignore someone who has a bracket in their
+nick.
+
+** Make the default port "6667" rather than "ircd", because some
+operating systems don't know what port "ircd" maps to.
+
+** Fix several bugs in erc-iswitchb (C-c C-b).
+
+** Clean up internal documentation.
+Special thanks go to Juanma Barranquero for the thorough vetting of
+ERC's internal documentation.
+
+** Display a more informative message when a module is not found.
+
+** Fix a bug where paths were being colored like IRC commands.
+
+** In the customize interface for `erc-modules', add the name of the module.
+This makes it easier to find modules by name.
+
+** erc-server-send-ping-interval: Change to use a default of 30 seconds.
+
+** Some files which are included with the release of ERC 5.2 will not
+appear in the version of ERC that is bundled with Emacs 22.  These
+extras files may be found at:
+
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
+
+** Renamed files
+
+Several files were renamed so as to make them distinct to users of the
+MS-DOS operating system.
+
+ o erc-autojoin.el -> erc-join.el
+ o erc-complete.el -> erc-hecomplete.el
+ o erc-nickserv.el -> erc-services.el
+
+** Header line changes
+
+*** Remove "[IRC]" from the header line.
+
+*** Add the %l format character to `erc-header-line-format',
+
+*** Document how to remove the header line.
+Namely: (setq erc-header-line-format nil).
+
 ** New options
 
 *** erc-server-reconnect-attempts: Determines the number of
 reconnection attempts that ERC will make per server.
 
-*** erc-server-reconnect-timeout: New option that determines the
-amount of time, in seconds, that ERC will wait between successive
-reconnect attempts.
+*** erc-server-reconnect-timeout: Determines the amount of time,
+in seconds, that ERC will wait between successive reconnect attempts.
+
+*** erc-server-send-ping-timeout: Determines when to consider a connection
+stalled and restart it.  The default is	after 120 seconds.
+
+*** erc-system-name: Determines the system name to use when logging in.
+The default is to figure this out by calling `system-name'.
 
 ** New face: `erc-my-nick-face'
 This helps make it easier to distinguish messages sent by yourself
 from messages sent by other users when the value of the variable
 `erc-show-my-nick' is non-nil.
 
+** Namespace changes
+
+*** New macro: `erc-with-server-buffer'
+Switches to the current ERC server buffer and runs some code.  If no
+server buffer is available, return nil.  This is a useful way to
+access variables in the server buffer.
+
+*** New function: `erc-open-server-buffer-p'
+Returns non-nil if the given buffer is an ERC server buffer that has
+an open IRC process.
+
+*** New function: `erc-format-lag-time'
+Returns the estimated lag time to server, `erc-server-lag'.
+
+*** Renamed items
+
+ o `erc-server-setup-periodical-server-ping' is now
+   `erc-server-setup-periodical-ping'
+
+ o `erc-away-p' is now `erc-away-time'
+
+** Changes to the ERC manual
+
+*** New section: Sample Session.
+Describes a sample ERC session for connecting to the #emacs channel on
+Freenode.  Also mention the #erc channel.
+
+*** New section: Special Features.
+Describes some of the special features of ERC.
+
+*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
+interface.
+
+*** Development: Mention ErcDevelopment page on emacswiki.org.
+
+*** Tips and Tricks: Remove empty section for now.
+
+*** Options: Mention how to see available ERC options.
+
+*** Sample Configuration: Add an example of how to configure ERC.
+
 ** New modules
 
+*** Autoaway (erc-autoaway.el)
+
+**** Make this much more reliable.
+
+**** Avoid duplicate messages when coming back from being away.
+
+**** Fix bug where autoaway was enabled just by loading the file.
+
+*** BBDB (erc-bbdb.el)
+
+**** Display information on how to cancel merging of info or how to
+create a new John Doe record.
+
+**** Make it so that information from /whois continues to come in, even
+while prompting for a record to merge.
+
+**** Make hitting C-g correctly abort merging the record.
+
 *** Capab identify (erc-capab.el)
 Mark users who haven't identified to NickServ on servers supporting
 CAPAB IDENTIFY-MSG.
 
 ** Changes and additions to modules
 
+*** Button (erc-button.el)
+
+**** Make <backtab> go to the previous button.
+
 *** Channel tracking (erc-track.el)
 
 **** Use mouse-face and help-echo for channel names in the mode-line.
 This helps people using a mouse know that they are buttons and can be
 clicked on.
 
+**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
+This is accomplished by moving these bindings to their own global
+minor mode.  Now the default is to check whether the user has bound
+something to C-c C-SPC or C-c C-@.  If they have, prompt them about
+whether to really override that binding.  This also has the effect of
+preventing ERC from clobbering rcirc's keybinding, unless this is
+desired.  See `erc-track-enable-keybindings' for more details.
+
+**** New option: erc-track-enable-keybindings.
+Determine whether or not to enable the C-c C-SPC and C-c C-@
+keybindings.  The default is to ask whether to do this if a binding to
+these keys already exists.  It can also be set to t or nil to always
+bind or never bind, respectively.
+
+**** Remove `track-when-inactive' module.
+See `erc-track-when-inactive' for further details.
+
+**** New option: erc-track-when-inactive.
+This option replaces the track-when-inactive module.  Set it to
+non-nil to track activity even in visible buffers when inactive.  The
+default is nil.
+
+**** Remove the `track-modified-channels' alias for the `track' module.
+
+*** DCC support (erc-dcc.el)
+
+**** Add Usage section to Commentary.
+
+**** Fix a bug in the server message output.
+
+*** Filling (erc-fill.el)
+
+**** Fix bug involving messages that start with one or more blank lines.
+
+*** Identd (erc-identd.el)
+
+**** New option `erc-identd-port'
+Specifies the port to use if none is given as an argument to
+`erc-identd-start'.  This is placed in the new customization group
+`erc-identd'.
+
+**** New function: `erc-identd-quickstart'
+Ignores any arguments and calls `erc-identd-start'.
+
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
+*** Logging (erc-log.el)
+
+**** Make sure filenames are safe to use before writing to them.
+
+**** Save all log buffers when exiting Emacs.
+
+**** erc-generate-log-file-name-function: Add option for
+`erc-generate-log-file-name-network', which is a new function that
+uses the network name rather than the server name when possible.
+
+*** Menu (erc-menu.el)
+
+**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
+and other clients.
+
+**** Make this into a proper module and load it by default.
+
+**** Add "Current channel" submenu.
+
+*** Networks (erc-networks.el)
+
+**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
+
+**** Escape periods in Konfido.Net and Kewl.Org.
+
+*** Internet services / Nickserv (erc-nickserv.el)
+
+**** Add new 'both method for the `erc-nickserv-identify-mode' option
+and make it the default.  This tries to do the right thing both when a
+known nickserv message exists for an IRC network, and when it does
+not.
+
+**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
+
+**** Support authentication on BitlBee.
+
+**** Make source code easier to understand by using accessor functions.
+
+*** Sound support (erc-sound.el)
+
+**** Make this work with both Emacs 21 and Emacs 22.
+
+*** Timestamps (erc-stamp.el)
+
+**** Exclude the newline from the erc-timestamp field.
+
+**** New function: `erc-toggle-timestamps'.
+Toggles display of timestamps.
+
 * Changes in ERC 5.1.4
 
 ** Make find-function and find-variable work in Emacs 22 for
diff --git a/README.extras b/README.extras
new file mode 100644
index 0000000..a610e46
--- /dev/null
+++ b/README.extras
@@ -0,0 +1,31 @@
+
+This is the README file for the ERC extras.
+
+ERC is a powerful, modular, and extensible IRC client for Emacs.
+
+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:
+
+ - No copyright disclaimer was completed for an author of the file.
+ - Depends on files which are not distibuted with Emacs.
+
+Installation
+------------
+
+There are several ways to tell Emacs where to find these files.  The
+easiest may perhaps be to copy them to "~/elisp/erc-extras", and then
+to add the line
+
+  (add-to-list 'load-path "~/elisp/erc-extras" t)
+
+to your ~/.emacs (or ~/.emacs/init.el) file.  Compiling them would be
+overkill.
+
+License information
+-------------------
+
+These extras for ERC are available under the terms of the GNU General
+Public License.  See the file `COPYING' for details.
diff --git a/erc-auto.in b/erc-auto.in
index adf4909..8ba706b 100644
--- a/erc-auto.in
+++ b/erc-auto.in
@@ -1,6 +1,6 @@
 ;;; -*-emacs-lisp-*-
 
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2007 Free Software Foundation, Inc.
 
 (defvar generated-autoload-file)
 (defvar command-line-args-left)
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 22636a9..91a1150 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -154,9 +154,12 @@ definitions of being idle."
 		 (const :tag "Emacs idle time" emacs)
 		 (const :tag "Last IRC action" irc))
   :set (lambda (sym val)
-	 (erc-autoaway-disable)
-	 (set-default sym val)
-	 (erc-autoaway-enable)))
+	 (if erc-autoaway-mode
+	     (progn
+	       (erc-autoaway-disable)
+	       (set sym val)
+	       (erc-autoaway-enable))
+	   (set sym val))))
 
 (defcustom erc-auto-set-away t
   "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.
diff --git a/erc-backend.el b/erc-backend.el
index e2b7914..08cb738 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -1513,6 +1513,9 @@ A server may send more than one 005 message."
 See `erc-display-server-message'." nil
   (erc-display-server-message proc parsed))
 
+(define-erc-response-handler (290)
+  "Handle dancer-ircd CAPAB messages." nil nil)
+
 (define-erc-response-handler (301)
   "AWAY notice." nil
   (erc-display-message parsed 'notice 'active 's301
diff --git a/erc-bbdb.el b/erc-bbdb.el
index dd8f8b5..fd5535b 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -130,7 +130,7 @@ their \"displayed name\"."
 		     (bbdb-search (bbdb-records) nil nil nil finger)
 		     (unless silent
 		       (bbdb-completing-read-one-record
-			"Merge using record of: "))
+			"Merge using record of (C-g to skip, RET for new): "))
 		     (when create-p
 		       (bbdb-create-internal (or name
 						 "John Doe")
@@ -152,7 +152,7 @@ their \"displayed name\"."
 							   'visible))))))
       (bbdb-display-records (list record)))))
 
-(defun erc-bbdb-insinuate-and-show-entry (create-p proc nick name finger-host silent &optional chan new-nick)
+(defun erc-bbdb-insinuate-and-show-entry-1 (create-p proc nick name finger-host silent &optional chan new-nick)
   (let ((record (erc-bbdb-search-name-and-create
 		 create-p nil nick finger-host silent))) ;; don't search for a name
     (when record
@@ -166,6 +166,13 @@ their \"displayed name\"."
       (erc-bbdb-highlight-record record)
       (erc-bbdb-show-entry record chan proc))))
 
+(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
+	       #'erc-bbdb-insinuate-and-show-entry-1
+	       create-p proc nick name finger-host silent chan new-nick))
+
 (defun erc-bbdb-whois (proc parsed)
   (let (; We could use server name too, probably
 	(nick (second (erc-response.command-args parsed)))
diff --git a/erc-capab.el b/erc-capab.el
index 268c4bf..b7ccade 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -56,8 +56,10 @@
 ;; (erc-capab-identify-mode 1)
 
 ;; `erc-capab-identify-prefix' will now be added to the beginning of
-;; unidentified users' nicknames.  The default is an asterisk, "*".  If
-;; the value of this variable is nil or you disable this module (see
+;; unidentified users' nicknames.  The default is an asterisk, "*".
+;; You can customize the prefix and the face used to display it,
+;; `erc-capab-identify-unidentified'.  If the value of
+;; `erc-capab-identify-prefix' is nil or you disable this module (see
 ;; `erc-capab-identify-disable'), no prefix will be inserted, but the
 ;; flag sent by the server will still be stripped.
 
@@ -73,14 +75,19 @@
   :group 'erc)
 
 (defcustom erc-capab-identify-prefix "*"
-  "The prefix used for unidentified users."
+  "The prefix used for unidentified users.
+
+If you change this from the default \"*\", be sure to use a
+character not found in IRC nicknames to avoid confusion."
   :group 'erc-capab
   :type '(choice string (const nil)))
 
-;;; Define module:
+(defface erc-capab-identify-unidentified '((t)) ; same as `erc-default-face'
+  "Face to use for `erc-capab-identify-prefix'."
+  :group 'erc-capab
+  :group 'erc-faces)
 
-(define-erc-response-handler (290)
-  "Handle dancer-ircd CAPAB messages." nil nil)
+;;; Define module:
 
 ;;;###autoload (autoload 'erc-capab-identify-mode "erc-capab" nil t)
 (define-erc-module capab-identify nil
@@ -124,9 +131,9 @@ Optional argument PARSED is the current message, a response struct.
 These arguments are sent to this function when called as a hook in
 `erc-server-005-functions'."
   (unless erc-capab-identify-sent
-    (erc-capab-send-identify-messages)))
+    (erc-capab-identify-send-messages)))
 
-(defun erc-capab-send-identify-messages ()
+(defun erc-capab-identify-send-messages ()
   "Send CAPAB IDENTIFY messages if the server supports it."
   (when (and (stringp erc-server-version)
              (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
@@ -175,7 +182,7 @@ PARSED is an `erc-parsed' response struct."
   (when (and erc-capab-identify-prefix
              (erc-with-server-buffer erc-capab-identify-activated))
     (goto-char (or (erc-find-parsed-property) (point-min)))
-    (let ((nickname (erc-capab-get-unidentified-nickname
+    (let ((nickname (erc-capab-identify-get-unidentified-nickname
                      (erc-get-parsed-vector (point)))))
       (when (and nickname
                  (goto-char (point-min))
@@ -183,10 +190,9 @@ PARSED is an `erc-parsed' response struct."
                  (re-search-forward (regexp-quote nickname) nil t))
         (goto-char (match-beginning 0))
         (insert (erc-propertize erc-capab-identify-prefix
-                                'face (get-char-property (- (point) 1)
-                                                         'face)))))))
+                                'face 'erc-capab-identify-unidentified))))))
 
-(defun erc-capab-get-unidentified-nickname (parsed)
+(defun erc-capab-identify-get-unidentified-nickname (parsed)
   "Return the nickname of the user if unidentified.
 PARSED is an `erc-parsed' response struct."
   (when (and (erc-response-p parsed)
diff --git a/erc-chess.el b/erc-chess.el
index fc61bdc..876b55e 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: games, comm
diff --git a/erc-list.el b/erc-list.el
index a574d6e..5f1ed05 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -1,6 +1,7 @@
 ;;; erc-list.el --- Provide a faster channel listing mechanism
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
+;;   2007 Free Software Foundation, Inc.
 ;; Copyright (C) 2004 Brian Palmer
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
diff --git a/erc-log.el b/erc-log.el
index 053bb37..9801192 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -85,7 +85,9 @@
 ;;; Code:
 
 (require 'erc)
-(eval-when-compile (require 'cl))
+(eval-when-compile
+  (require 'erc-networks)
+  (require 'cl))
 
 (defgroup erc-log nil
   "Logging facilities for ERC."
@@ -100,10 +102,12 @@ NICK is the current nick,
 SERVER and PORT are the parameters used to connect BUFFERs
 `erc-server-process'."
   :group 'erc-log
-  :type '(choice (const erc-generate-log-file-name-long)
-		 (const erc-generate-log-file-name-short)
-		 (const erc-generate-log-file-name-with-date)
-		 (symbol)))
+  :type '(choice (const :tag "Long style" erc-generate-log-file-name-long)
+		 (const :tag "Long, but with network name rather than server"
+			erc-generate-log-file-name-network)
+		 (const :tag "Short" erc-generate-log-file-name-short)
+		 (const :tag "With date" erc-generate-log-file-name-with-date)
+		 (symbol :tag "Other function")))
 
 (defcustom erc-truncate-buffer-on-save nil
   "Truncate any ERC (channel, query, server) buffer when it is saved."
@@ -347,6 +351,19 @@ This function is a possible value for `erc-generate-log-file-name-function'."
     ;; we need a make-safe-file-name function.
     (convert-standard-filename file)))
 
+(defun erc-generate-log-file-name-network (buffer target nick server port)
+  "Generates a log-file name using the network name rather than server name.
+This results in a file name of the form #channel!nick@network.txt.
+This function is a possible value for `erc-generate-log-file-name-function'."
+  (require 'erc-networks)
+  (let ((file (concat
+	       (if target (concat target "!"))
+	       nick "@"
+	       (or (with-current-buffer buffer (erc-network-name)) server)
+	       ".txt")))
+    ;; we need a make-safe-file-name function.
+    (convert-standard-filename file)))
+
 ;;;###autoload
 (defun erc-save-buffer-in-logs (&optional buffer)
   "Append BUFFER contents to the log file, if logging is enabled.
diff --git a/erc-speak.el b/erc-speak.el
index 8080a52..306580b 100644
--- a/erc-speak.el
+++ b/erc-speak.el
@@ -1,6 +1,6 @@
 ;;; erc-speak.el --- Speech-enable the ERC chat client
 
-;; Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-track.el b/erc-track.el
index 188e8ee..4a8b673 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -47,12 +47,33 @@
   "Track active buffers and show activity in the modeline."
   :group 'erc)
 
+(defcustom erc-track-enable-keybindings 'ask
+  "Whether to enable the ERC track keybindings, namely:
+`C-c C-SPC' and `C-c C-@', which both do the same thing.
+
+The default is to check to see whether these keys are used
+already: if not, then enable the ERC track minor mode, which
+provides these keys.  Otherwise, do not touch the keys.
+
+This can alternatively be set to either t or nil, which indicate
+respectively always to enable ERC track minor mode or never to
+enable ERC track minor mode.
+
+The reason for using this default value is to both (1) adhere to
+the Emacs development guidelines which say not to touch keys of
+the form C-c C-<something> and also (2) to meet the expectations
+of long-time ERC users, many of whom rely on these keybindings."
+  :group 'erc-track
+  :type '(choice (const :tag "Ask, if used already" ask)
+		 (const :tag "Enable" t)
+		 (const :tag "Disable" nil)))
+
 (defcustom erc-track-visibility t
   "Where do we look for buffers to determine their visibility?
 The value of this variable determines, when a buffer is considered
 visible or invisible.  New messages in invisible buffers are tracked,
 while switching to visible buffers when they are tracked removes them
-from the list.  See also `erc-track-when-inactive-mode'.
+from the list.  See also `erc-track-when-inactive'.
 
 Possible values are:
 
@@ -489,45 +510,124 @@ START is the minimum length of the name used."
 	 (equal (erc-unique-substrings '("abc" "abcdefg"))
 		'("abc" "abcd"))))))
 
+;;; Minor mode
+
+;; Play nice with other IRC clients (and Emacs development rules) by
+;; making this a minor mode
+
+(defvar erc-track-minor-mode-map (make-sparse-keymap)
+  "Keymap for rcirc track minor mode.")
+
+(define-key erc-track-minor-mode-map (kbd "C-c C-@") 'erc-track-switch-buffer)
+(define-key erc-track-minor-mode-map (kbd "C-c C-SPC")
+  'erc-track-switch-buffer)
+
+;;;###autoload
+(define-minor-mode erc-track-minor-mode
+  "Global minor mode for tracking ERC buffers and showing activity in the
+mode line.
+
+This exists for the sole purpose of providing the C-c C-SPC and
+C-c C-@ keybindings.  Make sure that you have enabled the track
+module, otherwise the keybindings will not do anything useful."
+  :init-value nil
+  :lighter ""
+  :keymap erc-track-minor-mode-map
+  :global t
+  :group 'erc-track)
+
+(defun erc-track-minor-mode-maybe ()
+  "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)))
+    (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-@"))))
+	     (if key
+		 (if (y-or-n-p
+		      (concat "The C-c " key " binding is in use;"
+			      " override it for tracking? "))
+		     (progn
+		       (message (concat "Will change it; set"
+					" `erc-track-enable-keybindings'"
+					" to disable this message"))
+		       (sleep-for 3)
+		       (erc-track-minor-mode 1))
+		   (message (concat "Not changing it; set"
+				    " `erc-track-enable-keybindings'"
+				    " to disable this message"))
+		   (sleep-for 3))
+	       (erc-track-minor-mode 1))))
+	  ((eq erc-track-enable-keybindings t)
+	   (erc-track-minor-mode 1))
+	  (t nil))))
+
 ;;; Module
 
 ;;;###autoload (autoload 'erc-track-mode "erc-track" nil t)
-(define-erc-module track track-modified-channels
+(define-erc-module track nil
   "This mode tracks ERC channel buffers with activity."
-  ((erc-track-add-to-mode-line erc-track-position-in-mode-line)
-   (setq erc-modified-channels-object (erc-modified-channels-object nil))
-   (erc-update-mode-line)
-   (if (featurep 'xemacs)
-       (defadvice switch-to-buffer (after erc-update (&rest args) activate)
-	 (erc-modified-channels-update))
-     (add-hook 'window-configuration-change-hook 'erc-modified-channels-update))
-   (add-hook 'erc-insert-post-hook 'erc-track-modified-channels)
-   (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))
-  ((erc-track-remove-from-mode-line)
-   (if (featurep 'xemacs)
-       (ad-disable-advice 'switch-to-buffer 'after 'erc-update)
-     (remove-hook 'window-configuration-change-hook
-		  'erc-modified-channels-update))
-   (remove-hook 'erc-disconnected-hook 'erc-modified-channels-update)
-   (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels)))
-
-;;;###autoload (autoload 'erc-track-when-inactive-mode "erc-track" nil t)
-(define-erc-module track-when-inactive nil
-  "This mode enables channel tracking even for visible buffers,
-if you are inactivity."
-  ((if (featurep 'xemacs)
-       (defadvice switch-to-buffer (after erc-update-when-inactive (&rest args) activate)
-	 (erc-user-is-active))
-     (add-hook 'window-configuration-change-hook 'erc-user-is-active))
-   (add-hook 'erc-send-completed-hook 'erc-user-is-active)
-   (add-hook 'erc-server-001-functions 'erc-user-is-active))
-  ((erc-track-remove-from-mode-line)
-   (if (featurep 'xemacs)
-       (ad-disable-advice 'switch-to-buffer 'after 'erc-update-when-inactive)
-     (remove-hook 'window-configuration-change-hook 'erc-user-is-active))
-   (remove-hook 'erc-send-completed-hook 'erc-user-is-active)
-   (remove-hook 'erc-server-001-functions 'erc-user-is-active)
-   (remove-hook 'erc-timer-hook 'erc-user-is-active)))
+  ;; Enable:
+  ((when (boundp 'erc-track-when-inactive)
+     (if erc-track-when-inactive
+	 (progn
+	   (if (featurep 'xemacs)
+	       (defadvice switch-to-buffer (after erc-update-when-inactive
+						  (&rest args) activate)
+		 (erc-user-is-active))
+	     (add-hook 'window-configuration-change-hook 'erc-user-is-active))
+	   (add-hook 'erc-send-completed-hook 'erc-user-is-active)
+	   (add-hook 'erc-server-001-functions 'erc-user-is-active))
+       (erc-track-add-to-mode-line erc-track-position-in-mode-line)
+       (setq erc-modified-channels-object (erc-modified-channels-object nil))
+       (erc-update-mode-line)
+       (if (featurep 'xemacs)
+	   (defadvice switch-to-buffer (after erc-update (&rest args) activate)
+	     (erc-modified-channels-update))
+	 (add-hook 'window-configuration-change-hook
+		   'erc-modified-channels-update))
+       (add-hook 'erc-insert-post-hook 'erc-track-modified-channels)
+       (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))
+     ;; enable the tracking keybindings
+     (erc-track-minor-mode-maybe)))
+  ;; Disable:
+  ((when (boundp 'erc-track-when-inactive)
+     (erc-track-remove-from-mode-line)
+     (if erc-track-when-inactive
+	 (progn
+	   (if (featurep 'xemacs)
+	       (ad-disable-advice 'switch-to-buffer 'after
+				  'erc-update-when-inactive)
+	     (remove-hook 'window-configuration-change-hook
+			  'erc-user-is-active))
+	   (remove-hook 'erc-send-completed-hook 'erc-user-is-active)
+	   (remove-hook 'erc-server-001-functions 'erc-user-is-active)
+	   (remove-hook 'erc-timer-hook 'erc-user-is-active))
+       (if (featurep 'xemacs)
+	   (ad-disable-advice 'switch-to-buffer 'after 'erc-update)
+	 (remove-hook 'window-configuration-change-hook
+		      'erc-modified-channels-update))
+       (remove-hook 'erc-disconnected-hook 'erc-modified-channels-update)
+       (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels))
+     ;; disable the tracking keybindings
+     (when erc-track-minor-mode
+       (erc-track-minor-mode -1)))))
+
+(defcustom erc-track-when-inactive nil
+  "Enable channel tracking even for visible buffers, if you are
+inactive."
+  :group 'erc-track
+  :type 'boolean
+  :set (lambda (sym val)
+	 (if erc-track-mode
+	     (progn
+	       (erc-track-disable)
+	       (set sym val)
+	       (erc-track-enable))
+	   (set sym val))))
 
 ;;; Visibility
 
@@ -546,7 +646,7 @@ only consider active buffers visible.")
 
 (defun erc-buffer-visible (buffer)
   "Return non-nil when the buffer is visible."
-  (if erc-track-when-inactive-mode
+  (if erc-track-when-inactive
       (when erc-buffer-activity; could be nil
 	(and (get-buffer-window buffer erc-track-visibility)
 	     (<= (erc-time-diff erc-buffer-activity (erc-current-time))
@@ -816,7 +916,9 @@ relative to `erc-track-switch-direction'"
 switch back to the last non-ERC buffer visited.  Next is defined by
 `erc-track-switch-direction', a negative argument will reverse this."
   (interactive "p")
-  (when erc-track-mode
+  (if (not erc-track-mode)
+      (message (concat "Enable the ERC track module if you want to use the"
+		       " tracking minor mode"))
     (cond (erc-modified-channels-alist
 	   ;; if we're not in erc-mode, set this buffer to return to
 	   (unless (eq major-mode 'erc-mode)
@@ -829,12 +931,6 @@ switch back to the last non-ERC buffer visited.  Next is defined by
 		(buffer-live-p erc-track-last-non-erc-buffer))
 	   (switch-to-buffer erc-track-last-non-erc-buffer)))))
 
-;; These bindings are global, because they pop us from any other
-;; buffer to an active ERC buffer!
-
-(global-set-key (kbd "C-c C-@") 'erc-track-switch-buffer)
-(global-set-key (kbd "C-c C-SPC") 'erc-track-switch-buffer)
-
 (provide 'erc-track)
 
 ;;; erc-track.el ends here
diff --git a/erc-viper.el b/erc-viper.el
index 4318bbe..da83f44 100644
--- a/erc-viper.el
+++ b/erc-viper.el
@@ -1,6 +1,6 @@
 ;;; erc-viper.el --- Viper compatibility hacks for ERC
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 
 ;; Author: Edward O'Connor <ted@oconnor.cx>
 ;; Keywords: emulation
diff --git a/erc.el b/erc.el
index 2d07a6d..83b23b4 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.2 (pre-release)"
+(defconst erc-version-string "Version 5.2"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -1905,9 +1905,7 @@ removed from the list will be disabled."
 
 (defun erc-open (&optional server port nick full-name
 			   connect passwd tgt-list channel process)
-  "ERC is a powerful, modular, and extensible IRC client.
-
-Connect to SERVER on PORT as NICK with FULL-NAME.
+  "Connect to SERVER on PORT as NICK with FULL-NAME.
 
 If CONNECT is non-nil, connect to the server.  Otherwise assume
 already connected and just create a separate buffer for the new
@@ -2121,8 +2119,12 @@ functions in here get called with the parameters SERVER and NICK."
 		  (nick   (erc-compute-nick))
 		  password
 		  (full-name (erc-compute-full-name)))
-  "Select connection parameters and run ERC.
-Non-interactively, it takes keyword arguments
+  "ERC is a powerful, modular, and extensible IRC client.
+This function is the main entry point for ERC.
+
+It permits you to select connection parameters, and then starts ERC.
+
+Non-interactively, it takes the keyword arguments
    (server (erc-compute-server))
    (port   (erc-compute-port))
    (nick   (erc-compute-nick))
@@ -2133,12 +2135,13 @@ That is, if called with
 
    (erc :server \"irc.freenode.net\" :full-name \"Harry S Truman\")
 
-server and full-name will be set to those values, whereas
+then the server and full-name will be set to those values, whereas
 `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
 be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
   (erc-open server port nick full-name t password))
 
+;;;###autoload
 (defalias 'erc-select 'erc)
 
 (defun erc-ssl (&rest r)
@@ -2428,7 +2431,7 @@ See also `erc-format-message' and `erc-display-line'."
 
 This function relies on the erc-parsed text-property being
 present."
-  (let ((prop-val (get-text-property position 'erc-parsed)))
+  (let ((prop-val (erc-get-parsed-vector position)))
     (and prop-val (member (erc-response.command prop-val) list))))
 
 (defvar erc-send-input-line-function 'erc-send-input-line)
@@ -3751,7 +3754,7 @@ To change how this query window is displayed, use `let' to bind
     (erc-update-mode-line)
     buf))
 
-(defcustom erc-auto-query nil
+(defcustom erc-auto-query 'bury
   "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
@@ -5760,7 +5763,8 @@ Otherwise, use the `erc-header-line' face."
 
 (defcustom erc-common-server-suffixes
   '(("openprojects.net$" . "OPN")
-    ("freenode.net$" . "OPN"))
+    ("freenode.net$" . "freenode")
+    ("oftc.net$" . "OFTC"))
   "Alist of common server name suffixes.
 This variable is used in mode-line display to save screen
 real estate.  Set it to nil if you want to avoid changing
@@ -6260,8 +6264,7 @@ This function should be on `erc-kill-channel-hook'."
   (let ((parsed-posn (erc-find-parsed-property)))
     (put-text-property
      (point-min) (point-max)
-     'erc-parsed (when parsed-posn
-                   (get-text-property parsed-posn 'erc-parsed)))))
+     'erc-parsed (when parsed-posn (erc-get-parsed-vector parsed-posn)))))
 
 (defun erc-get-parsed-vector (point)
   "Return the whole parsed vector on POINT."
diff --git a/erc.texi b/erc.texi
index e99cbc8..9a03e07 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.2 (pre-release).
+This manual is for ERC version 5.2.
 
 Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
 
@@ -21,6 +21,9 @@ Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, Front-Cover texts, or Back-Cover Texts.
+
+All Emacs Lisp code contained in this document may be used, distributed,
+and modified without restriction.
 @end quotation
 @end copying
 
@@ -73,12 +76,16 @@ Obtaining ERC
 * Releases::                    Released versions of ERC.
 * Development::                 Latest unreleased development changes.
 
+Getting Started
+
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
+
 Advanced Usage
 
 * Connecting::                  Ways of connecting to an IRC server.
-* Options::                     Options that are available for ERC.
-* Tips and Tricks::             Ways of enhancing your ERC experience.
 * Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
 
 @end detailmenu
 @end menu
@@ -116,8 +123,17 @@ It comes with the following capabilities enabled by default.
 * Development::                 Latest unreleased development changes.
 @end menu
 
-These sections may be skipped if you are using the version of ERC that
-comes with Emacs.
+Note that some ERC files are not included with Emacs due to copyright or
+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}
+@end itemize
+
+The rest of this chapter may be skipped if you are using the version of
+ERC that comes with Emacs.
 
 @node Releases, Development, Obtaining ERC, Obtaining ERC
 @comment  node-name,  next,  previous,  up
@@ -136,7 +152,7 @@ available in the official Debian repository.
 
 @cindex releases, from source
 Alternatively, you can download the latest release from
-@uref{http://ftp.gnu.org/gnu/erc}.
+@uref{http://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
 
 @node Development,  , Releases, Obtaining ERC
 @comment  node-name,  next,  previous,  up
@@ -193,9 +209,9 @@ tla update
 
 @end enumerate
 
-If you are new to Arch and want to learn more about developing with it,
-you might find this tutorial helpful:
-@uref{http://www.mwolson.org/projects/ArchTutorial.html}.
+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.
 
 @subheading Development snapshots
 
@@ -266,8 +282,6 @@ locations that require this.
 @chapter Getting Started
 @cindex settings
 
-@c PRE5_2: Mention .ercrc.el
-
 To use ERC, add the directory containing its files to your
 @code{load-path} variable, in your @file{.emacs} file.  Then, load ERC
 itself.  An example follows.
@@ -279,20 +293,151 @@ itself.  An example follows.
 Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
 prompt for the server to connect to.
 
+If you want to place ERC settings in their own file, you can place them
+in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
+
+If you would rather use the Customize interface to change how ERC works,
+do @kbd{M-x customize-group RET erc RET}.  In particular, ERC comes with
+lots of modules that may be enabled or disabled; to select which ones
+you want, do @kbd{M-x customize-variable RET erc-modules RET}.
+
+@menu
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
+@end menu
+
+@node Sample Session, Special Features, Getting Started, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Sample Session
+
+This is an example ERC session which shows how to connect to the #emacs
+channel on Freenode.  Another IRC channel on Freenode that may be of
+interest is #erc, which is a channel where ERC users and developers hang
+out.
+
+@itemize @bullet
+
+@item Connect to Freenode
+
+Run @kbd{M-x erc}.  Use ``irc.freenode.net'' as the IRC server, ``6667''
+as the port, and choose a nickname.
+
+@item Get used to the interface
+
+Switch to the ``irc.freenode.net:6667'' buffer, if you're not already
+there.  You will see first some messages about checking for ident, and
+then a bunch of other messages that describe the current IRC server.
+
+@item Join the #emacs channel
+
+In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}.  Depending
+on how you've set up ERC, either a new buffer for ``#emacs'' will be
+displayed, or a new buffer called ``#emacs'' will be created in the
+background.  If the latter, switch to the ``#emacs'' buffer.  You will
+see the channel topic and a list of the people who are currently on the
+channel.
+
+@item Register your nickname with Freenode
+
+If you would like to be able to talk with people privately on the
+Freenode network, you will have to ``register'' your nickname.  To do
+so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg
+NickServ register <password>'', replacing ``<password>'' with your
+desired password.  It should tell you that the operation was successful.
+
+@item Talk to people in the channel
+
+If you switch back to the ``#emacs'' buffer, you can type a message, and
+everyone on the channel will see it.
+
+@item Open a query buffer to talk to someone
+
+If you want to talk with someone in private (this should usually not be
+done for technical help, only for personal questions), type ``/query
+<nick>'', replacing ``<nick>'' with the nickname of the person you would
+like to talk to.  Depending on how ERC is set up, you will either see a
+new buffer with the name of the person, or such a buffer will be created
+in the background and you will have to switch to it.  Begin typing
+messages, and you will be able to have a conversation.
+
+Note that if the other person is not registered, you will not be able to
+talk with them.
+
+@end itemize
+
+@node Special Features, , Sample Session, Getting Started
+@comment  node-name,  next,  previous,  up
+@section Special Features
+
+ERC has some features that distinguish it from some IRC clients.
+
+@itemize @bullet
+
+@item multiple channels and multiple servers
+
+Every channel is put in a separate buffer.  Several IRC servers may be
+connected to at the same time.
+
+@cindex query buffers
+@item private message separation
+
+Private conversations are treated as channels, and are put into separate
+buffers in Emacs.  We call these ``query buffers''.
+
+@item highlighting
+
+Some occurences of words can be highlighted, which makes it easier to
+track different kinds of conversations.
+
+@item notification
+
+ERC can notify you that certain users are online.
+
+@item channel tracking
+
+Channels can be hidden and conversation continue in the background.  You
+are notified when something is said in such a channel that is not
+currently visible.  This makes it easy to get Real Work done while still
+maintaining an IRC presence.
+
+@item nick completion
+
+ERC can complete words upon hitting @kbd{TAB}, which eases the writing
+of nicknames in messages.
+
+@cindex history ring
+@item history
+
+Past actions are kept in history rings for future use.  To navigate a
+history ring, hit @kbd{M-p} to go backwards and @kbd{M-n} to go
+forwards.
+
+@item multiple languages
+
+Different channels and servers may have different language encodings.
+
+In addition, it is possible to translate the messages that ERC uses into
+multiple languages.  Please contact the developers of ERC at
+@email{erc-discuss@@gnu.org} if you are interested in helping with the
+translation effort.
+
+@item user scripting
+
+Users can load scripts (e.g. auto greeting scripts) when ERC starts up.
+
+It is also possible to make custom IRC commands, if you know a little
+Emacs Lisp.  Just make an Emacs Lisp function and call it
+@code{erc-cmd-NEWCOMMAND}, where @code{NEWCOMMAND} is the name of the
+new command in capital letters.
+
+@item auto reconnect
+
 If the connection goes away at some point, ERC will try to reconnect
 automatically.  If it fails to reconnect, and you want to try to
 manually reestablish the connection at some later point, switch to an
-ERC buffer and run the /RECONNECT command.
+ERC  buffer and run the @code{/RECONNECT} command.
 
-@c PRE5_2: Sample session, including:
-@c - connect to Freenode
-@c - /join #emacs
-@c - see messages flying past, point out topic lines, messages, channel
-@c   members
-@c - identifying your nick with NickServ (most IRC servers have this)
-@c - talking to the channel
-@c - open a /query buffer to talk to someone (must identify first in
-@c   FreeNode)
+@end itemize
 
 
 @node Keystroke Summary, Modules, Getting Started, Top
@@ -518,7 +663,7 @@ Translate morse code in messages
 
 @end table
 
-@c PRE5_2: Document every option of every module in its own subnode
+@c PRE5_3: Document every option of every module in its own subnode
 
 
 @node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
@@ -528,12 +673,11 @@ Translate morse code in messages
 
 @menu
 * Connecting::                  Ways of connecting to an IRC server.
-* Options::                     Options that are available for ERC.
-* Tips and Tricks::             Ways of enhancing your ERC experience.
 * Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
 @end menu
 
-@node Connecting, Options, Advanced Usage, Advanced Usage
+@node Connecting, Sample Configuration, Advanced Usage, Advanced Usage
 @comment  node-name,  next,  previous,  up
 @section Connecting to an IRC Server
 @cindex connecting
@@ -667,33 +811,97 @@ User full name.
 This can be either a string or a function to call.
 @end defopt
 
-@node Options, Tips and Tricks, Connecting, Advanced Usage
+@node Sample Configuration, Options, Connecting, Advanced Usage
 @comment  node-name,  next,  previous,  up
-@section Options
-@cindex options
+@section Sample Configuration
+@cindex configuration, sample
 
-@c PRE5_2: (Node) Document every ERC option (module options go in
-@c previous chapter)
+Here is an example of configuration settings for ERC.  This can go into
+your Emacs configuration file.  Everything after the @code{(require
+'erc)} command can optionally go into @file{~/.emacs.d/.ercrc.el}.
 
-This section has not yet been written.
+@lisp
+;;; Sample ERC configuration
 
-@node Tips and Tricks, Sample Configuration, Options, Advanced Usage
-@comment  node-name,  next,  previous,  up
-@section Tips and Tricks
-@cindex tips and tricks
+;; Add the ERC directory to load path -- you don't need this if you are
+;; using the version of ERC that comes with Emacs
+(add-to-list 'load-path "~/elisp/erc")
 
-@c PRE5_2: (Node) Tips and tricks
+;; Load ERC
+(require 'erc)
 
-This section has not yet been written.
+;; Load authentication info from an external source.  Put sensitive
+;; passwords and the like in here.
+(load "~/.emacs.d/.erc-auth")
+
+;; This is an example of how to make a new command.  Type "/uptime" to
+;; use it.
+(defun erc-cmd-UPTIME (&rest ignore)
+  "Display the uptime of the system, as well as some load-related
+stuff, to the current ERC buffer."
+  (let ((uname-output
+         (replace-regexp-in-string
+          ", load average: " "] @{Load average@} ["
+          ;; Collapse spaces, remove
+          (replace-regexp-in-string
+           " +" " "
+           ;; Remove beginning and trailing whitespace
+           (replace-regexp-in-string
+            "^ +\\|[ \n]+$" ""
+            (shell-command-to-string "uptime"))))))
+    (erc-send-message
+     (concat "@{Uptime@} [" uname-output "]"))))
+
+;; This causes ERC to connect to the Freenode network upon hitting
+;; C-c e f.  Replace MYNICK with your IRC nick.
+(global-set-key "\C-cef" (lambda () (interactive)
+                           (erc :server "irc.freenode.net" :port "6667"
+                                :nick "MYNICK")))
+
+;; This causes ERC to connect to the IRC server on your own machine (if
+;; you have one) upon hitting C-c e b.  Replace MYNICK with your IRC
+;; nick.  Often, people like to run bitlbee (http://bitlbee.org/) as an
+;; AIM/Jabber/MSN to IRC gateway, so that they can use ERC to chat with
+;; people on those networks.
+(global-set-key "\C-ceb" (lambda () (interactive)
+                           (erc :server "localhost" :port "6667"
+                                :nick "MYNICK")))
+
+;; Make C-c RET (or C-c C-RET) send messages instead of RET. This has
+;; been commented out to avoid confusing new users.
+;; (define-key erc-mode-map (kbd "RET") nil)
+;; (define-key erc-mode-map (kbd "C-c RET") 'erc-send-current-line)
+;; (define-key erc-mode-map (kbd "C-c C-RET") 'erc-send-current-line)
+
+;;; Options
+
+;; Join the #emacs and #erc channels whenever connecting to Freenode.
+(setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
+
+;; Interpret mIRC-style color commands in IRC chats
+(setq erc-interpret-mirc-color t)
+
+;; The following are commented out by default, but users of other
+;; non-Emacs IRC clients might find them useful.
+;; Kill buffers for channels after /part
+;; (setq erc-kill-buffer-on-part t)
+;; Kill buffers for private queries after quitting the server
+;; (setq erc-kill-queries-on-quit t)
+;; Kill buffers for server messages after quitting the server
+;; (setq erc-kill-server-buffer-on-quit t)
+@end lisp
 
-@node Sample Configuration, , Tips and Tricks, Advanced Usage
+@node Options, , Sample Configuration, Advanced Usage
 @comment  node-name,  next,  previous,  up
-@section Sample Configuration
-@cindex configuration, sample
+@section Options
+@cindex options
 
-@c PRE5_2: (Node) Sample configs
+@c PRE5_3: (Node) Document every ERC option (module options go in
+@c previous chapter)
 
-This section has not yet been written.
+This section has not yet been written.  For now, the easiest way to
+check out the available option for ERC is to do
+@kbd{M-x customize-group erc RET}.
 
 
 @node Getting Help and Reporting Bugs, History, Advanced Usage, Top



From MAILER-DAEMON Wed Oct 17 10:36:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0X-0003D1-3Z
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPR-0005BP-DY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPI-00055U-Ib
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPI-00055Q-FV
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
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@hcoop.net>) id 1IgvPG-00042j-4x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:52 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPE-0005Da-Ri
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPE-0006LR-Tj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:48 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPE-0006LR-Tj@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:48 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] erc-button: Add <backtab> key to
	erc-mode-map
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, 14 Oct 2007 04:53:15 -0000

commit 9987333960564e852c3581d13e9799feafa9325e
Merge: 218b8e4... d6f67f9... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Fri Mar 2 03:55:44 2007 +0000

    erc-button: Add <backtab> key to erc-mode-map
    
    * FOR-RELEASE: 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.
    git-archimport-id: erc@sv.gnu.org/erc--main--0--patch-112

diff --cc ChangeLog
index cb04e28,9f42cf8,cef3944..ce56964
--- a/ChangeLog
+++ b/ChangeLog
@@@@ -1,205 -1,937 -1,314 +1,212 @@@@
 - 2006-08-11  Michael Olson  <mwolson@gnu.org>
  -2006-01-28  Michael Olson  <mwolson@gnu.org>
 ++2007-03-02  Michael Olson  <mwolson@gnu.org>
   
 - 	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
 - 	avoid errors when inserting disconnect messages and other messages
 - 	that begin with newlines.
  -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
  -	Space out copyright years like the rest of Emacs.  Use the Emacs
  -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
  -	IRC Client", since there are now several IRC clients for Emacs.
 ++	* 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.
+++	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.
+  
 - 2006-08-07  Michael Olson  <mwolson@gnu.org>
  -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
  -	insert spaces instead of using special text property.
+++	* 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-backend.el (erc-process-sentinel-1): Use erc-display-message
 - 	in several places instead of inserting text.
 - 	(erc-process-sentinel): Move to the input-marker before removing
 - 	the prompt.
  -2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
 ++2007-02-15  Michael Olson  <mwolson@gnu.org>
   
 - 	* erc.el (erc-port): Fix customization options.
 - 	(erc-display-message): Handle null type explicitly.  Previously,
 - 	this was relying on a chance side-effect.  Cosmetic indentation
 - 	tweak.
 - 	(english): Add 'finished and 'terminated entries to the catalog.
 - 	Add initial and terminal newlines to 'disconnected and
 - 	'disconnected-noreconnect entries.  Avoid long lines.
 - 	(erc-cmd-QUIT): Bind the current erc-server-process to
 - 	server-proc.  If the IRC server responds quickly, it is possible
 - 	for the connection to close, and hence server buffer to be killed,
 - 	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
 - 	problem.
  -	* erc.el (erc-format-message): More `cl' breakage; don't use
  -	`oddp'.
 ++	* CREDITS: Update.
   
 - 2006-08-06  Michael Olson  <mwolson@gnu.org>
  -2006-01-27  Michael Olson  <mwolson@gnu.org>
 ++	* 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-backend.el (erc-server-send-queue): Update from Circe
 - 	version of this function.
 - 	(erc-server-ping-timer-alist): New variable that keeps track of
 - 	ping timers according to their associated server.
 - 	(erc-server-last-received-time): New variable that specifies the
 - 	time of the last message we received from the server.  This is
 - 	used to detect hung processes.
 - 	(erc-server-send-ping): New function that sends a ping to the IRC
 - 	process corresponding with the given buffer.  Split from
 - 	erc-server-setup-periodical-ping.  If the server buffer no longer
 - 	exists, cancel the timer.  If the server process has not given us
 - 	a message, including PING responses, since the last PING, kill it.
 - 	This is necessary to deal with some aberrant freenode behavior.
 - 	Idea taken from rcirc.
 - 	(erc-server-setup-periodical-ping): Rename from
 - 	erc-server-setup-periodical-server-ping.
 - 	(erc-server-filter-function): Use erc-current-time instead of
 - 	current-time.
  -	* debian/changelog: Update for new release.
 ++	* 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.
   
 - 	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 - 	multi-tty Emacs.
 - 	(erc-select-startup-file): Fix bug introduced by recent change.
 - 	(erc-cmd-QUIT): If the IRC process has not terminated itself
 - 	within 4 seconds of completing our quit-hook, kill it manually.
 - 	Freenode in particular needs this.
 - 	(erc-connection-established): Use erc-server-setup-periodical-ping
 - 	instead of erc-server-setup-periodical-server-ping.
  -	* debian/control (Description): Update.
 ++2007-02-15  Vivek Dasmohapatra  <vivek@etla.org>
   
 - 2006-08-05  Michael Olson  <mwolson@gnu.org>
  -	* debian/rules: Concatenate ChangeLog for 2005.
 ++	* erc.el (erc-cmd-RECONNECT): Kill old process if it is still
 ++	alive.
 ++	(erc-message-english-PART): Properly escape "%" characters in
 ++	reason.
   
 - 	* erc-log.el (erc-log-standardize-name): New function that returns
 - 	a filename that is safe for use for a log file.
 - 	(erc-current-logfile): Use it.
  -	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
  -	(debrelease, release): Copy images directory.
 ++	* 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.
   
 - 	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 - 	since that is a fairly standard directory.
 - 	(erc-select-startup-file): Re-write to use
 - 	convert-standard-filename, which will ensure that MS-DOS systems
 - 	look for the _ercrc.el file.
  -	* NEWS: Spelling fixes.  Add items for recent changes.
 ++2007-02-07  Diane Murray  <disumu@x3y2z1.net>
   
 - 2006-08-02  Michael Olson  <mwolson@gnu.org>
  -	* erc.el (erc): Move call to erc-update-modules before the call to
  -	erc-mode.  This should fix a timestamp display issue.
  -	(erc-version-string): Release ERC 5.1.
 ++	* 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.
   
 - 	* erc.el (erc-version-string): Release ERC 5.1.4.
  -2006-01-26  Michael Olson  <mwolson@gnu.org>
 ++2007-01-25  Diane Murray  <disumu@x3y2z1.net>
   
 - 	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
  -	* erc-stamp.el (erc-insert-aligned): New function that inserts
  -	text in an perfectly-aligned way relative to the right margin.  It
  -	only works well with Emacs22.  A sane fallback is provided for
  -	other versions of Emacs.
  -	(erc-insert-timestamp-right): Use the new function.
 ++	* erc-networks.el (erc-server-alist): Removed SSL server for now
 ++	since `erc-server-select' doesn't know to use `erc-ssl'.
   
 - 	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 - 	to the wrong buffer.  Thanks to offby1 for the report.
  -2006-01-25  Edward O'Connor  <ted@oconnor.cx>
 ++	* erc-networks.el (erc-server-alist, erc-networks-alist): Added
 ++	definitions for oftc.net.
   
 - 	* erc-backend.el (erc-coding-system-for-target): Handle case where
 - 	target is nil.  Thanks to Kai Fan for the patch.
  -	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
  -	before `erc-match-mode'.
 ++	* erc-services.el (erc-nickserv-alist): Fixed OFTC message regexp.
   
 - 2006-07-29  Michael Olson  <mwolson@gnu.org>
  -	* erc-match.el (match): Append `erc-match-message' to
  -	`erc-insert-modify-hook'.
 ++2007-01-22  Michael Olson  <mwolson@gnu.org>
   
 - 	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 - 	buffer.  It will be saved automatically killed.  Thanks to Johan
 - 	Bockgård and Tassilo Horn for pointing this out.
  -2006-01-25  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.
   
 - 2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
  -	* FOR-RELEASE: Mark last release requirement as done.
 ++	* 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.
   
 - 	* erc.el (define-erc-module): Make find-function and find-variable
 - 	find the names constructed by `define-erc-module' in Emacs 22.
  -	* Makefile (realclean, distclean): Remove docs.
 ++2007-01-21  Michael Olson  <mwolson@gnu.org>
   
 - 2006-07-14  Michael Olson  <mwolson@gnu.org>
  -	* erc.texi: Take care of all pre-5.1 items.
 ++	* 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.
   
 - 	* erc-log.el (log): Make sure that we enable logging on
 - 	already-opened buffers as well, in case the user toggles this
 - 	module after loading ERC.  Also be sure to remove logging ability
 - 	from all ERC buffers when the module is disabled.
 - 	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 - 	the empty string.  This should fix some errors that occur when
 - 	quitting Emacs without first killing all ERC buffers.
 - 	(erc-log-disable-logging): New function that removes the logging
 - 	ability from the current buffer.
  -	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
  -	`process-send-string' in `condition-case' to avoid an error when
  -	quitting ERC.
 ++2007-01-19  Michael Olson  <mwolson@gnu.org>
   
 - 	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
  -	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
  -	variable-width characters in the timestamp and on the same line.
  -	The latter is a kludge, but it seems to work with most of the
  -	input I've thrown at it so far.  It's certainly better than going
  -	past the end of line consistently when we have variable-width
  -	characters on the same line.  When `erc-timestamp-intangible' is
  -	non-nil, add intangible properties to the whitespace as well, so
  -	that hitting <end> does what you'd expect.
 ++	* erc.texi (Modules): Document new menu module.  Thanks to Leo
 ++	for noticing.
   
 - 2006-07-12  Michael Olson  <mwolson@gnu.org>
  -	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
  -	this to only use boolean values for `erc-flood-protect'.  Update
 ++2007-01-16  Diane Murray  <disumu@x3y2z1.net>
  +
 - 	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 - 	than call toggle-read-only.
 ++	* 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'.
  +
 - 	* Makefile (debrelease-mwolson): Remove and consolidate with the
 - 	`debrelease' target.
 - 	(debrevision): Rename from `debrevision-mwolson'.
 ++	* erc.el (erc-restore-text-properties): Moved here from
 ++	erc-fill.el since it could be useful in general.
  +
 - 	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
 - 	add autoload cookie.
 ++	* erc-fill.el (erc-restore-text-properties): Removed.
  +
 - 2006-07-09  Michael Olson  <mwolson@gnu.org>
 ++2007-01-13  Michael Olson  <mwolson@gnu.org>
  +
 - 	* erc.el (erc-version-string): Release ERC 5.1.3.
 ++	* 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, Makefile, NEWS: Update for the 5.1.3 release.
 ++	* erc.texi (Modules): Document erc-capab-identify.
  +
 - 	* servers.pl: Add copyright notice.
 ++2007-01-11  Diane Murray  <disumu@x3y2z1.net>
  +
 - 	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 - 	from being set automatically away and current buffer is not an ERC
 - 	buffer.
 ++	* erc.el (erc-find-parsed-property): Moved here from erc-track.el
 ++	since it can be useful in general.
  +
 - 	* erc-identd.el: Fix compiler error.
 ++	* erc-track.el (erc-find-parsed-property): Removed.
  +
 - 	* erc.texi (Development): Use @subheading instead of @subsection.
 - 	(Advanced Usage): Add menu.
 - 	(Connecting): Fully document how to connect to an IRC server.
 - 	(Options, Tips and Tricks, Sample Configuration): New unwritten
 - 	sections.
 ++	* erc-capab.el (erc-capab-find-parsed): Removed.
 ++	(erc-capab-identify-add-prefix): Use `erc-find-parsed-property'.
  +
 - 	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 - 	(erc-user-full-name, erc-password): Docfixes and customization
 - 	interface tweaks.
 - 	(erc-try-new-nick-p): Rename from
 - 	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 - 	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 - 	of `erc-nick-uniquifier', in case someone wants multiple
 - 	characters.
 - 	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 - 	(erc-compute-port): Docfixes.
 ++	* 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.
  +
 - 	* FOR-RELEASE: Put in future-first order.
 ++	* erc-menu.el (erc-menu-definition): Put items specific to
 ++	channels in a "Current channel" submenu.
  +
 - 	* erc-log.el (log): Move all add-hook calls here, rather than
 - 	executing them immediately, and also cause them to be un-hooked
 - 	when the module is removed.
 - 	(erc-save-buffer-on-part): Move next to
 - 	`erc-save-queries-on-quit'.
 - 	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 - 	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 - 	nil.  This makes things fast, but reasonably failsafe, by default.
 ++	* erc-backend.el (321, 323): Display channel list in server buffer
 ++	when not using the channel list module.
  +
 - 2006-07-08  Michael Olson  <mwolson@gnu.org>
 ++	* 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.
  +
 - 	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 - 	default, since most IRC clients don't do this.
 - 	(erc-log-write-after-send): New option that determines whether the
 - 	log file will be written to after every sent message.
 - 	(erc-log-write-after-insert): New option that determines whether
 - 	the log file will be written to when new text is added to a logged
 - 	ERC buffer.
 - 	(log): Use the aforementioned options.
 ++2007-01-11  Michael Olson  <mwolson@gnu.org>
  +
 - 	* erc.texi (Modules): Document the "completion" module.
 - 
 - 	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 - 	have a nil element in the list when ignore-self is non-nil.
 - 
 - 2006-07-05  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc-modules): Use `set' instead of `set-default', since
 - 	this setting should never be buffer-local.  Add the `list' and
 - 	`page' modules to the list.
 - 
 - 	* erc.texi (Modules): Add entries for `list' and `page' modules.
 - 	Change "spell" to "spelling".
 - 	(History): Use past tense throughout.
 - 
 - 2006-07-02  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 - 	can happen when doing /PART.
 - 
 - 	* erc.el (erc-quit-reason-various-alist)
 - 	(erc-part-reason-various-alist): In the example, use "^$" as an
 - 	example, since "" matches anything.
 - 	(erc-quit-reason-various, erc-part-reason-various): If no argument
 - 	is given, and no matches are found, use our default reason instead
 - 	of "nil".
 - 
 - 2006-07-01  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-identd.el (erc-identd-start): XEmacs defines neither
 - 	`make-network-process' nor `open-network-stream-server', so just
 - 	fail silently.
 - 
 - 2006-06-30  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* HISTORY: Update.
 - 
 - 	* erc.texi (Modules): Mention identd.
 - 	(Releases): Update mailing list address and download location.
 - 	(Development): Refactor.  Provide updated directions for Arch.
 - 	Make URLs clickable.
 - 	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 - 	(Getting Started): Give simpler example.  We do not need to
 - 	explicitly load every module.
 - 	(History): Update.
 - 
 - 	* erc-autoaway.el, erc-autojoin.el, erc-backend.el, erc-bbdb.el:
 - 	erc-button.el, erc-chess.el, erc-compat.el, erc-complete.el:
 - 	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 - 	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 - 	erc-nets.el, erc-netsplit.el, erc-nicklist.el, erc-nickserv.el:
 - 	erc-pcomplete.el, erc-replace.el, erc-ring.el, erc-speedbar.el:
 - 	erc-spelling.el, erc-stamp.el, erc-track.el, erc.el: Remove
 - 	version strings.
 - 
 - 	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 - 	module versions anymore.
 - 	(erc-version-modules): Remove, since we do not use this function
 - 	anymore.
 - 	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 - 	was only useful back when ERC consisted of one file.
 - 	(erc-modules): Add line for identd.
 - 	(erc-get-channel-mode-from-keypress): Typo fix.
 - 
 - 	* erc-imenu.el: Remove unnecessary lines in header.
 - 
 - 	* erc-goodies.el (erc-handle-irc-url): Docfix.
 - 
 - 	* erc-identd.el: Define an ERC module for this.
 - 	(erc-identd-start): Don't create a process buffer if possible.
 - 	Otherwise, use conventional hidden names for process buffers.
 - 
 - 2006-06-29  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-backend.el (erc-coding-system-for-target): Match
 - 	case-insensitively.  Use a pattern match instead of `assoc', as
 - 	per the documentation for `erc-encoding-coding-alist'.
 - 
 - 	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 - 
 - 2006-06-27  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el: Update maintainer information and URLs.
 - 
 - 2006-06-21  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* Makefile (upload): Make this work with the GNU upload system.
 - 
 - 2006-06-14  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc-active-buffer): If the active buffer has been
 - 	deleted, default to the server buffer.
 - 	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 - 	control really toggle, not unconditionally turn off.
 - 
 - 2006-06-12  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* NEWS: Add items since the 5.1.2 release.
 - 
 - 	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 - 	indicates whether the current away status was caused by this
 - 	module.
 - 	(erc-autoaway-set-back): Only set back if this module set the user
 - 	away.
 - 	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 - 	(erc-autoaway-reset-indicators): New function that resets some
 - 	indicators when the user is no longer away.
 - 	(autoaway): Add the above function to the 305 hook.
 - 
 - 2006-06-05  Romain Francoise  <romain@orebokech.com>
 - 
 - 	* erc.texi (History): Fix various typos.
 - 
 - 2006-06-04  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 - 	definition of the autoaway module.
 - 	(autoaway): Don't do anything if erc-autoaway-idle-method is
 - 	unbound.  This prevents an error on startup.
 - 
 - 2006-06-03  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 - 	(erc-autoaway-idle-method): Renamed from
 - 	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 - 	how to do this, so it's best to make this take symbol values.
 - 	Improve documentation.  Remove warning against Emacs idle-time;
 - 	the point is moot now that we get user idle time via a different
 - 	method.  Make sure we disable and re-enable the module when
 - 	changing this value.
 - 	(autoaway): Conditionalize on the above option.  If using the idle
 - 	timer or user idle methods, don't add anything to the
 - 	send-completed or server-001 hooks, since it is unnecessary.
 - 	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 - 	Docfix.
 - 	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 - 	(erc-autoaway-reset-idle-irc): Renamed from
 - 	`erc-autoaway-reset-idle'.  Don't pass line to
 - 	`erc-autoaway-set-away', since it is not used.
 - 	(erc-autoaway-reset-idle-user): New function that resets the idle
 - 	state for user idle time.
 - 	(erc-autoaway-set-back): Remove line argument, since it is not
 - 	used.
 - 
 - 	* Makefile (upload): Make this work for Savannah uploads.
 - 
 - 	* AUTHORS: Update for Savannah move.  No old entries have been
 - 	removed, in case people have not registered yet on Savannah.
 - 
 - 2006-06-01  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 - 	this are live.
 - 
 - 2006-05-15  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* README: Add License information.  Permit images to be used,
 - 	distributed, and modified without restriction.
 - 
 - 2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 - 
 - 	* erc-goodies.el: (erc-handle-irc-url): New function, suitable as
 - 	a value for `url-irc-function'.
 - 
 - 2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 - 	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 - 	current nickname.  Doc fix.
 - 	(pcomplete/erc-mode/complete-command): Don't complete the current
 - 	nickname.
 - 
 - 2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 - 	build date as it's shown in `emacs-version'.
 - 
 - 	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 - 	with the same face property as the previous character.
 - 
 - 2006-04-02  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 - 	erc.el: Make sure to include a newline inside of negated classes,
 - 	so that a newline is not matched.
 - 
 - 2006-04-01  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-backend.el (erc-server-connect-function): Don't try to
 - 	detect the existence of the `open-network-stream-nowait' function,
 - 	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 - 
 - 2006-03-27  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.texi: Update direntry.  Remove unneeded local variables.
 - 
 - 2006-03-26  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc-header-line): New face that will be used to colorize
 - 	the text of the header-line, provided that
 - 	`erc-header-line-face-method' is non-nil.
 - 	(erc-prompt-face): Fix formatting.
 - 	(erc-header-line-face-method): New option that determines the
 - 	method used for colorizing header-line text.  This may be a
 - 	function, nil, or non-nil.
 - 	(erc-update-mode-line-buffer): Use the aforementioned option and
 - 	face to colorize the header-line text, if that is what the user
 - 	wants.
 - 	(erc-send-input): If flood control is not activated, don't split
 - 	the input line.
 - 
 - 2006-03-25  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 - 	that fixes the case where there is no leading whitespace.  Only
 - 	remove the first space character, though.
 - 
 - 	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 - 	erc-identd-process is set properly.
 - 	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 - 	(erc-identd-start): Pass :host parameter so this works with Emacs
 - 	22.
 - 
 - 2006-03-21  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* CREDITS: Add Nelson Ferreira.  Change contact address.
 - 
 - 	* erc-bbdb.el: Install patch from Nelson Ferreira.
 - 	(erc-bbdb-electric-p): New option that indicates whether to make
 - 	the BBDB buffer electric.  Defaults to "not electric".
 - 	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
 - 
 - 2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc-button.el (erc-button-keymap): Use <backtab> rather than
 - 	<C-tab> for `erc-button-previous' as it is a more standard key
 - 	binding for this type of function.
 - 
 - 2006-02-19  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc-version-string): Release ERC 5.1.2.
 - 
 - 2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 - 	<C-tab>.
 - 	(erc-button-previous): New function.
 - 
 - 2006-02-15  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc): Move to the end of the buffer when a continued
 - 	session is detected.  Thanks to e1f and indio for the report and
 - 	testing a potential fix.
 - 
 - 2006-02-14  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* debian/changelog: Prepare a new Debian package.
 - 
 - 	* Makefile (debprepare): New rule that creates an ERC snapshot
 - 	directory for use in both new Debian releases and revisions for
 - 	Debian packages.
 - 	(debrelease, debrevision-mwolson): Use debprepare.
 - 
 - 	* NEWS: Bring up-to-date.
 - 
 - 	* erc-stamp.el (erc-insert-timestamp-right): For now, put
 - 	timestamps before rather than after erc-fill-column when
 - 	erc-timestamp-right-column is nil.  This way we won't surprise
 - 	anyone unpleasantly, or so it is hoped.
 - 
 - 2006-02-13  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 - 
 - 2006-02-11  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 - 	`erc-timestamp-right-align-by-pixel'.  Set the default based on
 - 	whether we are in Emacs 22, and using X.  Improve documentation.
 - 	(erc-insert-aligned): Remove calculation of offset, since
 - 	:align-to pos works after all.  Unlike the previous solution, this
 - 	one works when erc-stamp.el is compiled.
 - 	(erc-insert-timestamp-right): Don't add length of string, and then
 - 	later remove its displayed width.  This puts timestamps after
 - 	erc-fill-column when erc-timestamp-right-column is nil, rather
 - 	than before it.  It also fixes a subtle bug.  Remove use of
 - 	`current-window', since there is no variable by that name in
 - 	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
 - 	`erc-fill-column' is non-nil before using it.
 - 
 - 2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc-list.el: Define `list' module which sets the alias
 - 	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 - 	`erc-list-channels-simple' when disabled.
 - 	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 - 	(erc-list-channels-simple): New function.
 - 
 - 	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 - 	`capab-identify' description.  Moved customization options left in
 - 	source code.
 - 
 - 	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 - 
 - 	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 - 	before calling `with-current-buffer'.
 - 
 - 2006-02-10  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* Makefile (debbuild): Split from debrelease.
 - 	(debrevision-mwolson): New rule that causes a Debian revision to
 - 	be built.
 - 
 - 2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 - 	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 - 	(erc-version-string): Remove "(CVS)".
 - 	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
 - 	connections work as expected.  Connecting with `open-tls-stream'
 - 	only seems to work (if at all?) when using the tls.el located in
 - 	lisp/net/ in Emacs22.
 - 
 - 	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 - 	(erc-get-parsed-vector-type): Moved these functions to erc.el
 - 	since they can be useful outside of the text matching module.
 - 
 - 	* NEWS: Added tls.el -> ssl.el change.
 - 
 - 	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 - 	to "ERC".
 - 
 - 2006-02-07  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
 - 	the simpler `indent-to' function when
 - 	`erc-timestamp-right-align-by-pixel' is nil.
 - 	(erc-insert-timestamp-right): If the timestamp goes on the
 - 	following line, don't add timestamp properties to the spaces in
 - 	front of it.
 - 
 - 2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* FOR-RELEASE: Added two things to do before the next release of
 - 	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 - 	the `C-c C-SPC' and `C-c C-@' global keybindings.
 - 
 - 2006-02-05  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
 - 	directory correctly.
 - 
 - 	* debian/changelog: Update for 5.1.1 release.
 - 
 - 	* debian/control (Suggests): Suggest emacs-chess instead of
 - 	Recommending it.  Thanks to Era Eriksson for the report.
 - 
 - 	* debian/maint/postinst: Install the Info documentation.
 - 
 - 	* debian/maint/prerm: Handle removing of Info documentation.
 - 
 - 	* debian/rules (configure, configure-stamp, build, build-stamp):
 - 	Generate HTML and Info documentation.
 - 	(binary-erc): Install HTML and Info documentation.
 - 
 - 	* erc-spelling.el (erc-spelling-init): If
 - 	`erc-spelling-dictionaries' is nil, do not set
 - 	ispell-local-dictionary.  Before, it was being set to nil, which
 - 	was causing a long delay while the ispell process restarted.
 - 	(erc-spelling-unhighlight-word): New function that removes
 - 	flyspell properties from a spell-checked word.
 - 	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
 - 	that have '/' before them.
 - 
 - 2006-02-04  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* Makefile (VERSION): Update to 5.1.1.
 - 
 - 	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
 - 	that Emacs does in its NEWS file.
 - 
 - 	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 - 
 - 	* erc-complete.el (erc-nick-completion-exclude-myself)
 - 	(erc-try-complete-nick): Use better function for getting list of
 - 	channel users.
 - 
 - 	* erc-goodies.el: Docfix.
 - 
 - 	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 - 	being treated properly.
 - 
 - 	* erc.texi (History): Note that ERC is now included with Emacs.
 - 
 - 	* erc.el (erc-version-string): Release ERC 5.1.1.
 - 
 - 2006-01-31  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-stamp.el: Update copyright years.
 - 
 - 2006-01-30  Simon Josefsson  <jas@extundo.com>
 - 
 - 	* erc.el (erc-open-ssl-stream): Use tls.el.
 - 
 - 2006-01-30  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
 - 	that determines whether to use pixel values to align right
 - 	timestamps.  The default is not to do so, since it only works with
 - 	Emacs22 on X, and even then some people have trouble.
 - 	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 - 
 - 2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 - 
 - 	* erc-viper.el: Ensure we only alter Viper's configuration when
 - 	necessary, as Viper may already take ERC into account.
 - 
 - 2006-01-29  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
 - 	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
 - 	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 - 
 - 	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
 - 	variable.
 - 	(erc-speedbar-goto-buffer): Fix compiler warning.
 - 
 - 	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
 - 	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
 - 	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 - 	work without compiler warnings.
 - 
 - 	* man/erc.texi (Obtaining ERC, Installation): Note that these
 - 	sections may be skipped if using the version of ERC that comes
 - 	with Emacs.
 - 
 - 2006-01-28  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
 - 	guidelines.
 - 
 - 	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
 - 	the Emacs copyright statement.  Refer to ourselves as ERC rather
 - 	than "Emacs IRC Client", since there are now several IRC clients
 - 	for Emacs.
 - 
 - 	* erc-compat.el (erc-emacs-build-time): Define as a variable.
 - 
 - 	* erc-ibuffer.el: Require 'erc.
 - 
 - 	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
 - 	it exists.
 - 
 - 	* erc-stamp.el (erc-insert-aligned): Only use the special text
 - 	property when window-system is X.
 - 
 - 	* erc.texi (History): Note that ERC 5.1 is released.
 - 
 - 2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
 - 
 - 	* erc.el (erc-format-message): More `cl' breakage; don't use
 - 	`oddp'.
 - 
 - 2006-01-27  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* debian/changelog: Update for new release.
 - 
 - 	* debian/control (Description): Update.
 - 
 - 	* debian/rules: Concatenate ChangeLog for 2005.
 ++	* erc-bbdb.el (erc-bbdb-popup-type): Fix customization type and
 + 	documentation.
  -	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
  -	that any QUIT-related messages go there.
  -	(erc): Try to be more clever about re-using channel buffers when
  -	automatically re-connecting.  Thanks to e1f for noticing.
  -
  -2006-01-23  Michael Olson  <mwolson@gnu.org>
  -
  -	* ChangeLog.2005: Remove erroneous line.
  -
  -	* FOR-RELEASE: Make that the Makefile tweaking is complete.
  -	(NEWS): Mark as done.
  -
  -	* Makefile (MANUAL): New option indicating the name of the manual.
  -	(PREFIX, ELISPDIR, INFODIR): New options that specify the
  -	directories to install lisp code and info manuals to.  PREFIX is
  -	used only by ELISPDIR and INFODIR.
  -	(all): Call `lisp' and create the manual.
  -	(lisp): Compile lisp code.
  -	(%.info, %.html): New rules that make Info files and HTML files,
  -	respectively, from a TexInfo source.
  -	(doc): Create both the Info and HTML versions of the manual.  This
  -	is for the user -- we never call it automatically.
  -	(install-info): Install Info files.
  -	(install-bin): Install compiled and source Lisp files.
  -	(todo): Remove, since it seems pointless.
  -
  -	* NEWS: Update.
  -
  -	* README: Add Installation instructions.  Tweak layout.
  -
  -	* erc.texi: Work on some pre-5.1 items.
  -
  -	* erc-stamp.el, erc-track.el: Move some functions and options in
  -	order to get rid of a few compiler warnings.
  -
  -	* erc.el (erc-modules): Enable readonly by default.  This will
  -	prevent new users from accidentally removing old messages, which
  -	could be disconcerting.  Also enable stamp by default, since
  -	timestamps are a fairly standard feature among IRC clients.
  -
  -	* erc-button.el: Munge whitespace.
  -
  -	* erc-identd.el (erc-identd-start): Instead of throwing an error,
  -	just try to use the obsolete function.
  -
  -2006-01-22  Michael Olson  <mwolson@gnu.org>
  -
  -	* erc-backend.el (erc-decode-string-from-target): Make sure that
  -	we have a string as an argument.  If not, coerce it to the empty
  -	string.  Hopefully, this will work painlessly around an edge case
  -	related to quitting ERC around the same time a message comes in.
  -
  -2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
  -
  -	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
  -	`case'). Doc fixes.
  -	(erc-find-parsed-property): Simplify.
  -	(erc-track-get-active-buffer): Fix logic. Simplify.
  -	(erc-track-switch-buffer): Remove unused variable `dir'. Simplify.
  -
  -	* erc-speak.el: Doc fixes.
  -	(erc-speak-region): `propertize' --> `erc-propertize'.
  -
  -	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
  -	`erc-propertize'.
  -
  -	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
  -	account when wrapping URLs.
  -
  -	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
  -
  -	* erc-backend.el (define-erc-response-handler): Doc fix.
  -
  -2006-01-22  Michael Olson  <mwolson@gnu.org>
  -
  -	* erc.el (erc-update-modules): Use `require' instead of `load',
  -	but prevent it from causing errors, in order to preserve the
  -	previous behavior.
  -
  -2006-01-21  Michael Olson  <mwolson@gnu.org>
  -
  -	* FOR-RELEASE (Source): Mark cl task as done.
  -
  -	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
  -	generate-autoloads.
  -	(erc-auto.el, %.elc): Don't show command, just its output.
  -
  -	* NEWS: Add items from 2005-01-01 to 2005-08-13.
  -
  -	* debian/copyright (Copyright): Update.
  -
  -	* erc-auto.in (erc-generate-autoloads): Rename from
  -	generate-autoloads.
  -
  -	* erc.el, erc-autoaway.el, erc-backend.el: Use
  -	erc-server-process-alive instead of erc-process-alive.
  -
  -	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
  -	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
  -	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
  -	Use (eval-when-compile 'cl), so that compilation doesn't fail.
  -
  -	* erc-fill.el, erc-truncate.el: Whitespace munging.
  -
  -	* erc.el: Update copyright notice.  Remove eval-after-load code.
  -	(erc-with-buffer): Docfix.
  -	(erc-once-with-server-event, erc-once-with-server-event-global)
  -	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
  -	instead of gensym.
  -	(erc-banlist-update): Use erc-delete-if instead of delete-if.
  -	(erc): Call `erc-update-modules' here.
  -
  -	* erc-backend.el: Require 'erc-compat to minimize compiler
  -	warnings.
  -	(erc-decode-parsed-server-response): Docfix.
  -	(erc-server-process-alive): Move here from erc.el and rename from
  -	`erc-process-alive'.
  -	(erc-server-send, erc-remove-channel-users): Make sure process is
  -	alive before sending data to it.
  -
  -	* erc-bbdb.el: Update copyright years.
  -	(erc-bbdb-whois): Remove overexuberant comment.
  -
  -	* erc-button.el: Require erc-fill, since we make liberal use of
  -	`erc-fill-column'.
  -
  -	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
  -	functions, the latter of which provides an `assert' equivalent.
  -	(erc-remove-if-not): New function that provides a simple
  -	implementation of `remove-if-not'.
  -	(erc-gensym): New function that provides a simple implementation
  -	of `gensym'.
  -	(erc-delete-if): New function that provides a simple
  -	implementation of `delete-if'.
  -	(erc-member-if): New function that provides a simple
  -	implementation of `member-if'.
  -	(field-end): Remove this, since it is unused, and later versions
  -	of XEmacs have this function already.
  -	(erc-function-arglist): Moved here from erc.el.
  -	(erc-delete-dups): New compatibility function for dealing with
  -	XEmacs.
  -	(erc-subseq): New function copied from cl-extra.el.
  -
  -	* erc-dcc.el: Require pcomplete during compilation to avoid
  -	compiler warnings.
  -	(erc-unpack-int, erc-dcc-send-filter)
  -	(erc-dcc-get-filter): Use erc-assert instead of assert.
  -	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
  -	remove-if-not.
  -
  -	* erc-match.el (erc-log-matches): Fix compiler warning.
  -
  -	* erc-nicklist.el: Update copyright notice.
  -	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
  -	(erc-nicklist-bitlbee-connected-p): Remove.
  -	(erc-nicklist-insert-medium-name-or-icon): Accept channel
  -	argument.  Use it to determine whether we are on bitlbee.  Now
  -	that bitlbee names its channel "&bitlbee", this is trivial.
  -	(erc-nicklist-insert-contents): Pass channel as specified above.
  -	Don't try to determine whether we are on bitlbee here.
  -	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
  -	of remove-if-not.
  -	(erc-nicklist-search-for-nick): Use erc-member-if instead of
  -	member-if.
  -
  -	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
  -	partially-evaluated lambda expression instead of `delete' and
  -	`find'.
  -
  -	* erc-track.el: Use erc-assert.
  -	(erc-track-modified-channels): Remove use of `return'.
  -	(erc-track-modified-channels): Use `cadr' instead of `second',
  -	since otherwise we would need yet another eval-when-compile line.
  -
  -2006-01-19  Michael Olson  <mwolson@gnu.org>
  -
  -	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
  -	detect SIGPIPE, since it doesn't work.
  -
  -2006-01-10  Diane Murray  <disumu@x3y2z1.net>
  -
  -	* erc-spelling.el: Updated copyright years.
  -	(define-erc-module): Enable/disable `flyspell-mode' for all open
  -	ERC buffers as well.
  -	(erc-spelling-dictionaries): Reworded customize description.
  -
  -	* erc.el (erc-command-symbol): New function.
  -	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
  -	fixes a bug where "Symbol's function definition is void:
  -	erc-cmd-LIST" would be shown after typing /list at the prompt (the
  -	command was interned because erc-menu.el uses it and is enabled by
  -	default whereas erc-list.el is not).
  -
  -	* NEWS: Started a list of renamed variables.
  -
  -	* erc.el: Reworded the message sent when defining variable
  -	aliases.
  -	(erc-command-indicator-face): Doc fix.
  -	(erc-modules): Enable the match module by default which makes
  -	current nickname highlighting on as the default.
  -
  -	* erc-button.el: Updated copyright years.
  -	(erc-button): New face.
  -	(erc-button-face): Use `erc-button'.
  -	(erc-button-nickname-face): New customizable variable.
  -	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
  -	new argument to `erc-button-add-button'.
  -	(erc-button-add-button): Doc fix.  Added new argument to function
  -	definition, NICK-P.  If it's a nickname, use
  -	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
  -	makes channel tracking and buttons work better together when
  -	`erc-button-buttonize-nicks' is enabled, since there is a nickname
  -	on just about every line.
  -
  -	* erc-track.el (erc-track-use-faces): Doc fix.
  -	(erc-track-faces-priority-list): Added `erc-button' to list.
  -	(erc-track-priority-faces-only): Doc fix.
  -
  -2006-01-09  Diane Murray  <disumu@x3y2z1.net>
  -
  -	* erc-button.el (erc-button-url-regexp): Use `concat' so the
  -	regexp is not one long line.
  -	(erc-button-alist): Fixed so that customizing works correctly.
  -	Reorganized.  Removed lambda functions with more than two lines.
  -	Doc fix.
  -	(erc-button-describe-symbol, erc-button-beats-to-time): New
  -	functions.  Moved from `erc-button-alist'.
  -
  -2006-01-07  Michael Olson  <mwolson@gnu.org>
  -
  -	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
  -	process if a SIGPIPE occurs.  This happens when a new message
  -	comes in at the same time a /quit is requested.
  -	(erc-process-sentinel): Use string-match rather than string= to do
  -	these comparisons.  Matching literal newlines makes me nervous.
  -
  -	* erc-track.el (erc-track-remove-from-mode-line): Handle case
  -	where global-mode-string is not a list.  Emacs22 permits this.
  -
  -    Copyright (C) 2006 Free Software Foundation, Inc.
  +
 - 	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
 - 	(debrelease, release): Copy images directory.
 ++	* 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.
  +
 - 	* NEWS: Spelling fixes.  Add items for recent changes.
 ++2007-01-11  Diane Murray  <disumu@x3y2z1.net>
  +
 - 	* erc.el (erc): Move call to erc-update-modules before the call to
 - 	erc-mode.  This should fix a timestamp display issue.
 - 	(erc-version-string): Release ERC 5.1.
 ++	* NEWS: Added note for `erc-my-nick-face'.  Fixed capab-identify
 ++	wording.
  +
 - 2006-01-26  Michael Olson  <mwolson@gnu.org>
 ++2007-01-10  Diane Murray  <disumu@x3y2z1.net>
  +
 - 	* erc-stamp.el (erc-insert-aligned): New function that inserts
 - 	text in an perfectly-aligned way relative to the right margin.  It
 - 	only works well with Emacs22.  A sane fallback is provided for
 - 	other versions of Emacs.
 - 	(erc-insert-timestamp-right): Use the new function.
 ++	* 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.
  +
 - 2006-01-25  Edward O'Connor  <ted@oconnor.cx>
 ++2007-01-10  Michael Olson  <mwolson@gnu.org>
  +
 - 	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
 - 	before `erc-match-mode'.
 ++	* erc.el: Fix typo in url-irc-function instructions.
  +
 - 	* erc-match.el (match): Append `erc-match-message' to
 - 	`erc-insert-modify-hook'.
 ++2007-01-09  Michael Olson  <mwolson@gnu.org>
  +
 - 2006-01-25  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.
  +
 - 	* FOR-RELEASE: Mark last release requirement as done.
 ++2007-01-07  Michael Olson  <mwolson@gnu.org>
  +
 - 	* Makefile (realclean, distclean): Remove docs.
 ++	* erc.el (erc-modules): Add the menu module.  This should fix a
 ++	bug with incorrect ERC submenus being displayed.
  +
 - 	* erc.texi: Take care of all pre-5.1 items.
 ++	* erc-menu.el: Turn this into a module.
 ++	(erc-menu-add, erc-menu-remove): New functions that add and remove
 ++	the ERC menu.
  +
 - 	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
 - 	`process-send-string' in `condition-case' to avoid an error when
 - 	quitting ERC.
  +
 - 	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
 - 	variable-width characters in the timestamp and on the same line.
 - 	The latter is a kludge, but it seems to work with most of the
 - 	input I've thrown at it so far.  It's certainly better than going
 - 	past the end of line consistently when we have variable-width
 - 	characters on the same line.  When `erc-timestamp-intangible' is
 - 	non-nil, add intangible properties to the whitespace as well, so
 - 	that hitting <end> does what you'd expect.
 ++See ChangeLog.06 for earlier changes.
  +
 - 	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
 - 	this to only use boolean values for `erc-flood-protect'.  Update
 - 	documentation.
 - 	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
 - 	that any QUIT-related messages go there.
 - 	(erc): Try to be more clever about re-using channel buffers when
 - 	automatically re-connecting.  Thanks to e1f for noticing.
 - 
 - 2006-01-23  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* ChangeLog.2005: Remove erroneous line.
 - 
 - 	* FOR-RELEASE: Make that the Makefile tweaking is complete.
 - 	(NEWS): Mark as done.
 - 
 - 	* Makefile (MANUAL): New option indicating the name of the manual.
 - 	(PREFIX, ELISPDIR, INFODIR): New options that specify the
 - 	directories to install lisp code and info manuals to.  PREFIX is
 - 	used only by ELISPDIR and INFODIR.
 - 	(all): Call `lisp' and create the manual.
 - 	(lisp): Compile lisp code.
 - 	(%.info, %.html): New rules that make Info files and HTML files,
 - 	respectively, from a TexInfo source.
 - 	(doc): Create both the Info and HTML versions of the manual.  This
 - 	is for the user -- we never call it automatically.
 - 	(install-info): Install Info files.
 - 	(install-bin): Install compiled and source Lisp files.
 - 	(todo): Remove, since it seems pointless.
 - 
 - 	* NEWS: Update.
 - 
 - 	* README: Add Installation instructions.  Tweak layout.
 - 
 - 	* erc.texi: Work on some pre-5.1 items.
 - 
 - 	* erc-stamp.el, erc-track.el: Move some functions and options in
 - 	order to get rid of a few compiler warnings.
 - 
 - 	* erc.el (erc-modules): Enable readonly by default.  This will
 - 	prevent new users from accidentally removing old messages, which
 - 	could be disconcerting.  Also enable stamp by default, since
 - 	timestamps are a fairly standard feature among IRC clients.
 - 
 - 	* erc-button.el: Munge whitespace.
 - 
 - 	* erc-identd.el (erc-identd-start): Instead of throwing an error,
 - 	just try to use the obsolete function.
 - 
 - 2006-01-22  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-backend.el (erc-decode-string-from-target): Make sure that
 - 	we have a string as an argument.  If not, coerce it to the empty
 - 	string.  Hopefully, this will work painlessly around an edge case
 - 	related to quitting ERC around the same time a message comes in.
 - 
 - 2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
 - 
 - 	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
 - 	`case'). Doc fixes.
 - 	(erc-find-parsed-property): Simplify.
 - 	(erc-track-get-active-buffer): Fix logic. Simplify.
 - 	(erc-track-switch-buffer): Remove unused variable `dir'. Simplify.
 - 
 - 	* erc-speak.el: Doc fixes.
 - 	(erc-speak-region): `propertize' --> `erc-propertize'.
 - 
 - 	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
 - 	`erc-propertize'.
 - 
 - 	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
 - 	account when wrapping URLs.
 - 
 - 	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
 - 
 - 	* erc-backend.el (define-erc-response-handler): Doc fix.
 - 
 - 2006-01-22  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc.el (erc-update-modules): Use `require' instead of `load',
 - 	but prevent it from causing errors, in order to preserve the
 - 	previous behavior.
 - 
 - 2006-01-21  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* FOR-RELEASE (Source): Mark cl task as done.
 - 
 - 	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
 - 	generate-autoloads.
 - 	(erc-auto.el, %.elc): Don't show command, just its output.
 - 
 - 	* NEWS: Add items from 2005-01-01 to 2005-08-13.
 - 
 - 	* debian/copyright (Copyright): Update.
 - 
 - 	* erc-auto.in (erc-generate-autoloads): Rename from
 - 	generate-autoloads.
 - 
 - 	* erc.el, erc-autoaway.el, erc-backend.el: Use
 - 	erc-server-process-alive instead of erc-process-alive.
 - 
 - 	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
 - 	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
 - 	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
 - 	Use (eval-when-compile (require 'cl)), so that compilation doesn't
 - 	fail.
 - 
 - 	* erc-fill.el, erc-truncate.el: Whitespace munging.
 - 
 - 	* erc.el: Update copyright notice.  Remove eval-after-load code.
 - 	(erc-with-buffer): Docfix.
 - 	(erc-once-with-server-event, erc-once-with-server-event-global)
 - 	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
 - 	instead of gensym.
 - 	(erc-banlist-update): Use erc-delete-if instead of delete-if.
 - 	(erc): Call `erc-update-modules' here.
 - 
 - 	* erc-backend.el: Require 'erc-compat to minimize compiler
 - 	warnings.
 - 	(erc-decode-parsed-server-response): Docfix.
 - 	(erc-server-process-alive): Move here from erc.el and rename from
 - 	`erc-process-alive'.
 - 	(erc-server-send, erc-remove-channel-users): Make sure process is
 - 	alive before sending data to it.
 - 
 - 	* erc-bbdb.el: Update copyright years.
 - 	(erc-bbdb-whois): Remove overexuberant comment.
 - 
 - 	* erc-button.el: Require erc-fill, since we make liberal use of
 - 	`erc-fill-column'.
 - 
 - 	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
 - 	functions, the latter of which provides an `assert' equivalent.
 - 	(erc-remove-if-not): New function that provides a simple
 - 	implementation of `remove-if-not'.
 - 	(erc-gensym): New function that provides a simple implementation
 - 	of `gensym'.
 - 	(erc-delete-if): New function that provides a simple
 - 	implementation of `delete-if'.
 - 	(erc-member-if): New function that provides a simple
 - 	implementation of `member-if'.
 - 	(field-end): Remove this, since it is unused, and later versions
 - 	of XEmacs have this function already.
 - 	(erc-function-arglist): Moved here from erc.el.
 - 	(erc-delete-dups): New compatibility function for dealing with
 - 	XEmacs.
 - 	(erc-subseq): New function copied from cl-extra.el.
 - 
 - 	* erc-dcc.el: Require pcomplete during compilation to avoid
 - 	compiler warnings.
 - 	(erc-unpack-int, erc-dcc-send-filter)
 - 	(erc-dcc-get-filter): Use erc-assert instead of assert.
 - 	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
 - 	remove-if-not.
 - 
 - 	* erc-match.el (erc-log-matches): Fix compiler warning.
 - 
 - 	* erc-nicklist.el: Update copyright notice.
 - 	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
 - 	(erc-nicklist-bitlbee-connected-p): Remove.
 - 	(erc-nicklist-insert-medium-name-or-icon): Accept channel
 - 	argument.  Use it to determine whether we are on bitlbee.  Now
 - 	that bitlbee names its channel "&bitlbee", this is trivial.
 - 	(erc-nicklist-insert-contents): Pass channel as specified above.
 - 	Don't try to determine whether we are on bitlbee here.
 - 	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
 - 	of remove-if-not.
 - 	(erc-nicklist-search-for-nick): Use erc-member-if instead of
 - 	member-if.
 - 
 - 	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
 - 	partially-evaluated lambda expression instead of `delete' and
 - 	`find'.
 - 
 - 	* erc-track.el: Use erc-assert.
 - 	(erc-track-modified-channels): Remove use of `return'.
 - 	(erc-track-modified-channels): Use `cadr' instead of `second',
 - 	since otherwise we would need yet another eval-when-compile line.
 - 
 - 2006-01-19  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
 - 	detect SIGPIPE, since it doesn't work.
 - 
 - 2006-01-10  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc-spelling.el: Updated copyright years.
 - 	(define-erc-module): Enable/disable `flyspell-mode' for all open
 - 	ERC buffers as well.
 - 	(erc-spelling-dictionaries): Reworded customize description.
 - 
 - 	* erc.el (erc-command-symbol): New function.
 - 	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
 - 	fixes a bug where "Symbol's function definition is void:
 - 	erc-cmd-LIST" would be shown after typing /list at the prompt (the
 - 	command was interned because erc-menu.el uses it and is enabled by
 - 	default whereas erc-list.el is not).
 - 
 - 	* NEWS: Started a list of renamed variables.
 - 
 - 	* erc.el: Reworded the message sent when defining variable
 - 	aliases.
 - 	(erc-command-indicator-face): Doc fix.
 - 	(erc-modules): Enable the match module by default which makes
 - 	current nickname highlighting on as the default.
 - 
 - 	* erc-button.el: Updated copyright years.
 - 	(erc-button): New face.
 - 	(erc-button-face): Use `erc-button'.
 - 	(erc-button-nickname-face): New customizable variable.
 - 	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
 - 	new argument to `erc-button-add-button'.
 - 	(erc-button-add-button): Doc fix.  Added new argument to function
 - 	definition, NICK-P.  If it's a nickname, use
 - 	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
 - 	makes channel tracking and buttons work better together when
 - 	`erc-button-buttonize-nicks' is enabled, since there is a nickname
 - 	on just about every line.
 - 
 - 	* erc-track.el (erc-track-use-faces): Doc fix.
 - 	(erc-track-faces-priority-list): Added `erc-button' to list.
 - 	(erc-track-priority-faces-only): Doc fix.
 - 
 - 2006-01-09  Diane Murray  <disumu@x3y2z1.net>
 - 
 - 	* erc-button.el (erc-button-url-regexp): Use `concat' so the
 - 	regexp is not one long line.
 - 	(erc-button-alist): Fixed so that customizing works correctly.
 - 	Reorganized.  Removed lambda functions with more than two lines.
 - 	Doc fix.
 - 	(erc-button-describe-symbol, erc-button-beats-to-time): New
 - 	functions.  Moved from `erc-button-alist'.
 - 
 - 2006-01-07  Michael Olson  <mwolson@gnu.org>
 - 
 - 	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
 - 	process if a SIGPIPE occurs.  This happens when a new message
 - 	comes in at the same time a /quit is requested.
 - 	(erc-process-sentinel): Use string-match rather than string= to do
 - 	these comparisons.  Matching literal newlines makes me nervous.
 - 
 - 	* erc-track.el (erc-track-remove-from-mode-line): Handle case
 - 	where global-mode-string is not a list.  Emacs22 permits this.
 - 
 - See ChangeLog.2005 for earlier changes.
 ++    Copyright (C) 2007 Free Software Foundation, Inc.
 +   Copying and distribution of this file, with or without modification,
 +   are permitted provided the copyright notice and this notice are preserved.
  +
  +;; Local Variables:
  +;; coding: utf-8
 ++;; add-log-time-zone-rule: t
  +;; End:
  +
 - ;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
 ++;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496
diff --cc FOR-RELEASE
index 9b62b4e,c37607d,0000000..96b2426
mode 100644,100644,000000..100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@@@ -1,94 -1,84 -1,0 +1,96 @@@@
  +Tasks that need to be accomplished in order for a release to happen.
  +
 - * 5.2 release (future)
 ++* 5.3 release (future)
 ++
 ++** Source
 ++
 ++*** Make erc-backend not need to (require) any other part of ERC.
 ++This will hopefully increase the chance that it will be useful for
 ++other IRC clients, like Circe.
 ++
 ++* 5.2 release
  +
  +** Documentation
  +
  +*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
  +the release of 5.2.
  +
 - ** Source
+++*** Update NEWS for changes since 5.1.4.
+ +
 - *** Make erc-backend not need to (require) any other part of ERC.
 - This will hopefully increase the chance that it will be useful for
 - other IRC clients, like Circe.
 ++** Source
  +
  +*** Add binding for S-TAB (backtab) that moves backwards by link.
  +
 - * next Emacs release
 ++*** Merge filename changes from the 5.2 release branch into the
 ++erc--main--0 branch.
 ++
 ++* Emacs 22 release
  +
  +** Source
  +
 - *** Make M-x erc start a session.
 ++*** [DONE] Make M-x erc start a session.
  +New users never think of using M-x erc-select.
  +
  +*** Change keybinding definitions for `erc-track-switch-buffer'.
  +`C-c C-SPC' / `C-c C-@' is set as a global keybinding and is known to
  +conflict with rcirc, for example.  Would setting `erc-track-mode-map'
  +work?  Otherwise we could encourage people to use something like
  +`C-c e SPC' or `C-c c'.
  +
 ++*** Make a tarball with the modules that weren't included with
 ++Emacs 22 that can be downloaded from GNU's ftp server.
 ++
  +* 5.1 release
  +
  +** [DONE] Documentation
  +
  +*** ERC's manual needs collaborative effort.
  +Some conditions follow.
  +
  +Manual text can be based off of pages from EmacsWiki.org, but must be
  +rewritten.  As long as they're not too close to being word-for-word,
  +you should be okay.
  +
  +Contributors to the documentation must have assigned future copyright
  +for ERC or Emacs.  No separate manual assignment is needed in this
  +case.  If you haven't assigned future changes and would like to work
  +on the manual, contact mwolson@gnu.org.
  +
  +*** Search for "@c PRE5_1" to see what needs to be done before the
  +5.1 release.
  +
  +Please add your name in brackets after "PRE5_1" in the comment if you
  +wish to work an item in the short term.
  +
  +** [DONE] Makefile
  +
  +*** install target needed.
  +This could look at the following new variables.  ELISPDIR determines
  +where to install ERC.  INFODIR is where manual will be installed.
  +
  +PREFIX   = /usr/local
  +ELISPDIR = $(PREFIX)/share/emacs/site-lisp/erc
  +INFODIR  = $(PREFIX)/info
  +
  +*** install-info target needed.
  +Something like the following would work.
  +
  +%.info: %.texi
  +	makeinfo $<
  +
  +install-info: muse.info
  +	[ -d $(INFODIR) ] || install -d $(INFODIR)
  +	install -m 0644 muse.info $(INFODIR)/muse
  +	$(INSTALLINFO) $(INFODIR)/muse
  +
  +** [DONE] NEWS: Update for changes since 5.0.4.
  +
  +** [DONE] Source
  +
  +*** Remove dependency on cl package.
  +(eval-when-compile (require 'cl)) is acceptable.
  +
  +
  +Local variables:
  +mode: outline
  +end:
diff --cc erc-button.el
index 1fd224f,13e2a38,6d2cd82..435c72b
--- a/erc-button.el
+++ b/erc-button.el
@@@@ -56,10 -56,10 -56,10 +56,12 @@@@
     "This mode buttonizes all messages according to `erc-button-alist'."
     ((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-complete-functions 'erc-button-next)
+++   (add-hook 'erc-mode-hook 'erc-button-add-keys))
     ((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-complete-functions 'erc-button-next)
+++   (remove-hook 'erc-mode-hook 'erc-button-add-keys)))
   
   ;; Make XEmacs use `erc-button-face'.
   (when (featurep 'xemacs)
@@@@ -241,6 -241,6 -243,6 +243,16 @@@@ PAR is a number of a regexp grouping wh
   This syntax table should make all the legal nick characters word
   constituents.")
   
+++(defvar erc-button-keys-added nil
+++  "Internal variable used to keep track of whether we've added the
+++global-level ERC button keys yet.")
+++
+++(defun erc-button-add-keys ()
+++  "Add ERC mode-level button movement keys.  This is only done once."
+++  (unless erc-button-keys-added
+++    (define-key erc-mode-map (kbd "<backtab>") 'erc-button-previous)
+++    (setq erc-button-keys-added t)))
+++
   (defun erc-button-add-buttons ()
     "Find external references in the current buffer and make buttons of them.
   \"External references\" are things like URLs, as



From MAILER-DAEMON Wed Oct 17 10:36:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0Y-0003E5-EC
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvTm-0000Lw-Lj
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvTj-0000J3-9x
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:53:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPg-0005J4-9Y
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:16 -0400
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@hcoop.net>) id 1IgvPe-000498-Ex
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPd-0005O7-BY
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPd-00070Y-Dd
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:13 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPd-00070Y-Dd@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:49:13 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Merge from master
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, 14 Oct 2007 04:53:31 -0000

commit b6e412bc7dc65678b54fab1444b24d54789c4383
Merge: d8604c2... 66f1dd9...
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Fri Sep 7 22:45:33 2007 -0400

    Merge from master

diff --cc ChangeLog
index 1d8c1c4,7342a05..89e983c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -7,16 -7,120 +7,130 @@@
  
  	* 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-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el: Remove from the Emacs source tree.  This file
 +	is not release quality, and relies heavily on a module which
 +	cannot be distributed with ERC due to licensing reasons.
 +
+ 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-25  Glenn Morris  <rgm@gnu.org>
 +
 +	* Relicense all FSF files to GPLv3 or later.
 +
  2007-07-13  Michael Olson  <mwolson@gnu.org>
  
  	* erc-goodies.el (erc-get-bg-color-face, erc-get-fg-color-face):
@@@ -100,10 -233,30 +243,34 @@@
  	* erc-button.el (erc-button-url-regexp): Recognize parentheses as
  	part of URLs.  Thanks to Lawrence Mitchell for the fix.
  
+ 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-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.texi (Modules): Fix references to completion modules.
 +
+ 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
diff --cc erc.el
index 8cfafd7,e62df39..5199a2b
--- a/erc.el
+++ b/erc.el
@@@ -1896,7 -1908,7 +1906,7 @@@ removed from the list will be disabled.
  				  default-frame-alist)))
  	 (switch-to-buffer buffer)
  	 (when erc-frame-dedicated-flag
- 	   (set-window-dedicated-p (selected-window) t)))
 -	     (set-window-dedicated-p (selected-window) t))))
++	   (set-window-dedicated-p (selected-window) t))))
  	(t
  	 (if (active-minibuffer-window)
  	     (display-buffer buffer)
diff --cc erc.texi
index e4f1f85,a803ff1..2e23ade
--- a/erc.texi
+++ b/erc.texi
@@@ -1007,9 -1007,1141 +1007,13 @@@ our revision control system.  Our maili
  
  @end itemize
  
- @node GNU Free Documentation License, Concept Index, History, Top
- @unnumbered GNU Free Documentation License
+ @node Copying, GNU Free Documentation License, History, Top
+ @comment  node-name,  next,  previous,  up
 -@unnumbered GNU General Public License
 -@center Version 3, 29 June 2007
 -
 -@c This file is intended to be included in another file.
 -
 -@display
 -Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
 -
 -Everyone is permitted to copy and distribute verbatim copies of this
 -license document, but changing it is not allowed.
 -@end display
 -
 -@heading Preamble
 -
 -The GNU General Public License is a free, copyleft license for
 -software and other kinds of works.
 -
 -The licenses for most software and other practical works are designed
 -to take away your freedom to share and change the works.  By contrast,
 -the GNU General Public License is intended to guarantee your freedom
 -to share and change all versions of a program--to make sure it remains
 -free software for all its users.  We, the Free Software Foundation,
 -use the GNU General Public License for most of our software; it
 -applies also to any other work released this way by its authors.  You
 -can apply it to your programs, too.
 -
 -When we speak of free software, we are referring to freedom, not
 -price.  Our General Public Licenses are designed to make sure that you
 -have the freedom to distribute copies of free software (and charge for
 -them if you wish), that you receive source code or can get it if you
 -want it, that you can change the software or use pieces of it in new
 -free programs, and that you know you can do these things.
 -
 -To protect your rights, we need to prevent others from denying you
 -these rights or asking you to surrender the rights.  Therefore, you
 -have certain responsibilities if you distribute copies of the
 -software, or if you modify it: responsibilities to respect the freedom
 -of others.
 -
 -For example, if you distribute copies of such a program, whether
 -gratis or for a fee, you must pass on to the recipients the same
 -freedoms that you received.  You must make sure that they, too,
 -receive or can get the source code.  And you must show them these
 -terms so they know their rights.
 -
 -Developers that use the GNU GPL protect your rights with two steps:
 -(1) assert copyright on the software, and (2) offer you this License
 -giving you legal permission to copy, distribute and/or modify it.
 -
 -For the developers' and authors' protection, the GPL clearly explains
 -that there is no warranty for this free software.  For both users' and
 -authors' sake, the GPL requires that modified versions be marked as
 -changed, so that their problems will not be attributed erroneously to
 -authors of previous versions.
 -
 -Some devices are designed to deny users access to install or run
 -modified versions of the software inside them, although the
 -manufacturer can do so.  This is fundamentally incompatible with the
 -aim of protecting users' freedom to change the software.  The
 -systematic pattern of such abuse occurs in the area of products for
 -individuals to use, which is precisely where it is most unacceptable.
 -Therefore, we have designed this version of the GPL to prohibit the
 -practice for those products.  If such problems arise substantially in
 -other domains, we stand ready to extend this provision to those
 -domains in future versions of the GPL, as needed to protect the
 -freedom of users.
 -
 -Finally, every program is threatened constantly by software patents.
 -States should not allow patents to restrict development and use of
 -software on general-purpose computers, but in those that do, we wish
 -to avoid the special danger that patents applied to a free program
 -could make it effectively proprietary.  To prevent this, the GPL
 -assures that patents cannot be used to render the program non-free.
 -
 -The precise terms and conditions for copying, distribution and
 -modification follow.
 -
 -@heading TERMS AND CONDITIONS
 -
 -@enumerate 0
 -@item Definitions.
 -
 -``This License'' refers to version 3 of the GNU General Public License.
 -
 -``Copyright'' also means copyright-like laws that apply to other kinds
 -of works, such as semiconductor masks.
 -
 -``The Program'' refers to any copyrightable work licensed under this
 -License.  Each licensee is addressed as ``you''.  ``Licensees'' and
 -``recipients'' may be individuals or organizations.
 -
 -To ``modify'' a work means to copy from or adapt all or part of the work
 -in a fashion requiring copyright permission, other than the making of
 -an exact copy.  The resulting work is called a ``modified version'' of
 -the earlier work or a work ``based on'' the earlier work.
 -
 -A ``covered work'' means either the unmodified Program or a work based
 -on the Program.
 -
 -To ``propagate'' a work means to do anything with it that, without
 -permission, would make you directly or secondarily liable for
 -infringement under applicable copyright law, except executing it on a
 -computer or modifying a private copy.  Propagation includes copying,
 -distribution (with or without modification), making available to the
 -public, and in some countries other activities as well.
 -
 -To ``convey'' a work means any kind of propagation that enables other
 -parties to make or receive copies.  Mere interaction with a user
 -through a computer network, with no transfer of a copy, is not
 -conveying.
 -
 -An interactive user interface displays ``Appropriate Legal Notices'' to
 -the extent that it includes a convenient and prominently visible
 -feature that (1) displays an appropriate copyright notice, and (2)
 -tells the user that there is no warranty for the work (except to the
 -extent that warranties are provided), that licensees may convey the
 -work under this License, and how to view a copy of this License.  If
 -the interface presents a list of user commands or options, such as a
 -menu, a prominent item in the list meets this criterion.
 -
 -@item Source Code.
 -
 -The ``source code'' for a work means the preferred form of the work for
 -making modifications to it.  ``Object code'' means any non-source form
 -of a work.
 -
 -A ``Standard Interface'' means an interface that either is an official
 -standard defined by a recognized standards body, or, in the case of
 -interfaces specified for a particular programming language, one that
 -is widely used among developers working in that language.
 -
 -The ``System Libraries'' of an executable work include anything, other
 -than the work as a whole, that (a) is included in the normal form of
 -packaging a Major Component, but which is not part of that Major
 -Component, and (b) serves only to enable use of the work with that
 -Major Component, or to implement a Standard Interface for which an
 -implementation is available to the public in source code form.  A
 -``Major Component'', in this context, means a major essential component
 -(kernel, window system, and so on) of the specific operating system
 -(if any) on which the executable work runs, or a compiler used to
 -produce the work, or an object code interpreter used to run it.
 -
 -The ``Corresponding Source'' for a work in object code form means all
 -the source code needed to generate, install, and (for an executable
 -work) run the object code and to modify the work, including scripts to
 -control those activities.  However, it does not include the work's
 -System Libraries, or general-purpose tools or generally available free
 -programs which are used unmodified in performing those activities but
 -which are not part of the work.  For example, Corresponding Source
 -includes interface definition files associated with source files for
 -the work, and the source code for shared libraries and dynamically
 -linked subprograms that the work is specifically designed to require,
 -such as by intimate data communication or control flow between those
 -subprograms and other parts of the work.
 -
 -The Corresponding Source need not include anything that users can
 -regenerate automatically from other parts of the Corresponding Source.
 -
 -The Corresponding Source for a work in source code form is that same
 -work.
 -
 -@item Basic Permissions.
 -
 -All rights granted under this License are granted for the term of
 -copyright on the Program, and are irrevocable provided the stated
 -conditions are met.  This License explicitly affirms your unlimited
 -permission to run the unmodified Program.  The output from running a
 -covered work is covered by this License only if the output, given its
 -content, constitutes a covered work.  This License acknowledges your
 -rights of fair use or other equivalent, as provided by copyright law.
 -
 -You may make, run and propagate covered works that you do not convey,
 -without conditions so long as your license otherwise remains in force.
 -You may convey covered works to others for the sole purpose of having
 -them make modifications exclusively for you, or provide you with
 -facilities for running those works, provided that you comply with the
 -terms of this License in conveying all material for which you do not
 -control copyright.  Those thus making or running the covered works for
 -you must do so exclusively on your behalf, under your direction and
 -control, on terms that prohibit them from making any copies of your
 -copyrighted material outside their relationship with you.
 -
 -Conveying under any other circumstances is permitted solely under the
 -conditions stated below.  Sublicensing is not allowed; section 10
 -makes it unnecessary.
 -
 -@item Protecting Users' Legal Rights From Anti-Circumvention Law.
 -
 -No covered work shall be deemed part of an effective technological
 -measure under any applicable law fulfilling obligations under article
 -11 of the WIPO copyright treaty adopted on 20 December 1996, or
 -similar laws prohibiting or restricting circumvention of such
 -measures.
 -
 -When you convey a covered work, you waive any legal power to forbid
 -circumvention of technological measures to the extent such
 -circumvention is effected by exercising rights under this License with
 -respect to the covered work, and you disclaim any intention to limit
 -operation or modification of the work as a means of enforcing, against
 -the work's users, your or third parties' legal rights to forbid
 -circumvention of technological measures.
 -
 -@item Conveying Verbatim Copies.
 -
 -You may convey verbatim copies of the Program's source code as you
 -receive it, in any medium, provided that you conspicuously and
 -appropriately publish on each copy an appropriate copyright notice;
 -keep intact all notices stating that this License and any
 -non-permissive terms added in accord with section 7 apply to the code;
 -keep intact all notices of the absence of any warranty; and give all
 -recipients a copy of this License along with the Program.
 -
 -You may charge any price or no price for each copy that you convey,
 -and you may offer support or warranty protection for a fee.
 -
 -@item Conveying Modified Source Versions.
 -
 -You may convey a work based on the Program, or the modifications to
 -produce it from the Program, in the form of source code under the
 -terms of section 4, provided that you also meet all of these
 -conditions:
 -
 -@enumerate a
 -@item 
 -The work must carry prominent notices stating that you modified it,
 -and giving a relevant date.
 -
 -@item
 -The work must carry prominent notices stating that it is released
 -under this License and any conditions added under section 7.  This
 -requirement modifies the requirement in section 4 to ``keep intact all
 -notices''.
 -
 -@item
 -You must license the entire work, as a whole, under this License to
 -anyone who comes into possession of a copy.  This License will
 -therefore apply, along with any applicable section 7 additional terms,
 -to the whole of the work, and all its parts, regardless of how they
 -are packaged.  This License gives no permission to license the work in
 -any other way, but it does not invalidate such permission if you have
 -separately received it.
 -
 -@item
 -If the work has interactive user interfaces, each must display
 -Appropriate Legal Notices; however, if the Program has interactive
 -interfaces that do not display Appropriate Legal Notices, your work
 -need not make them do so.
 -@end enumerate
 -
 -A compilation of a covered work with other separate and independent
 -works, which are not by their nature extensions of the covered work,
 -and which are not combined with it such as to form a larger program,
 -in or on a volume of a storage or distribution medium, is called an
 -``aggregate'' if the compilation and its resulting copyright are not
 -used to limit the access or legal rights of the compilation's users
 -beyond what the individual works permit.  Inclusion of a covered work
 -in an aggregate does not cause this License to apply to the other
 -parts of the aggregate.
 -
 -@item  Conveying Non-Source Forms.
 -
 -You may convey a covered work in object code form under the terms of
 -sections 4 and 5, provided that you also convey the machine-readable
 -Corresponding Source under the terms of this License, in one of these
 -ways:
 -
 -@enumerate a
 -@item
 -Convey the object code in, or embodied in, a physical product
 -(including a physical distribution medium), accompanied by the
 -Corresponding Source fixed on a durable physical medium customarily
 -used for software interchange.
 -
 -@item
 -Convey the object code in, or embodied in, a physical product
 -(including a physical distribution medium), accompanied by a written
 -offer, valid for at least three years and valid for as long as you
 -offer spare parts or customer support for that product model, to give
 -anyone who possesses the object code either (1) a copy of the
 -Corresponding Source for all the software in the product that is
 -covered by this License, on a durable physical medium customarily used
 -for software interchange, for a price no more than your reasonable
 -cost of physically performing this conveying of source, or (2) access
 -to copy the Corresponding Source from a network server at no charge.
 -
 -@item
 -Convey individual copies of the object code with a copy of the written
 -offer to provide the Corresponding Source.  This alternative is
 -allowed only occasionally and noncommercially, and only if you
 -received the object code with such an offer, in accord with subsection
 -6b.
 -
 -@item
 -Convey the object code by offering access from a designated place
 -(gratis or for a charge), and offer equivalent access to the
 -Corresponding Source in the same way through the same place at no
 -further charge.  You need not require recipients to copy the
 -Corresponding Source along with the object code.  If the place to copy
 -the object code is a network server, the Corresponding Source may be
 -on a different server (operated by you or a third party) that supports
 -equivalent copying facilities, provided you maintain clear directions
 -next to the object code saying where to find the Corresponding Source.
 -Regardless of what server hosts the Corresponding Source, you remain
 -obligated to ensure that it is available for as long as needed to
 -satisfy these requirements.
 -
 -@item
 -Convey the object code using peer-to-peer transmission, provided you
 -inform other peers where the object code and Corresponding Source of
 -the work are being offered to the general public at no charge under
 -subsection 6d.
 -
 -@end enumerate
 -
 -A separable portion of the object code, whose source code is excluded
 -from the Corresponding Source as a System Library, need not be
 -included in conveying the object code work.
 -
 -A ``User Product'' is either (1) a ``consumer product'', which means any
 -tangible personal property which is normally used for personal,
 -family, or household purposes, or (2) anything designed or sold for
 -incorporation into a dwelling.  In determining whether a product is a
 -consumer product, doubtful cases shall be resolved in favor of
 -coverage.  For a particular product received by a particular user,
 -``normally used'' refers to a typical or common use of that class of
 -product, regardless of the status of the particular user or of the way
 -in which the particular user actually uses, or expects or is expected
 -to use, the product.  A product is a consumer product regardless of
 -whether the product has substantial commercial, industrial or
 -non-consumer uses, unless such uses represent the only significant
 -mode of use of the product.
 -
 -``Installation Information'' for a User Product means any methods,
 -procedures, authorization keys, or other information required to
 -install and execute modified versions of a covered work in that User
 -Product from a modified version of its Corresponding Source.  The
 -information must suffice to ensure that the continued functioning of
 -the modified object code is in no case prevented or interfered with
 -solely because modification has been made.
 -
 -If you convey an object code work under this section in, or with, or
 -specifically for use in, a User Product, and the conveying occurs as
 -part of a transaction in which the right of possession and use of the
 -User Product is transferred to the recipient in perpetuity or for a
 -fixed term (regardless of how the transaction is characterized), the
 -Corresponding Source conveyed under this section must be accompanied
 -by the Installation Information.  But this requirement does not apply
 -if neither you nor any third party retains the ability to install
 -modified object code on the User Product (for example, the work has
 -been installed in ROM).
 -
 -The requirement to provide Installation Information does not include a
 -requirement to continue to provide support service, warranty, or
 -updates for a work that has been modified or installed by the
 -recipient, or for the User Product in which it has been modified or
 -installed.  Access to a network may be denied when the modification
 -itself materially and adversely affects the operation of the network
 -or violates the rules and protocols for communication across the
 -network.
 -
 -Corresponding Source conveyed, and Installation Information provided,
 -in accord with this section must be in a format that is publicly
 -documented (and with an implementation available to the public in
 -source code form), and must require no special password or key for
 -unpacking, reading or copying.
 -
 -@item Additional Terms.
 -
 -``Additional permissions'' are terms that supplement the terms of this
 -License by making exceptions from one or more of its conditions.
 -Additional permissions that are applicable to the entire Program shall
 -be treated as though they were included in this License, to the extent
 -that they are valid under applicable law.  If additional permissions
 -apply only to part of the Program, that part may be used separately
 -under those permissions, but the entire Program remains governed by
 -this License without regard to the additional permissions.
 -
 -When you convey a copy of a covered work, you may at your option
 -remove any additional permissions from that copy, or from any part of
 -it.  (Additional permissions may be written to require their own
 -removal in certain cases when you modify the work.)  You may place
 -additional permissions on material, added by you to a covered work,
 -for which you have or can give appropriate copyright permission.
 -
 -Notwithstanding any other provision of this License, for material you
 -add to a covered work, you may (if authorized by the copyright holders
 -of that material) supplement the terms of this License with terms:
 -
 -@enumerate a
 -@item
 -Disclaiming warranty or limiting liability differently from the terms
 -of sections 15 and 16 of this License; or
 -
 -@item
 -Requiring preservation of specified reasonable legal notices or author
 -attributions in that material or in the Appropriate Legal Notices
 -displayed by works containing it; or
 -
 -@item
 -Prohibiting misrepresentation of the origin of that material, or
 -requiring that modified versions of such material be marked in
 -reasonable ways as different from the original version; or
 -
 -@item
 -Limiting the use for publicity purposes of names of licensors or
 -authors of the material; or
 -
 -@item
 -Declining to grant rights under trademark law for use of some trade
 -names, trademarks, or service marks; or
 -
 -@item
 -Requiring indemnification of licensors and authors of that material by
 -anyone who conveys the material (or modified versions of it) with
 -contractual assumptions of liability to the recipient, for any
 -liability that these contractual assumptions directly impose on those
 -licensors and authors.
 -@end enumerate
 -
 -All other non-permissive additional terms are considered ``further
 -restrictions'' within the meaning of section 10.  If the Program as you
 -received it, or any part of it, contains a notice stating that it is
 -governed by this License along with a term that is a further
 -restriction, you may remove that term.  If a license document contains
 -a further restriction but permits relicensing or conveying under this
 -License, you may add to a covered work material governed by the terms
 -of that license document, provided that the further restriction does
 -not survive such relicensing or conveying.
 -
 -If you add terms to a covered work in accord with this section, you
 -must place, in the relevant source files, a statement of the
 -additional terms that apply to those files, or a notice indicating
 -where to find the applicable terms.
 -
 -Additional terms, permissive or non-permissive, may be stated in the
 -form of a separately written license, or stated as exceptions; the
 -above requirements apply either way.
 -
 -@item Termination.
 -
 -You may not propagate or modify a covered work except as expressly
 -provided under this License.  Any attempt otherwise to propagate or
 -modify it is void, and will automatically terminate your rights under
 -this License (including any patent licenses granted under the third
 -paragraph of section 11).
 -
 -However, if you cease all violation of this License, then your license
 -from a particular copyright holder is reinstated (a) provisionally,
 -unless and until the copyright holder explicitly and finally
 -terminates your license, and (b) permanently, if the copyright holder
 -fails to notify you of the violation by some reasonable means prior to
 -60 days after the cessation.
 -
 -Moreover, your license from a particular copyright holder is
 -reinstated permanently if the copyright holder notifies you of the
 -violation by some reasonable means, this is the first time you have
 -received notice of violation of this License (for any work) from that
 -copyright holder, and you cure the violation prior to 30 days after
 -your receipt of the notice.
 -
 -Termination of your rights under this section does not terminate the
 -licenses of parties who have received copies or rights from you under
 -this License.  If your rights have been terminated and not permanently
 -reinstated, you do not qualify to receive new licenses for the same
 -material under section 10.
 -
 -@item Acceptance Not Required for Having Copies.
 -
 -You are not required to accept this License in order to receive or run
 -a copy of the Program.  Ancillary propagation of a covered work
 -occurring solely as a consequence of using peer-to-peer transmission
 -to receive a copy likewise does not require acceptance.  However,
 -nothing other than this License grants you permission to propagate or
 -modify any covered work.  These actions infringe copyright if you do
 -not accept this License.  Therefore, by modifying or propagating a
 -covered work, you indicate your acceptance of this License to do so.
 -
 -@item Automatic Licensing of Downstream Recipients.
 -
 -Each time you convey a covered work, the recipient automatically
 -receives a license from the original licensors, to run, modify and
 -propagate that work, subject to this License.  You are not responsible
 -for enforcing compliance by third parties with this License.
 -
 -An ``entity transaction'' is a transaction transferring control of an
 -organization, or substantially all assets of one, or subdividing an
 -organization, or merging organizations.  If propagation of a covered
 -work results from an entity transaction, each party to that
 -transaction who receives a copy of the work also receives whatever
 -licenses to the work the party's predecessor in interest had or could
 -give under the previous paragraph, plus a right to possession of the
 -Corresponding Source of the work from the predecessor in interest, if
 -the predecessor has it or can get it with reasonable efforts.
 -
 -You may not impose any further restrictions on the exercise of the
 -rights granted or affirmed under this License.  For example, you may
 -not impose a license fee, royalty, or other charge for exercise of
 -rights granted under this License, and you may not initiate litigation
 -(including a cross-claim or counterclaim in a lawsuit) alleging that
 -any patent claim is infringed by making, using, selling, offering for
 -sale, or importing the Program or any portion of it.
 -
 -@item Patents.
 -
 -A ``contributor'' is a copyright holder who authorizes use under this
 -License of the Program or a work on which the Program is based.  The
 -work thus licensed is called the contributor's ``contributor version''.
 -
 -A contributor's ``essential patent claims'' are all patent claims owned
 -or controlled by the contributor, whether already acquired or
 -hereafter acquired, that would be infringed by some manner, permitted
 -by this License, of making, using, or selling its contributor version,
 -but do not include claims that would be infringed only as a
 -consequence of further modification of the contributor version.  For
 -purposes of this definition, ``control'' includes the right to grant
 -patent sublicenses in a manner consistent with the requirements of
 -this License.
 -
 -Each contributor grants you a non-exclusive, worldwide, royalty-free
 -patent license under the contributor's essential patent claims, to
 -make, use, sell, offer for sale, import and otherwise run, modify and
 -propagate the contents of its contributor version.
 -
 -In the following three paragraphs, a ``patent license'' is any express
 -agreement or commitment, however denominated, not to enforce a patent
 -(such as an express permission to practice a patent or covenant not to
 -sue for patent infringement).  To ``grant'' such a patent license to a
 -party means to make such an agreement or commitment not to enforce a
 -patent against the party.
 -
 -If you convey a covered work, knowingly relying on a patent license,
 -and the Corresponding Source of the work is not available for anyone
 -to copy, free of charge and under the terms of this License, through a
 -publicly available network server or other readily accessible means,
 -then you must either (1) cause the Corresponding Source to be so
 -available, or (2) arrange to deprive yourself of the benefit of the
 -patent license for this particular work, or (3) arrange, in a manner
 -consistent with the requirements of this License, to extend the patent
 -license to downstream recipients.  ``Knowingly relying'' means you have
 -actual knowledge that, but for the patent license, your conveying the
 -covered work in a country, or your recipient's use of the covered work
 -in a country, would infringe one or more identifiable patents in that
 -country that you have reason to believe are valid.
 -
 -If, pursuant to or in connection with a single transaction or
 -arrangement, you convey, or propagate by procuring conveyance of, a
 -covered work, and grant a patent license to some of the parties
 -receiving the covered work authorizing them to use, propagate, modify
 -or convey a specific copy of the covered work, then the patent license
 -you grant is automatically extended to all recipients of the covered
 -work and works based on it.
 -
 -A patent license is ``discriminatory'' if it does not include within the
 -scope of its coverage, prohibits the exercise of, or is conditioned on
 -the non-exercise of one or more of the rights that are specifically
 -granted under this License.  You may not convey a covered work if you
 -are a party to an arrangement with a third party that is in the
 -business of distributing software, under which you make payment to the
 -third party based on the extent of your activity of conveying the
 -work, and under which the third party grants, to any of the parties
 -who would receive the covered work from you, a discriminatory patent
 -license (a) in connection with copies of the covered work conveyed by
 -you (or copies made from those copies), or (b) primarily for and in
 -connection with specific products or compilations that contain the
 -covered work, unless you entered into that arrangement, or that patent
 -license was granted, prior to 28 March 2007.
 -
 -Nothing in this License shall be construed as excluding or limiting
 -any implied license or other defenses to infringement that may
 -otherwise be available to you under applicable patent law.
 -
 -@item No Surrender of Others' Freedom.
 -
 -If conditions are imposed on you (whether by court order, agreement or
 -otherwise) that contradict the conditions of this License, they do not
 -excuse you from the conditions of this License.  If you cannot convey
 -a covered work so as to satisfy simultaneously your obligations under
 -this License and any other pertinent obligations, then as a
 -consequence you may not convey it at all.  For example, if you agree
 -to terms that obligate you to collect a royalty for further conveying
 -from those to whom you convey the Program, the only way you could
 -satisfy both those terms and this License would be to refrain entirely
 -from conveying the Program.
 -
 -@item Use with the GNU Affero General Public License.
 -
 -Notwithstanding any other provision of this License, you have
 -permission to link or combine any covered work with a work licensed
 -under version 3 of the GNU Affero General Public License into a single
 -combined work, and to convey the resulting work.  The terms of this
 -License will continue to apply to the part which is the covered work,
 -but the special requirements of the GNU Affero General Public License,
 -section 13, concerning interaction through a network will apply to the
 -combination as such.
 -
 -@item Revised Versions of this License.
 -
 -The Free Software Foundation may publish revised and/or new versions
 -of the GNU General Public License from time to time.  Such new
 -versions will be similar in spirit to the present version, but may
 -differ in detail to address new problems or concerns.
 -
 -Each version is given a distinguishing version number.  If the Program
 -specifies that a certain numbered version of the GNU General Public
 -License ``or any later version'' applies to it, you have the option of
 -following the terms and conditions either of that numbered version or
 -of any later version published by the Free Software Foundation.  If
 -the Program does not specify a version number of the GNU General
 -Public License, you may choose any version ever published by the Free
 -Software Foundation.
 -
 -If the Program specifies that a proxy can decide which future versions
 -of the GNU General Public License can be used, that proxy's public
 -statement of acceptance of a version permanently authorizes you to
 -choose that version for the Program.
 -
 -Later license versions may give you additional or different
 -permissions.  However, no additional obligations are imposed on any
 -author or copyright holder as a result of your choosing to follow a
 -later version.
 -
 -@item Disclaimer of Warranty.
 -
 -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 -APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
 -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
 -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 -A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
 -PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
 -DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
 -CORRECTION.
 -
 -@item Limitation of Liability.
 -
 -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
 -CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
 -ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
 -NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
 -LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
 -TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
 -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 -
 -@item Interpretation of Sections 15 and 16.
 -
 -If the disclaimer of warranty and limitation of liability provided
 -above cannot be given local legal effect according to their terms,
 -reviewing courts shall apply local law that most closely approximates
 -an absolute waiver of all civil liability in connection with the
 -Program, unless a warranty or assumption of liability accompanies a
 -copy of the Program in return for a fee.
 -
 -@end enumerate
 -
 -@heading END OF TERMS AND CONDITIONS
 -
 -@heading How to Apply These Terms to Your New Programs
 -
 -If you develop a new program, and you want it to be of the greatest
 -possible use to the public, the best way to achieve this is to make it
 -free software which everyone can redistribute and change under these
 -terms.
 -
 -To do so, attach the following notices to the program.  It is safest
 -to attach them to the start of each source file to most effectively
 -state the exclusion of warranty; and each file should have at least
 -the ``copyright'' line and a pointer to where the full notice is found.
 -
 -@smallexample
 -@var{one line to give the program's name and a brief idea of what it does.}  
 -Copyright (C) @var{year} @var{name of author}
 -
 -This program 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 of the License, or (at
 -your option) any later version.
 -
 -This program 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 this program.  If not, see @url{http://www.gnu.org/licenses/}.
 -@end smallexample
 -
 -Also add information on how to contact you by electronic and paper mail.
 -
 -If the program does terminal interaction, make it output a short
 -notice like this when it starts in an interactive mode:
 -
 -@smallexample
 -@var{program} Copyright (C) @var{year} @var{name of author} 
 -This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
 -This is free software, and you are welcome to redistribute it
 -under certain conditions; type @samp{show c} for details.
 -@end smallexample
 -
 -The hypothetical commands @samp{show w} and @samp{show c} should show
 -the appropriate parts of the General Public License.  Of course, your
 -program's commands might be different; for a GUI interface, you would
 -use an ``about box''.
 -
 -You should also get your employer (if you work as a programmer) or school,
 -if any, to sign a ``copyright disclaimer'' for the program, if necessary.
 -For more information on this, and how to apply and follow the GNU GPL, see
 -@url{http://www.gnu.org/licenses/}.
 -
 -The GNU General Public License does not permit incorporating your
 -program into proprietary programs.  If your program is a subroutine
 -library, you may consider it more useful to permit linking proprietary
 -applications with the library.  If this is what you want to do, use
 -the GNU Lesser General Public License instead of this License.  But
 -first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
 -
++@include gpl.texi
+ 
+ @node GNU Free Documentation License, Concept Index, Copying, Top
+ @comment  node-name,  next,  previous,  up
 -@unnumbered GNU Free Documentation License
 -@center Version 1.2, November 2002
 -
 -@display
 -Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
 -51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -
 -Everyone is permitted to copy and distribute verbatim copies
 -of this license document, but changing it is not allowed.
 -@end display
 -@sp 1
 -@enumerate 0
 -@item
 -PREAMBLE
 -
 -The purpose of this License is to make a manual, textbook, or other
 -functional and useful document ``free'' in the sense of freedom: to
 -assure everyone the effective freedom to copy and redistribute it,
 -with or without modifying it, either commercially or noncommercially.
 -Secondarily, this License preserves for the author and publisher a way
 -to get credit for their work, while not being considered responsible
 -for modifications made by others.
 -
 -This License is a kind of ``copyleft'', which means that derivative
 -works of the document must themselves be free in the same sense.  It
 -complements the GNU General Public License, which is a copyleft
 -license designed for free software.
 -
 -We have designed this License in order to use it for manuals for free
 -software, because free software needs free documentation: a free
 -program should come with manuals providing the same freedoms that the
 -software does.  But this License is not limited to software manuals;
 -it can be used for any textual work, regardless of subject matter or
 -whether it is published as a printed book.  We recommend this License
 -principally for works whose purpose is instruction or reference.
 -
 -@sp 1
 -@item
 -APPLICABILITY AND DEFINITIONS
 -
 -This License applies to any manual or other work, in any medium, that
 -contains a notice placed by the copyright holder saying it can be
 -distributed under the terms of this License.  Such a notice grants a
 -world-wide, royalty-free license, unlimited in duration, to use that
 -work under the conditions stated herein.  The ``Document'', below,
 -refers to any such manual or work.  Any member of the public is a
 -licensee, and is addressed as ``you''.  You accept the license if you
 -copy, modify or distribute the work in a way requiring permission
 -under copyright law.
 -
 -A ``Modified Version'' of the Document means any work containing the
 -Document or a portion of it, either copied verbatim, or with
 -modifications and/or translated into another language.
 -
 -A ``Secondary Section'' is a named appendix or a front-matter section of
 -the Document that deals exclusively with the relationship of the
 -publishers or authors of the Document to the Document's overall subject
 -(or to related matters) and contains nothing that could fall directly
 -within that overall subject.  (Thus, if the Document is in part a
 -textbook of mathematics, a Secondary Section may not explain any
 -mathematics.)  The relationship could be a matter of historical
 -connection with the subject or with related matters, or of legal,
 -commercial, philosophical, ethical or political position regarding
 -them.
 -
 -The ``Invariant Sections'' are certain Secondary Sections whose titles
 -are designated, as being those of Invariant Sections, in the notice
 -that says that the Document is released under this License.  If a
 -section does not fit the above definition of Secondary then it is not
 -allowed to be designated as Invariant.  The Document may contain zero
 -Invariant Sections.  If the Document does not identify any Invariant
 -Sections then there are none.
 -
 -The ``Cover Texts'' are certain short passages of text that are listed,
 -as Front-Cover Texts or Back-Cover Texts, in the notice that says that
 -the Document is released under this License.  A Front-Cover Text may
 -be at most 5 words, and a Back-Cover Text may be at most 25 words.
 -
 -A ``Transparent'' copy of the Document means a machine-readable copy,
 -represented in a format whose specification is available to the
 -general public, that is suitable for revising the document
 -straightforwardly with generic text editors or (for images composed of
 -pixels) generic paint programs or (for drawings) some widely available
 -drawing editor, and that is suitable for input to text formatters or
 -for automatic translation to a variety of formats suitable for input
 -to text formatters.  A copy made in an otherwise Transparent file
 -format whose markup, or absence of markup, has been arranged to thwart
 -or discourage subsequent modification by readers is not Transparent.
 -An image format is not Transparent if used for any substantial amount
 -of text.  A copy that is not ``Transparent'' is called ``Opaque.''
 -
 -
 -Examples of suitable formats for Transparent copies include plain
 -ASCII without markup, Texinfo input format, LaTeX input format, SGML
 -or XML using a publicly available DTD, and standard-conforming simple
 -HTML, PostScript or PDF designed for human modification.  Examples of
 -transparent image formats include PNG, XCF and JPG.  Opaque formats
 -include proprietary formats that can be read and edited only by
 -proprietary word processors, SGML or XML for which the DTD and/or
 -processing tools are not generally available, and the
 -machine-generated HTML, PostScript or PDF produced by some word
 -processors for output purposes only.
 -
 -The ``Title Page'' means, for a printed book, the title page itself,
 -plus such following pages as are needed to hold, legibly, the material
 -this License requires to appear in the title page.  For works in
 -formats which do not have any title page as such, ``Title Page'' means
 -the text near the most prominent appearance of the work's title,
 -preceding the beginning of the body of the text.
 -
 -A section ``Entitled XYZ'' means a named subunit of the Document whose
 -title either is precisely XYZ or contains XYZ in parentheses following
 -text that translates XYZ in another language.  (Here XYZ stands for a
 -specific section name mentioned below, such as ``Acknowledgements'',
 -``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
 -of such a section when you modify the Document means that it remains a
 -section ``Entitled XYZ'' according to this definition.
 -
 -The Document may include Warranty Disclaimers next to the notice which
 -states that this License applies to the Document.  These Warranty
 -Disclaimers are considered to be included by reference in this
 -License, but only as regards disclaiming warranties: any other
 -implication that these Warranty Disclaimers may have is void and has
 -no effect on the meaning of this License.
 -@sp 1
 -@item
 -VERBATIM COPYING
 -
 -You may copy and distribute the Document in any medium, either
 -commercially or noncommercially, provided that this License, the
 -copyright notices, and the license notice saying this License applies
 -to the Document are reproduced in all copies, and that you add no other
 -conditions whatsoever to those of this License.  You may not use
 -technical measures to obstruct or control the reading or further
 -copying of the copies you make or distribute.  However, you may accept
 -compensation in exchange for copies.  If you distribute a large enough
 -number of copies you must also follow the conditions in section 3.
 -
 -You may also lend copies, under the same conditions stated above, and
 -you may publicly display copies.
 -@sp 1
 -@item
 -COPYING IN QUANTITY
 -
 -If you publish printed copies (or copies in media that commonly have
 -printed covers) of the Document, numbering more than 100, and the
 -Document's license notice requires Cover Texts, you must enclose the
 -copies in covers that carry, clearly and legibly, all these Cover
 -Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
 -the back cover.  Both covers must also clearly and legibly identify
 -you as the publisher of these copies.  The front cover must present
 -the full title with all words of the title equally prominent and
 -visible.  You may add other material on the covers in addition.
 -Copying with changes limited to the covers, as long as they preserve
 -the title of the Document and satisfy these conditions, can be treated
 -as verbatim copying in other respects.
 -
 -If the required texts for either cover are too voluminous to fit
 -legibly, you should put the first ones listed (as many as fit
 -reasonably) on the actual cover, and continue the rest onto adjacent
 -pages.
 -
 -If you publish or distribute Opaque copies of the Document numbering
 -more than 100, you must either include a machine-readable Transparent
 -copy along with each Opaque copy, or state in or with each Opaque copy
 -a computer-network location from which the general network-using
 -public has access to download using public-standard network protocols
 -a complete Transparent copy of the Document, free of added material.
 -If you use the latter option, you must take reasonably prudent steps,
 -when you begin distribution of Opaque copies in quantity, to ensure
 -that this Transparent copy will remain thus accessible at the stated
 -location until at least one year after the last time you distribute an
 -Opaque copy (directly or through your agents or retailers) of that
 -edition to the public.
 -
 -It is requested, but not required, that you contact the authors of the
 -Document well before redistributing any large number of copies, to give
 -them a chance to provide you with an updated version of the Document.
 -@sp 1
 -@item
 -MODIFICATIONS
 -
 -You may copy and distribute a Modified Version of the Document under
 -the conditions of sections 2 and 3 above, provided that you release
 -the Modified Version under precisely this License, with the Modified
 -Version filling the role of the Document, thus licensing distribution
 -and modification of the Modified Version to whoever possesses a copy
 -of it.  In addition, you must do these things in the Modified Version:
 -
 -A. Use in the Title Page (and on the covers, if any) a title distinct
 -   from that of the Document, and from those of previous versions
 -   (which should, if there were any, be listed in the History section
 -   of the Document).  You may use the same title as a previous version
 -   if the original publisher of that version gives permission.@*
 -B. List on the Title Page, as authors, one or more persons or entities
 -   responsible for authorship of the modifications in the Modified
 -   Version, together with at least five of the principal authors of the
 -   Document (all of its principal authors, if it has fewer than five),
 -   unless they release you from this requirement.@*
 -C. State on the Title page the name of the publisher of the
 -   Modified Version, as the publisher.@*
 -D. Preserve all the copyright notices of the Document.@*
 -E. Add an appropriate copyright notice for your modifications
 -   adjacent to the other copyright notices.@*
 -F. Include, immediately after the copyright notices, a license notice
 -   giving the public permission to use the Modified Version under the
 -   terms of this License, in the form shown in the Addendum below.@*
 -G. Preserve in that license notice the full lists of Invariant Sections
 -   and required Cover Texts given in the Document's license notice.@*
 -H. Include an unaltered copy of this License.@*
 -I. Preserve the section Entitled ``History'', Preserve its Title, and add
 -   to it an item stating at least the title, year, new authors, and
 -   publisher of the Modified Version as given on the Title Page.  If
 -   there is no section Entitled ``History'' in the Document, create one
 -   stating the title, year, authors, and publisher of the Document as
 -   given on its Title Page, then add an item describing the Modified
 -   Version as stated in the previous sentence.@*
 -J. Preserve the network location, if any, given in the Document for
 -   public access to a Transparent copy of the Document, and likewise
 -   the network locations given in the Document for previous versions
 -   it was based on.  These may be placed in the ``History'' section.
 -   You may omit a network location for a work that was published at
 -   least four years before the Document itself, or if the original
 -   publisher of the version it refers to gives permission.@*
 -K. For any section Entitled ``Acknowledgements'' or ``Dedications'',
 -   Preserve the Title of the section, and preserve in the section all
 -   the substance and tone of each of the contributor acknowledgements
 -   and/or dedications given therein.@*
 -L. Preserve all the Invariant Sections of the Document,
 -   unaltered in their text and in their titles.  Section numbers
 -   or the equivalent are not considered part of the section titles.@*
 -M. Delete any section Entitled ``Endorsements.''  Such a section
 -   may not be included in the Modified Version.@*
 -N. Do not retitle any existing section to be Entitled ``Endorsements''
 -   or to conflict in title with any Invariant Section.@*
 -O. Preserve any Warranty Disclaimers.@*
 -@sp 1
 -If the Modified Version includes new front-matter sections or
 -appendices that qualify as Secondary Sections and contain no material
 -copied from the Document, you may at your option designate some or all
 -of these sections as invariant.  To do this, add their titles to the
 -list of Invariant Sections in the Modified Version's license notice.
 -These titles must be distinct from any other section titles.
 -
 -You may add a section Entitled ``Endorsements'', provided it contains
 -nothing but endorsements of your Modified Version by various
 -parties--for example, statements of peer review or that the text has
 -been approved by an organization as the authoritative definition of a
 -standard.
 -
 -You may add a passage of up to five words as a Front-Cover Text, and a
 -passage of up to 25 words as a Back-Cover Text, to the end of the list
 -of Cover Texts in the Modified Version.  Only one passage of
 -Front-Cover Text and one of Back-Cover Text may be added by (or
 -through arrangements made by) any one entity.  If the Document already
 -includes a cover text for the same cover, previously added by you or
 -by arrangement made by the same entity you are acting on behalf of,
 -you may not add another; but you may replace the old one, on explicit
 -permission from the previous publisher that added the old one.
 -
 -The author(s) and publisher(s) of the Document do not by this License
 -give permission to use their names for publicity for or to assert or
 -imply endorsement of any Modified Version.
 -@sp 1
 -@item
 -COMBINING DOCUMENTS
 -
 -You may combine the Document with other documents released under this
 -License, under the terms defined in section 4 above for modified
 -versions, provided that you include in the combination all of the
 -Invariant Sections of all of the original documents, unmodified, and
 -list them all as Invariant Sections of your combined work in its
 -license notice, and that you preserve all their Warranty Disclaimers.
 -
 -The combined work need only contain one copy of this License, and
 -multiple identical Invariant Sections may be replaced with a single
 -copy.  If there are multiple Invariant Sections with the same name but
 -different contents, make the title of each such section unique by
 -adding at the end of it, in parentheses, the name of the original
 -author or publisher of that section if known, or else a unique number.
 -Make the same adjustment to the section titles in the list of
 -Invariant Sections in the license notice of the combined work.
 -
 -In the combination, you must combine any sections Entitled ``History''
 -in the various original documents, forming one section Entitled
 -``History''; likewise combine any sections Entitled ``Acknowledgements'',
 -and any sections Entitled ``Dedications.''  You must delete all sections
 -Entitled ``Endorsements.''
 -@sp 1
 -@item
 -COLLECTIONS OF DOCUMENTS
 -
 -You may make a collection consisting of the Document and other documents
 -released under this License, and replace the individual copies of this
 -License in the various documents with a single copy that is included in
 -the collection, provided that you follow the rules of this License for
 -verbatim copying of each of the documents in all other respects.
 -
 -You may extract a single document from such a collection, and distribute
 -it individually under this License, provided you insert a copy of this
 -License into the extracted document, and follow this License in all
 -other respects regarding verbatim copying of that document.
 -@sp 1
 -@item
 -AGGREGATION WITH INDEPENDENT WORKS
 -
 -A compilation of the Document or its derivatives with other separate
 -and independent documents or works, in or on a volume of a storage or
 -distribution medium, is called an ``aggregate'' if the copyright
 -resulting from the compilation is not used to limit the legal rights
 -of the compilation's users beyond what the individual works permit.
 -When the Document is included in an aggregate, this License does not
 -apply to the other works in the aggregate which are not themselves
 -derivative works of the Document.
 -
 -If the Cover Text requirement of section 3 is applicable to these
 -copies of the Document, then if the Document is less than one half of
 -the entire aggregate, the Document's Cover Texts may be placed on
 -covers that bracket the Document within the aggregate, or the
 -electronic equivalent of covers if the Document is in electronic form.
 -Otherwise they must appear on printed covers that bracket the whole
 -aggregate.
 -@sp 1
 -@item
 -TRANSLATION
 -
 -Translation is considered a kind of modification, so you may
 -distribute translations of the Document under the terms of section 4.
 -Replacing Invariant Sections with translations requires special
 -permission from their copyright holders, but you may include
 -translations of some or all Invariant Sections in addition to the
 -original versions of these Invariant Sections.  You may include a
 -translation of this License, and all the license notices in the
 -Document, and any Warranty Disclaimers, provided that you also include
 -the original English version of this License and the original versions
 -of those notices and disclaimers.  In case of a disagreement between
 -the translation and the original version of this License or a notice
 -or disclaimer, the original version will prevail.
 -
 -If a section in the Document is Entitled ``Acknowledgements'',
 -``Dedications'', or ``History'', the requirement (section 4) to Preserve
 -its Title (section 1) will typically require changing the actual
 -title.
 -@sp 1
 -@item
 -TERMINATION
 -
 -You may not copy, modify, sublicense, or distribute the Document except
 -as expressly provided for under this License.  Any other attempt to
 -copy, modify, sublicense or distribute the Document is void, and will
 -automatically terminate your rights under this License.  However,
 -parties who have received copies, or rights, from you under this
 -License will not have their licenses terminated so long as such
 -parties remain in full compliance.
 -@sp 1
 -@item
 -FUTURE REVISIONS OF THIS LICENSE
 -
 -The Free Software Foundation may publish new, revised versions
 -of the GNU Free Documentation License from time to time.  Such new
 -versions will be similar in spirit to the present version, but may
 -differ in detail to address new problems or concerns.  See
 -http://www.gnu.org/copyleft/.
 -
 -Each version of the License is given a distinguishing version number.
 -If the Document specifies that a particular numbered version of this
 -License ``or any later version'' applies to it, you have the option of
 -following the terms and conditions either of that specified version or
 -of any later version that has been published (not as a draft) by the
 -Free Software Foundation.  If the Document does not specify a version
 -number of this License, you may choose any version ever published (not
 -as a draft) by the Free Software Foundation.
 -
 -@end enumerate
 -
 -@unnumberedsec ADDENDUM: How to use this License for your documents
 -
 -To use this License in a document you have written, include a copy of
 -the License in the document and put the following copyright and
 -license notices just after the title page:
 -
 -@smallexample
 -@group
 -Copyright (C)  @var{year}  @var{your name}.
 -Permission is granted to copy, distribute and/or modify this document
 -under the terms of the GNU Free Documentation License, Version 1.2
 -or any later version published by the Free Software Foundation;
 -with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 -A copy of the license is included in the section entitled ``GNU
 -Free Documentation License''.
 -@end group
 -@end smallexample
 -
 -If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
 -replace the ``with...Texts.'' line with this:
 -
 -@smallexample
 -@group
 -with the Invariant Sections being @var{list their titles}, with the
 -Front-Cover Texts being @var{list}, and with the Back-Cover Texts being
 -@var{list}.
 -@end group
 -@end smallexample
 -
 -If you have Invariant Sections without Cover Texts, or some other
 -combination of the three, merge those two alternatives to suit the
 -situation.
 -
 -If your document contains nontrivial examples of program code, we
 -recommend releasing these examples in parallel under your choice of
 -free software license, such as the GNU General Public License,
 -to permit their use in free software.
 -
 +@include doclicense.texi
  
  @node Concept Index,  , GNU Free Documentation License, Top
  @comment  node-name,  next,  previous,  up



From MAILER-DAEMON Wed Oct 17 10:36:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IiA0X-0003DY-DD
	for mharc-erc-commit@gnu.org; Wed, 17 Oct 2007 10:36:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IgvPf-0005Iu-Bh
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IgvPa-0005F8-80
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IgvPY-0005Dq-1R
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:08 -0400
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@hcoop.net>) id 1IgvPP-00045I-Af
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:49:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtp (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IgvPM-0005Gm-PN
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@mire.hcoop.net>) id 1IgvPM-0006YR-Q6
	for erc-commit@gnu.org; Sun, 14 Oct 2007 00:48:56 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IgvPM-0006YR-Q6@mire.hcoop.net>
Date: Sun, 14 Oct 2007 00:48:56 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1)
X-Mailman-Approved-At: Wed, 17 Oct 2007 10:36:10 -0400
Subject: [Erc-commit] [commit][emacs22] Merged from erc--main--0
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, 14 Oct 2007 04:53:28 -0000

commit 1591911f20e6125573b166c1a21a1fe1d6704fd4
Merge: 0a4814c... d4a55ce...
Author: Michael Olson <mwolson@gnu.org>
Date:   Sun Apr 1 02:01:51 2007 +0000

    Merged from erc--main--0
    
    Patches applied:
    
     * erc@sv.gnu.org/erc--emacs--22--patch-43
       Sync license inanity from Emacs 22
    
     * erc@sv.gnu.org/erc--main--0--patch-134
       Merged from erc--emacs--22
    git-archimport-id: erc@sv.gnu.org/erc--rel--5.2--patch-15

diff --cc ChangeLog
index 825f4a0,cef3944..8822140
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,362 -1,314 +1,377 @@@
 -2006-01-28  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-*.el, erc.texi: Add Arch taglines as per Emacs guidelines.
 -	Space out copyright years like the rest of Emacs.  Use the Emacs
 -	copyright statement.  Refer to ourselves as ERC rather than "Emacs
 -	IRC Client", since there are now several IRC clients for Emacs.
 -
 -	* erc-stamp.el (erc-insert-aligned): If using a text terminal,
 -	insert spaces instead of using special text property.
 +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.
 +
 +	* 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.
 +
 +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.
  
 -2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
 +	* 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.
  
 -	* erc.el (erc-format-message): More `cl' breakage; don't use
 -	`oddp'.
 +2007-01-11  Diane Murray  <disumu@x3y2z1.net>
  
 -2006-01-27  Michael Olson  <mwolson@gnu.org>
 +	* NEWS: Added note for `erc-my-nick-face'.  Fixed capab-identify
 +	wording.
  
 -	* debian/changelog: Update for new release.
 +2007-01-10  Diane Murray  <disumu@x3y2z1.net>
  
 -	* debian/control (Description): Update.
 +	* 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.
  
 -	* debian/rules: Concatenate ChangeLog for 2005.
 +2007-01-10  Michael Olson  <mwolson@gnu.org>
  
 -	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
 -	(debrelease, release): Copy images directory.
 +	* erc.el: Fix typo in url-irc-function instructions.
  
 -	* NEWS: Spelling fixes.  Add items for recent changes.
 +2007-01-09  Michael Olson  <mwolson@gnu.org>
  
 -	* erc.el (erc): Move call to erc-update-modules before the call to
 -	erc-mode.  This should fix a timestamp display issue.
 -	(erc-version-string): Release ERC 5.1.
 +	* 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.
  
 -2006-01-26  Michael Olson  <mwolson@gnu.org>
 +2007-01-07  Michael Olson  <mwolson@gnu.org>
  
 -	* erc-stamp.el (erc-insert-aligned): New function that inserts
 -	text in an perfectly-aligned way relative to the right margin.  It
 -	only works well with Emacs22.  A sane fallback is provided for
 -	other versions of Emacs.
 -	(erc-insert-timestamp-right): Use the new function.
 +	* erc.el (erc-modules): Add the menu module.  This should fix a
 +	bug with incorrect ERC submenus being displayed.
  
 -2006-01-25  Edward O'Connor  <ted@oconnor.cx>
 +	* erc-menu.el: Turn this into a module.
 +	(erc-menu-add, erc-menu-remove): New functions that add and remove
 +	the ERC menu.
  
 -	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
 -	before `erc-match-mode'.
  
 -	* erc-match.el (match): Append `erc-match-message' to
 -	`erc-insert-modify-hook'.
 +See ChangeLog.06 for earlier changes.
  
 -2006-01-25  Michael Olson  <mwolson@gnu.org>
 +    Copyright (C) 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
+ 
 -	* FOR-RELEASE: Mark last release requirement as done.
++  This file is part of GNU Emacs.
+ 
 -	* Makefile (realclean, distclean): Remove docs.
++  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 2, or (at your option)
++  any later version.
+ 
 -	* erc.texi: Take care of all pre-5.1 items.
++  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.
+ 
 -	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
 -	`process-send-string' in `condition-case' to avoid an error when
 -	quitting ERC.
++  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.
  
 -	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
 -	variable-width characters in the timestamp and on the same line.
 -	The latter is a kludge, but it seems to work with most of the
 -	input I've thrown at it so far.  It's certainly better than going
 -	past the end of line consistently when we have variable-width
 -	characters on the same line.  When `erc-timestamp-intangible' is
 -	non-nil, add intangible properties to the whitespace as well, so
 -	that hitting <end> does what you'd expect.
 +;; Local Variables:
 +;; coding: utf-8
 +;; add-log-time-zone-rule: t
 +;; End:
  
 -	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
 -	this to only use boolean values for `erc-flood-protect'.  Update
 -	documentation.
 -	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
 -	that any QUIT-related messages go there.
 -	(erc): Try to be more clever about re-using channel buffers when
 -	automatically re-connecting.  Thanks to e1f for noticing.
 -
 -2006-01-23  Michael Olson  <mwolson@gnu.org>
 -
 -	* ChangeLog.2005: Remove erroneous line.
 -
 -	* FOR-RELEASE: Make that the Makefile tweaking is complete.
 -	(NEWS): Mark as done.
 -
 -	* Makefile (MANUAL): New option indicating the name of the manual.
 -	(PREFIX, ELISPDIR, INFODIR): New options that specify the
 -	directories to install lisp code and info manuals to.  PREFIX is
 -	used only by ELISPDIR and INFODIR.
 -	(all): Call `lisp' and create the manual.
 -	(lisp): Compile lisp code.
 -	(%.info, %.html): New rules that make Info files and HTML files,
 -	respectively, from a TexInfo source.
 -	(doc): Create both the Info and HTML versions of the manual.  This
 -	is for the user -- we never call it automatically.
 -	(install-info): Install Info files.
 -	(install-bin): Install compiled and source Lisp files.
 -	(todo): Remove, since it seems pointless.
 -
 -	* NEWS: Update.
 -
 -	* README: Add Installation instructions.  Tweak layout.
 -
 -	* erc.texi: Work on some pre-5.1 items.
 -
 -	* erc-stamp.el, erc-track.el: Move some functions and options in
 -	order to get rid of a few compiler warnings.
 -
 -	* erc.el (erc-modules): Enable readonly by default.  This will
 -	prevent new users from accidentally removing old messages, which
 -	could be disconcerting.  Also enable stamp by default, since
 -	timestamps are a fairly standard feature among IRC clients.
 -
 -	* erc-button.el: Munge whitespace.
 -
 -	* erc-identd.el (erc-identd-start): Instead of throwing an error,
 -	just try to use the obsolete function.
 -
 -2006-01-22  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-backend.el (erc-decode-string-from-target): Make sure that
 -	we have a string as an argument.  If not, coerce it to the empty
 -	string.  Hopefully, this will work painlessly around an edge case
 -	related to quitting ERC around the same time a message comes in.
 -
 -2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
 -
 -	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
 -	`case'). Doc fixes.
 -	(erc-find-parsed-property): Simplify.
 -	(erc-track-get-active-buffer): Fix logic. Simplify.
 -	(erc-track-switch-buffer): Remove unused variable `dir'. Simplify.
 -
 -	* erc-speak.el: Doc fixes.
 -	(erc-speak-region): `propertize' --> `erc-propertize'.
 -
 -	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
 -	`erc-propertize'.
 -
 -	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
 -	account when wrapping URLs.
 -
 -	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
 -
 -	* erc-backend.el (define-erc-response-handler): Doc fix.
 -
 -2006-01-22  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc.el (erc-update-modules): Use `require' instead of `load',
 -	but prevent it from causing errors, in order to preserve the
 -	previous behavior.
 -
 -2006-01-21  Michael Olson  <mwolson@gnu.org>
 -
 -	* FOR-RELEASE (Source): Mark cl task as done.
 -
 -	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
 -	generate-autoloads.
 -	(erc-auto.el, %.elc): Don't show command, just its output.
 -
 -	* NEWS: Add items from 2005-01-01 to 2005-08-13.
 -
 -	* debian/copyright (Copyright): Update.
 -
 -	* erc-auto.in (erc-generate-autoloads): Rename from
 -	generate-autoloads.
 -
 -	* erc.el, erc-autoaway.el, erc-backend.el: Use
 -	erc-server-process-alive instead of erc-process-alive.
 -
 -	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
 -	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
 -	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
 -	Use (eval-when-compile 'cl), so that compilation doesn't fail.
 -
 -	* erc-fill.el, erc-truncate.el: Whitespace munging.
 -
 -	* erc.el: Update copyright notice.  Remove eval-after-load code.
 -	(erc-with-buffer): Docfix.
 -	(erc-once-with-server-event, erc-once-with-server-event-global)
 -	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
 -	instead of gensym.
 -	(erc-banlist-update): Use erc-delete-if instead of delete-if.
 -	(erc): Call `erc-update-modules' here.
 -
 -	* erc-backend.el: Require 'erc-compat to minimize compiler
 -	warnings.
 -	(erc-decode-parsed-server-response): Docfix.
 -	(erc-server-process-alive): Move here from erc.el and rename from
 -	`erc-process-alive'.
 -	(erc-server-send, erc-remove-channel-users): Make sure process is
 -	alive before sending data to it.
 -
 -	* erc-bbdb.el: Update copyright years.
 -	(erc-bbdb-whois): Remove overexuberant comment.
 -
 -	* erc-button.el: Require erc-fill, since we make liberal use of
 -	`erc-fill-column'.
 -
 -	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
 -	functions, the latter of which provides an `assert' equivalent.
 -	(erc-remove-if-not): New function that provides a simple
 -	implementation of `remove-if-not'.
 -	(erc-gensym): New function that provides a simple implementation
 -	of `gensym'.
 -	(erc-delete-if): New function that provides a simple
 -	implementation of `delete-if'.
 -	(erc-member-if): New function that provides a simple
 -	implementation of `member-if'.
 -	(field-end): Remove this, since it is unused, and later versions
 -	of XEmacs have this function already.
 -	(erc-function-arglist): Moved here from erc.el.
 -	(erc-delete-dups): New compatibility function for dealing with
 -	XEmacs.
 -	(erc-subseq): New function copied from cl-extra.el.
 -
 -	* erc-dcc.el: Require pcomplete during compilation to avoid
 -	compiler warnings.
 -	(erc-unpack-int, erc-dcc-send-filter)
 -	(erc-dcc-get-filter): Use erc-assert instead of assert.
 -	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
 -	remove-if-not.
 -
 -	* erc-match.el (erc-log-matches): Fix compiler warning.
 -
 -	* erc-nicklist.el: Update copyright notice.
 -	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
 -	(erc-nicklist-bitlbee-connected-p): Remove.
 -	(erc-nicklist-insert-medium-name-or-icon): Accept channel
 -	argument.  Use it to determine whether we are on bitlbee.  Now
 -	that bitlbee names its channel "&bitlbee", this is trivial.
 -	(erc-nicklist-insert-contents): Pass channel as specified above.
 -	Don't try to determine whether we are on bitlbee here.
 -	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
 -	of remove-if-not.
 -	(erc-nicklist-search-for-nick): Use erc-member-if instead of
 -	member-if.
 -
 -	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
 -	partially-evaluated lambda expression instead of `delete' and
 -	`find'.
 -
 -	* erc-track.el: Use erc-assert.
 -	(erc-track-modified-channels): Remove use of `return'.
 -	(erc-track-modified-channels): Use `cadr' instead of `second',
 -	since otherwise we would need yet another eval-when-compile line.
 -
 -2006-01-19  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
 -	detect SIGPIPE, since it doesn't work.
 -
 -2006-01-10  Diane Murray  <disumu@x3y2z1.net>
 -
 -	* erc-spelling.el: Updated copyright years.
 -	(define-erc-module): Enable/disable `flyspell-mode' for all open
 -	ERC buffers as well.
 -	(erc-spelling-dictionaries): Reworded customize description.
 -
 -	* erc.el (erc-command-symbol): New function.
 -	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
 -	fixes a bug where "Symbol's function definition is void:
 -	erc-cmd-LIST" would be shown after typing /list at the prompt (the
 -	command was interned because erc-menu.el uses it and is enabled by
 -	default whereas erc-list.el is not).
 -
 -	* NEWS: Started a list of renamed variables.
 -
 -	* erc.el: Reworded the message sent when defining variable
 -	aliases.
 -	(erc-command-indicator-face): Doc fix.
 -	(erc-modules): Enable the match module by default which makes
 -	current nickname highlighting on as the default.
 -
 -	* erc-button.el: Updated copyright years.
 -	(erc-button): New face.
 -	(erc-button-face): Use `erc-button'.
 -	(erc-button-nickname-face): New customizable variable.
 -	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
 -	new argument to `erc-button-add-button'.
 -	(erc-button-add-button): Doc fix.  Added new argument to function
 -	definition, NICK-P.  If it's a nickname, use
 -	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
 -	makes channel tracking and buttons work better together when
 -	`erc-button-buttonize-nicks' is enabled, since there is a nickname
 -	on just about every line.
 -
 -	* erc-track.el (erc-track-use-faces): Doc fix.
 -	(erc-track-faces-priority-list): Added `erc-button' to list.
 -	(erc-track-priority-faces-only): Doc fix.
 -
 -2006-01-09  Diane Murray  <disumu@x3y2z1.net>
 -
 -	* erc-button.el (erc-button-url-regexp): Use `concat' so the
 -	regexp is not one long line.
 -	(erc-button-alist): Fixed so that customizing works correctly.
 -	Reorganized.  Removed lambda functions with more than two lines.
 -	Doc fix.
 -	(erc-button-describe-symbol, erc-button-beats-to-time): New
 -	functions.  Moved from `erc-button-alist'.
 -
 -2006-01-07  Michael Olson  <mwolson@gnu.org>
 -
 -	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
 -	process if a SIGPIPE occurs.  This happens when a new message
 -	comes in at the same time a /quit is requested.
 -	(erc-process-sentinel): Use string-match rather than string= to do
 -	these comparisons.  Matching literal newlines makes me nervous.
 -
 -	* erc-track.el (erc-track-remove-from-mode-line): Handle case
 -	where global-mode-string is not a list.  Emacs22 permits this.
 -
 -    Copyright (C) 2006 Free Software Foundation, Inc.
 -  Copying and distribution of this file, with or without modification,
 -  are permitted provided the copyright notice and this notice are preserved.
 +;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496
diff --cc ChangeLog.01
index 7998938,0000000..99c34a2
mode 100644,000000..100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@@ -1,1046 -1,0 +1,1061 @@@
 +2001-12-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.176: * Added missing 747 numreply (banned)
 +
 +2001-12-15  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/scripts/install 1.4, debian/rules 1.6:
 +	updated to 2.1.cvs.20011215-1
 +
 +	* debian/changelog 1.12: Debian version 2.1.cvs.20011215-1
 +
 +2001-12-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.175:
 +	* applied a nicer version of mhp's patch to remove the last prompt from
 +	  saved logs
 +
 +	* erc-replace.el 1.1: * Initial checkin
 +
 +2001-12-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.174:
 +	* fixed bug triggered when reuse-buffer was enabled (the default).
 +	  Another silly port type problem. Maybe we should unify that once and for all sometimes...
 +
 +2001-12-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.173: * erc-message-english: New QUIT and s004 entries.
 +	* erc-save-buffer-on-part: New variable.
 +	* erc-kill-buffer-on-part: New variable.
 +	* (erc-server-PART): Use above variables.
 +	* (erc-join-channel): Use DEF argument instead of initial input for completing-read.
 +
 +2001-12-08  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.172: added defcustom erc-nick-uniquifier ^ (i prefer _)
 +
 +2001-12-07  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.11: changelog for version 2.1.cvs.20011208-1
 +
 +2001-12-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.171:
 +	Added erc-scroll-to-bottom as an erc-insert-hook function.  It still bugs a bit, so please test it, thanks
 +
 +2001-12-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.170: * Fixed silly bug in erc-server-TOPIC (thanks mhp)
 +
 +	* erc-speak.el 1.17:
 +	* Fix non-greedy matching bug. That one somehow swallowed text
 +
 +	* erc.el 1.169:
 +	Fix Emacs20 problem. For now, we disable erc-track-modified-channels-minor-mode in emacs20
 +
 +2001-12-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.5:
 +	* Fix another stupid one-off error. This time it really works!
 +	 (Until I find the next bug. I guess you can hold your breath) (-:
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.4: * Fixed static filling:
 +	** No more \ed (continued on next line) lines anymore
 +	** Fixed bug with previous version where longer lines wouldn't get
 +	   filled correctly (i.e. at all)
 +
 +2001-12-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.10: changelog for 2.1.cvs.20011206-1 added
 +
 +2001-12-06  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.168:
 +	* Don't discard away status when identifying to NickServ
 +	* Modify `erc-already-logged-in': check for port, too.
 +
 +	* erc-fill.el 1.3:
 +	* Fix stupid loop non-termination error in erc-fill-static when filling
 +	  one-line regions.
 +	* Make erc-count-lines return meaningful values
 +
 +2001-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.167:
 +	* (erc-process-input): Make ' /command' work for quoting /commands
 +
 +	* erc-speak.el 1.16: see changelog
 +
 +	* erc-fill.el 1.2: see erc.el changelog
 +
 +	* erc.el 1.166:
 +	* erc-insert-hook: Changed strategy completely, no start end parameters any more.
 +	We narrow-to-region now, thats much cleaner.
 +	* rename erc-fill-region to erc-fill and change the autoload
 +	** You'll probably need to restart Emacs
 +
 +2001-12-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.165:
 +	* (erc-send-current-line): Fixed long outstanding bug. XEmacs users with erc-fill-region on erc-insert-hook knew that one a long time.
 +
 +	* erc.el 1.164: fix order of attack
 +
 +	* erc.el 1.163: * macroexpanded define-minor-mode for XEmacs
 +
 +	* erc.el 1.162: First try to make channel tracking mouse sensitive
 +
 +	* erc.el 1.161: * More erc-message-format conversion.
 +	  erc-format-message-english-PART as an example on how to use functions to format message
 +	* (erc-format-message): Fallback mechanism to use english catalog if variable is not bound
 +
 +2001-12-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.160: * (erc-iswitchb): Rewrite, docfix.
 +	Make it use erc-modified-channels as default if available.
 +
 +	* erc-menu.el 1.2:
 +	* Fixage related to erc-track-modified-channels-minor-mode rewrite
 +
 +	* erc.el 1.159:
 +	* erc-track-modified-channels-minor-mode: Use buffer objects instead of erc-default-target return value for internal state keeping.
 +
 +	* erc.el 1.158: * Made reconnect behave nicer (erc-process-sentinel)
 +	* Rewrote erc-modified-channels-tracking completely.
 +	  Its now a minor mode (erc-track-modified-channels-minor-mode)
 +	  It uses a list as internal representation now, so all silly string-parsing
 +	  related bugs should be gone.
 +	  Use (erc-track-modified-channels-minor-mode t) now to toggle this functionality.
 +	  Dont set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
 +
 +2001-11-29  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.9: final version
 +
 +2001-11-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.157:
 +	* (erc-channel-p): Make it work with string and buffer as parameter. buffer.
 +	* (erc-format-message): Add a check for functionp. This allows a format-specifier also to be a function name, which gets called with args applied and needs to return the actual format string.
 +	* Converted some formats, JOIN, JOIN-you, MODE, ...
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.156:
 +	* (erc-prepare-mode-line-format): Added sanity checks to prevent it from having problems with server buffers where the connection failed
 +
 +	* erc-bbdb.el 1.7:
 +	* (erc-bbdb-JOIN): regexp-quote the fingerhost before searching, some people have really strange characters as their user names
 +
 +	* erc.el 1.155: Remove a stupid debug like (message ...) call
 +
 +2001-11-28  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.8: draft of 2.1.cvs.20011128-1
 +
 +	* debian/rules 1.5: simplify for the all-in-one erc package
 +
 +	* debian/control 1.3: integrated erc-speak back into erc
 +
 +	* debian/maint/conffiles 1.3, debian/maint/conffiles.in 1.2, debian/maint/postinst 1.3, 
 +	  debian/maint/postinst.in 1.2, debian/maint/prerm 1.3, debian/maint/prerm.in 1.2, 
 +	  debian/scripts/install 1.3, debian/scripts/install.in 1.3, debian/scripts/remove 1.3, 
 +	  debian/scripts/remove.in 1.2, debian/scripts/startup.erc-speak 1.2:
 +	since erc-speak is gone, resurrect the static files, and update them to support the latest erc
 +
 +2001-11-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.154: * (erc-mode): Shouldn't be interactive.
 +	* (erc-info-mode): Ditto.
 +
 +	* erc.el 1.153: * (erc-server-352): Added hopcount parsing.
 +	Added call to erc-update-channel-member to fill in channel-members information
 +	on /WHO if the channel is joined.
 +
 +2001-11-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.6: *** empty log message ***
 +
 +	* erc-speedbar.el 1.5: * (erc-speedbar-expand-user): New function.
 +	Used when more information than just the nick name is available about a dude.
 +
 +	* erc.el 1.152: * Fixed stupid edit,checkin,save cycle error :)
 +
 +	* erc.el 1.151:
 +	* (erc-generate-log-file-name-default): Renamed to -long
 +	Doc fix.
 +	* (erc-generate-log-file-name-old): Renamed to -long
 +	Doc fix.
 +	* erc-generate-log-file-name-function: Set default to ...-long
 +	Doc fixes
 +
 +	* erc-speedbar.el 1.4: *** empty log message ***
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speedbar.el 1.3: * Integrated channel names list
 +	  what else do we need to replace info buffers???
 +	  please test that code and comment on erc-ehlp, thanks
 +
 +	* erc-speedbar.el 1.2:
 +	* Added erc-speedbar-goto-buffer and therefore enable switching to the buffers from speedbar
 +
 +	* erc-speedbar.el 1.1:
 +	I had to check this in, it works !! sort of,, megaalphagammaversion, first version. test, play, submit ideas/patches
 +
 +2001-11-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.150 (erc-mode): moved erc-last-saved-position here
 +	moved buffer naming code from here..
 +	(erc): ...to here
 +	(erc-generate-log-file-name-old): only prepend target if it exists
 +
 +	made erc-log-insert-log-on-open a defcustom
 +
 +2001-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.149:
 +	* Applied antifuchs/mhp patches, the latest on erc-help, unmodified
 +	* New variable: erc-reuse-buffers default to t.
 +	* Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
 +	  then one can assume thats the same channel/query target again.
 +
 +2001-11-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.6:
 +	* new function erc-BBDB-NICK to handle nickname anotation on a nick-change event of a known record
 +
 +	* erc.el 1.148: * Remove erc-rename-buffer, its no longer necessary
 +	* Remove erc-autoop-*. it was broken, and needed rewrite anyway
 +	* write erc-already-logged-in in terms of erc-buffer-list and make the duplicate login check work again
 +
 +	* erc.el 1.147: * Fixed stupid typo
 +
 +2001-11-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.146: * New local variable, erc-announced-server-name
 +	* erc-mode-line-format supports a new symbol, target-and/or-server
 +	* The mode-line displays the announced server name now (for autojoin later..., 
 +	  greets Adam)
 +	* New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
 +	  Thanks go to the guy from #emacs who helped with that
 +	* erc-fill-region is now autoloaded from erc-fill.el
 +	  * erc-fill.el implements a new fill method, erc-fill-static
 +	    (setq erc-fill-function 'erc-fill-static)
 +	* Some other things I forgot right now
 +
 +	* erc-bbdb.el 1.5: *** empty log message ***
 +
 +	* erc-fill.el 1.1: Initial version.
 +
 +	* erc-complete.el 1.4:
 +	Applied antifuchs patch to make completion work with (string= erc-prompt "")
 +
 +	* erc-complete.el 1.3:
 +	added function erc-nick-completion-exclude-myself
 +	you can set erc-nick-completion to 'erc-nick-completion-exclude-myself to use it
 +
 +2001-11-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.4:
 +	* Changed usage of 'finger-host to bbdb-finger-host-field
 +
 +	* erc-bbdb.el 1.3:
 +	* Changed WHOIS to use finger-host instead of net field.
 +	* Added 'visible as option to erc-bbdb-popup-p to only pop-up the bbdb buffer if a join happened in a visible buffer on any visible frame.
 +	* Added (regexp-quote ...) for nickname search in erc-bbdb-JOIN
 +
 +2001-11-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.2: * Added JOIN support
 +
 +2001-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.145:
 +	Initial message catalog code. converted erc-action-format usage to use it
 +
 +	* erc.el 1.144: * erc-play-sound: Added XEmacs related check
 +
 +	* erc-bbdb.el 1.1: * Initial version, many thanks to Andreas Fuchs
 +
 +	* erc.el 1.143: * Fixed silly problem with whois/was handling
 +
 +	* erc.el 1.142: * Renamed prev-rd to erc-previous-read
 +	* Removed erc-next-line-add-newlines and s next-line-add-newlines to nil in defun erc by default
 +
 +	* erc.el 1.141:
 +	fixed xemacs compatibility prob with delete, thanks Adam
 +
 +2001-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.140: numreplies 301 & 461
 +
 +2001-11-13  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.139:
 +	Added code for error reply 421 "Unknown command", to test the new server parsing system.
 +	This was really easy!  Thanks ZenIRC guys & delysid :-)
 +
 +2001-11-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.138: * Allow connecting to SSL enabled irc servers.
 +	   Ugly hack, but it works for now. Be sure to use the numeric irc port 994 so that erc can recognize what you want
 +	  good example is
 +	irc server: ircs.segfault.net
 +	port: 994
 +
 +	meet me there, I am still delYsid :)
 +
 +	* erc.el 1.137: * some more numreply handlers
 +	* cleanup in erc-process-away-p
 +	* new function erc-display-error-notice
 +
 +	* erc.el 1.136: * numreply 501 and 221
 +
 +	* erc.el 1.135:
 +	removed obsolete old hook variables. Your functions may break, but it is easy to hook them up to the new hooks.
 +	erc-part-hook: use erc-server-PART-hook instead
 +	erc-kick-hook: use erc-server-KICK-hook instead
 +	and so on
 +
 +	* erc.el 1.134:
 +	fixed serious bug which cause privmsgs vanishing when erc-auto-query was set to nil
 +
 +	* erc.el 1.133: cleaned up erc-process-filter
 +
 +	* erc.el 1.132: * 401 and 320 numreplies implemented
 +
 +	* erc.el 1.131: * Removed old/now obsolete code
 +
 +	* erc.el 1.130: * Fixed bug in erc-server-MODE
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.129: fixed it
 +
 +	* erc.el 1.128:
 +	*** We switched over. New server message parsing/handling is running now. Thansk to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
 +
 +	* erc.el 1.127: *** empty log message ***
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.125:
 +	Fixed bug in erc-get-buffer, now channel names are compared in
 +	a case-insensitive way.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.124: erc-server-353
 +
 +2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.123: Fixed docstring for erc-get-buffer.
 +	Added erc-process to a lot of calls to erc-get-buffer, so
 +	that only the local process is searched.
 +
 +2001-11-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.122: * erc-buffer-filter: do it differently
 +
 +	* erc.el 1.121: ugly but working fix for mhp's query problem
 +
 +	* erc.el 1.120: * erc-server-PRIVMSG-or-NOTICE
 +	  Now, all the server word replies are finished. Going to numreplies now
 +
 +	* erc.el 1.119:
 +	* debugging fascilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
 +
 +	* erc.el 1.118: * erc-server-KICK and erc-server-TOPIC. new functions
 +	* erc-server-305-or-306 and erc-server-311-or-314
 +
 +	* erc.el 1.117:
 +	* ported PART and QUIT msgs to the new scheme, many to go. but it is a easy task. does someone wanna try and start with numreplies?
 +
 +	* erc.el 1.116: * erc-server-JOIN
 +
 +	* erc.el 1.115: * Ported erc-server-INVITE code
 +
 +	* erc.el 1.114: * erc-server-ERROR and erc-server-MODE
 +
 +2001-11-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.113: * zen
 +
 +	* erc.el 1.112: * New variable erc-connect-function.
 +
 +	* erc.el 1.111:
 +	* New function erc-channel-p and use it where appropriate
 +
 +	* erc.el 1.110: * Removed the variable erc-buffer-list completely now
 +	* Moved erc-dbuf around a bit
 +
 +	* erc.el 1.109: * Fix silly change in quit/rename msg handling
 +
 +	* erc.el 1.108: thanks mhp, fixed
 +
 +	* erc.el 1.107: * Tijs van Bakel's work from 10th Nov. merged in
 +	* My additions to that idea merged in too
 +	Basicly, this is a major rewrite, if you are scared and want avoid problems,
 +	stay at your current version. It seems fairly stable though.
 +	That changed? erc-buffer-name handling was completely rewritten,
 +	and erc-buffer-list local variable handling removed.
 +	Simplifies alot of code. Poke at it. read the diff. report bug/send patches!
 +
 +	* erc.el 1.106: * Added variable listing when /set is used without args
 +
 +2001-11-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.105:
 +	* Comment/structure cleanup, removal of unnecessary code
 +
 +	* erc.el 1.104: only some code beautification
 +
 +	* erc-imenu.el 1.2:
 +	remove add-hook call, thats done in erc.el now for autoloadability
 +
 +	* erc.el 1.103: * Make erc-imenu autoloadable
 +
 +	* erc.el 1.102:
 +	* The long promised erc-mode-line-format handling rewrite
 +	   Poke at it, try it, play with it, report bugs
 +
 +	* erc.el 1.101:
 +	some regex-quote fixes, new function erc-cmd-set, and minor things
 +
 +2001-11-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.100:
 +	* added second timestamp-format (erc-away-timestamp-format) for marking msgs when being away
 +
 +	* erc-complete.el 1.2: fixed silly deffun
 +
 +	* erc.el 1.99: * Rewrote erc-load-irc-script (simplified)
 +	* Removed depricated code
 +
 +	* erc-speak.el 1.15: * reflect changes in erc.el
 +
 +	* erc.el 1.98:
 +	* Moved completion related functions into erc-complete.el
 +	  placed an autoload instead into erc.el. That quite cool,
 +	  because erc-complete.el only gets loaded when you use
 +	  TAB first time in erc.
 +
 +	* erc-complete.el 1.1: _ Initial checkin
 +
 +	* erc.el 1.97: * New function: erc-chain-hook-with-args
 +	* Changed calls to erc-insert-hook to use it
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.96: * Patch from Fabien Penso
 +	  Make completion case insensitive. try it! its cool
 +
 +	* erc.el 1.95: * Reduction patch 2
 +	  This time, we move the input ring handling into erc-ring.el
 +	  Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
 +	  And remeber, that you dont need it if you dont use input ring :-)
 +
 +	* erc-ring.el 1.1: * Initial checkin
 +
 +	* erc.el 1.94: * The great reduction patch :-)
 +	  moved relevant function from erc.el to new file erc-menu.el and erc-imenu.el
 +
 +	* erc-imenu.el 1.1: nitial version
 +
 +	* erc-menu.el 1.1: * Initial version
 +
 +	* erc.el 1.93: * wording change suggested by Benjamin Drieu
 +
 +2001-11-07  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.92: Added Emacs version to /SV
 +
 +2001-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.91: * Hookification patch, read the diff
 +
 +	* erc.el 1.90: too tired for a changelog :)
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.89:
 +	* make erc-cmd-op and erc-cmd-deop take multiple nicknames as argument
 +
 +2001-11-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.7: sync
 +
 +	* debian/rules 1.4: fixed a typo: PKGDIR, not PKIDR
 +
 +2001-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.88:
 +	* Changed timestamping when away to use erc-timestamp-format and append the timestamp instead of prepending it..
 +	* minor cleanup, s/(if (not /(unless/ and thelike
 +
 +2001-11-06  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.87: Fixed OP and DEOP commands to return T.
 +	Added SV say-version command.
 +	Added erc-send-message utility function, but it's not used everywhere yet.
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.86: stupid delYsid, forgot require 'format-spec. good nite
 +
 +	* erc.el 1.85:
 +	* new variable erc-action-format. Some erc-notice-prefix fixes again
 +
 +	* erc.el 1.84: * erc-minibuffer-privmsg defaults to t
 +
 +	* erc.el 1.83:
 +	* Small fix in relation to the transition to erc-make-notice
 +
 +2001-11-05  Tijs van Bakel  <smoke@wanadoo.nl>
 +
 +	* erc.el 1.82:
 +	Renamed erc-message-notices to erc-minibuffer-notice, and renamed erc-prevent-minibuffer-privmsg to erc-minibuffer-privmsg, inverting its functionality
 +
 +	* erc.el 1.81: Added support for channel names starting with & + and !.
 +	Also, many changes partially discussed on the mailinglist:
 +
 +		* erc.el (cl): Add requirement for cl package.
 +		(erc-buffer-list): Make this variable global again.
 +		(erc-default-face): Fix typo.
 +		(erc-timestamp-face): Add face for timestamps.
 +		(erc-join-buffer, erc): Add a 'bury option.
 +		(erc-send-action): Add timestamp.
 +		(erc-command-table): Add /CLEAR, /DEOP, /OP, /Q.
 +		(erc-send-current-line): Add timestamp.
 +		(erc-send-current-line): Add call to erc-insert-hook.
 +		(erc-cmd-clear): New command to clear buffer contents.
 +		(erc-cmd-whois): Fix cut'n'paste-o.
 +		(erc-cmd-deop): New command to deop a user.
 +		(erc-cmd-op): New command to op a user.
 +		(erc-make-notice): Moved a lot of duplicate code here.  Perhaps
 +		this should also be done for erc-highlight-error.
 +		(erc-parse-line-from-server): Now NOTICE will also open a new
 +		query, just as PRIVMSG.
 +		(erc-parse-line-from-server): Call erc-put-text-property on a
 +		channel message/notice first, before concatenating nick and
 +		timestamp &c.
 +		(erc-message-notices): Add option to display notices in
 +		minibuffer.
 +		(erc-fill-region): No longer strip spaces in front of incoming
 +		messages.
 +		(erc-parse-current-line): No longer strip spaces in front of text
 +		input by user.
 +
 +	Hopefully I didn't break too much :(
 +
 +2001-11-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.80:
 +	* New function erc-nickserv-identify-autodetect for erc-insert-hook. Added by default currently.
 +
 +	* erc.el 1.79:
 +	* Mini-fix in erc-process-num-reply (= n 353): Added @ as prefix character to make certain channels on opn work again nicely
 +
 +2001-10-31  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.6: updated to reflect changes
 +
 +	* debian/scripts/install.in 1.2:
 +	moved #PKGFLAG# before -f batch-byte-compile
 +
 +2001-10-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.78:
 +	Imenu fixed somehow, added IRC services interactive function for indentify to NickServ. Read the diff
 +
 +2001-10-26  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.5: sigh. -2
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.4: updated to reflect changes
 +
 +	* debian/rules 1.3: handle conffiles.in too
 +
 +	* debian/maint/conffiles.in 1.1: new file
 +
 +	* debian/maint/conffiles 1.2: superceded by conffiles.in
 +
 +	* debian/scripts/startup 1.2: superceded by startup.erc
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/startup.erc-speak 1.1: * Initial version
 +
 +	* debian/scripts/startup.erc 1.1: * Added and fixes minimal typo
 +
 +2001-10-25  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.3: updated to reflect changes
 +
 +	* debian/rules 1.2:
 +	modified to be able to build the erc-speak package too
 +
 +	* debian/control 1.2: added the new erc-speak package
 +
 +	* debian/README.erc-speak 1.1, debian/maint/postinst.in 1.1, debian/maint/prerm.in 1.1, 
 +	  debian/scripts/install.in 1.1, debian/scripts/remove.in 1.1:
 +	new file
 +
 +	* debian/maint/postinst 1.2, debian/maint/prerm 1.2, debian/scripts/install 1.2, 
 +	  debian/scripts/remove 1.2:
 +	removed, superceded by it's .in counterpart
 +
 +2001-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.77: * Fixed some defcustom :type 's
 +	* Added erc-before-connect hook which gets called with server port and nick.
 +	  Use this hook to e.g. setup a tunnel before actually connecting.
 +	  something like (when (string= server "localhost") ...)
 +
 +2001-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.76: * Patch by smoke: fix erc-cmd-* commands and add aliases
 +
 +2001-10-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.14:
 +	* Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
 +	  especially if you are on more than one channel simultaniously.
 +
 +	* erc.el 1.75:
 +	* Made the completion postfix customizable through erc-nick-completion-postfix
 +
 +	* erc-speak.el 1.13, erc.el 1.74:
 +	* Added erc-prevent-minibuffer-privmsg
 +
 +	* erc-speak.el 1.12:
 +	* Quickish hack to allow exclusion of timestamps from speaking. see erc-speak-filter-timestamps
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-speak.el 1.11:
 +	* Removed now really obsolete code. Package size reduced by 50%
 +
 +	* erc-speak.el 1.10:
 +	* Very important fix! Now erc-speak is really complete. Messages dont get cut anymore. Be sure to use auditory icons, 
 +	  it's reallllly cool now!!!
 +
 +	* erc-speak.el 1.9: *** empty log message ***
 +
 +	* erc-speak.el 1.5: * Major simplification. depends on erc.el,v 1.73
 +	* Things removed, read diff
 +
 +2001-10-21  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.2: oops, silly typo
 +
 +	* debian/changelog 1.1, debian/control 1.1, debian/copyright 1.1, 
 +	  debian/maint/conffiles 1.1, debian/maint/postinst 1.1, debian/maint/prerm 1.1, 
 +	  debian/rules 1.1, debian/scripts/install 1.1, debian/scripts/remove 1.1, 
 +	  debian/scripts/startup 1.1:
 +	initial check-in
 +
 +2001-10-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.73:
 +	* Changed erc-insert-hook to get two arguments, START and END of the region
 +	  which got inserted. CAREFUL! This could break stuff, but it makes the hook
 +	  much more useable.
 +
 +	* erc.el 1.72:
 +	* Made erc-smiley a new option, currently set to t to showoff this feature. :)
 +
 +2001-10-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.71: * Add missing erc-mode-hook variable
 +	* Add smiley-support (preliminary test)
 +
 +2001-10-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.70:
 +	Replaced all occurences of put-text-property with a call to
 +	erc-put-text-property.
 +	(erc-put-text-property): New function.
 +	(erc-tracking-modified-channels): Moved to the front of the file such
 +	that it is already defined when the menu is being defined.
 +	(erc-modified-channel-string): Ditto.
 +
 +2001-10-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.69: Removed some commentary.  The wiki page is the place to
 +	put such information.
 +	(erc-fill-prefix): Doc change.
 +	(erc-notice-highlight-type): Doc change, now a user option.
 +	(erc-pal-highlight-type): Doc change, now a user option.
 +	(erc-fool-highlight-type): New option.
 +	(erc-keyword-highlight-type): New option.
 +	(erc-dangerous-host-highlight-type): New option.
 +	(erc-uncontrol-input-line): Doc change.
 +	(erc-interpret-controls-p): Doc change, now a user option.
 +	(erc-multiline-input): Doc change.
 +	(erc-auto-discard-away): Doc change.
 +	(erc-pals): Changed from string to regexp.
 +	(erc-fools): New option.
 +	(erc-keywords): Renamed from erc-highlight-strings.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-dangerous-hosts): Renamed from erc-host-danger-highlight.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-menu-definition): Added menu entries for fools, keywords and
 +	dangerous hosts.
 +	(erc-mode-map): Changed keybindings from C-c <plain ascii> to
 +	various C-c <C-ascii> combinations.
 +	(erc-dangerous-host-face): Renamed from erc-host-danger-face.
 +	WATCH OUT: Not backwards compatible change!
 +	(erc-fool-face): New face.
 +	(erc-keyword-face): Renamed from erc-highlight-face.  WATCH OUT:
 +	Not backwards compatible change!
 +	(erc-parse-line-from-server): Fixed highlighting in the cases
 +	where (equal erc-pal-highlight-type 'all), added code to handle
 +	erc-fool-highlight-type, erc-dangerous-host-highlight-type
 +	(erc-update-modes): Replaced erc-delete-string with delete.
 +	(erc-keywords): Renamed from erc-highlight-strings, handle
 +	erc-keyword-highlight-type.
 +	(erc-delete-string): Removed.
 +	(erc-list-match): New function.
 +	(erc-pal-p): Use erc-list-match.
 +	(erc-fool-p): New function.
 +	(erc-keyword-p): New function.
 +	(erc-dangerous-host-p): Renamed from erc-host-danger-p, use
 +	erc-list-match.
 +	(erc-directed-at-fool-p): New function.
 +	(erc-add-entry-to-list): New function.
 +	(erc-remove-entry-from-list): New function.
 +	(erc-add-pal): Use erc-add-entry-to-list.
 +	(erc-delete-pal): Use erc-remove-entry-from-list.
 +	(erc-add-fool): New function.
 +	(erc-delete-fool): New function.
 +	(erc-add-keyword): New function.
 +	(erc-delete-keyword): New function.
 +	(erc-add-dangerous-host): New function.
 +	(erc-delete-dangerous-host): New function.
 +
 +2001-10-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.68: * irc vs ircd default port fixed
 +
 +	* erc.el 1.67: * Added topic-change to imenu
 +
 +	* erc.el 1.66: * More imenu spiffyness
 +
 +	* erc.el 1.65: * Added imenu support
 +
 +	* erc.el 1.64:
 +	* Fix to /topic to show topic instead of setting it to null :)
 +
 +2001-10-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.63: * First version of erc-rename-buffer
 +
 +	* erc.el 1.62: * more header-line tricks.
 +
 +	* erc.el 1.61:
 +	* Small fix to do erc-update-mode-line-buffer in erc-update-channel-topic
 +
 +	* erc.el 1.60: * Added erc-header-line-format
 +
 +2001-10-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.59: * mini-fix, add msgp to auto-query code
 +
 +	* erc.el 1.58: * Added command-names to completion (erc-command-table)
 +	* New variable erc-auto-query. When set, every arriving message to you
 +	will open a query buffer for that sender if not already open.
 +	* Compatibility function fo non-existing line-beginning|end-position functions in XEmacs.
 +
 +2001-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.57:
 +	* Removed alot of (progn ...) where they were not necessary
 +	* Changed some (if ...) without else part to (when ...)
 +	* Some (while ...) to use (dolist ...)
 +	* Fix for completion popup generating tracebacks.
 +	* New function erc-arrange-session-in-mulptiple-windows
 +	* Lots of other stuff, read the diff
 +
 +2001-10-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.56: * Added erc-kill-input and keybinding C-c C-u for it
 +
 +2001-10-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.55: * Another fix to nick-completion
 +	* Additional checks in erc-track-modified-channels
 +
 +2001-09-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.54: * Fixed completion (alex)
 +	  * Now popup buffer doesnt destroy your window configuration.
 +	* Fixed away handling (incomplete)
 +
 +2001-09-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.53: Fixed silly quoting-escape error
 +
 +2001-09-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.52: * Added auto-op support (unfinished)
 +	* Added erc-latest-version.
 +	* Added erc-ediff-latest-version.
 +
 +2001-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.51:
 +	* Minor menu additions (invite only mode is now a checkbox)
 +
 +2001-09-20  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.50:
 +	* Fix (erc-cmd-names): This should fix C-c C-n too, hoepfully it was the right fix and doesnt break anything else.
 +
 +	* erc.el 1.49: * Fixes XEmacs easymenu usage (2nd time).
 +
 +2001-09-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.48:
 +	* (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
 +
 +	* erc.el 1.47:
 +	* Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
 +	* Fix for custom problem with :must-match on XEmacs (thanks shapr)
 +	* Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
 +	* Fix for case-sensitivity problem with pals (they are now all downcased)
 +	* Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
 +	  instead of just displaying it in the minibuffer.
 +
 +2001-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.46: Updated erc-version-string
 +
 +	* erc.el 1.45: Version number change and last read-through...
 +
 +2001-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.44: Added some asterisks
 +
 +2001-08-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.43:
 +	Fixed hidden channel buffer tracking (sort of), now using switch-to-buffer for advice.
 +	This version is unofficially named 2.1prebeta1. Please test it and send
 +	fixes to various problems you may encounter so that we can eventually
 +	release 2.1 soon.
 +
 +2001-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.42:
 +	Added function erc-bol and keybinding C-c C-a for it (contributed by Benjamin Rutt <brutt@bloomington.in.us)
 +
 +2001-08-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.41:
 +	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesnt seem to work.
 +	Removed (nick -> #channel) from mode-line. (CLOSED) and (AWAY...) should still be displayed when appropriate
 +
 +2001-08-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.40:
 +	added local-variable channel-list in session-buffers and make /LIST use it.
 +	erc-join-channel can now do completion after /LIST was executed
 +
 +2001-08-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.39: Tweaked erc-join-channel and erc-part-from-channel
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.38: some more defcustom stuff
 +
 +	* erc.el 1.37: Patch from Henrik Enberg <henrik@enberg.org>:
 +	   Adds variables erc-frame-alist and erc-frame-dedicated-p.
 +
 +	* erc.el 1.36: fixed erc-part-from-channel
 +
 +	* erc.el 1.35:
 +	fixed match-string problem and added interactive topic setting function.
 +
 +	* erc.el 1.34: fixed silly string-match bug
 +
 +	* erc.el 1.33:
 +	Added erc-join-channel and erc-part-from-channel (interactive prompts), as well as keybindings. C-c C-j #emacs RET is now enough :)
 +
 +2001-07-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.32 (erc-display-line-buffer): Simplified filling.
 +	(erc-fill-region): New function.
 +
 +2001-07-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.31: Added redundancy check in output
 +
 +2001-07-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.30 (erc-send-action): Add text-property stuff.
 +	(erc-input-action): Removed text-property stuff.
 +	(erc-command-table): Corrected command for DESCRIBE.  Still
 +	doesn't work though.  No idea what it should do.  Looks like a no op.
 +	(erc-cmd-me): Doc change.
 +
 +2001-07-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.29:
 +	fixed one occurence of a setq with only one argument (XEmacs didnt like that)
 +
 +	* erc.el 1.28:
 +	Added erc-next-line-add-newlines customisation possibility.
 +
 +	* erc.el 1.27:
 +	added erc-fill-prefix for defining your own way of filling and fixed filling somehow
 +
 +	* erc.el 1.26:
 +	fixed small incompatibility in erc-parse-line-from-server at (and (= n 353) regexp
 +
 +2001-07-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.25:
 +	Added erc-filling and filling code to erc-display-line-buffer.
 +
 +2001-07-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.24 (try-complete-erc-nick): Make the ": " part of the
 +	expansion
 +
 +	* erc.el 1.23: require ring
 +
 +2001-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.22: *** empty log message ***
 +
 +2001-07-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.21: typo
 +
 +	* erc.el 1.20: ommit
 +	:wq
 +
 +2001-07-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.19 (erc-mode): Call erc-input-ring-setup.
 +	(erc-send-current-line): Call erc-add-to-input-ring.
 +	(erc-input-ring): New variable.  Currently not buffer local.
 +	(erc-input-ring-index): New variable.  Currently not buffer local.
 +	(erc-input-ring-setup): New function.
 +	(erc-add-to-input-ring): New function.
 +	(erc-previous-command): New function.
 +	(erc-next-command): New function.
 +	(erc-mode-map): Uncommented keybindings for erc-next-command and
 +	erc-previous-command.
 +
 +2001-07-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.18 (erc-highlight-strings): Removed debug message.
 +
 +	* erc.el 1.17 (erc-join-buffer): Changed default to 'buffer.
 +	(erc-join-info-buffer): Changed default to 'disable.
 +	(erc-nick-completion): Changed default to 'all.
 +
 +2001-07-04  uid31117  <uid31117@confusibombus>
 +
 +	* erc.el 1.16: Resolved...
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.15 (erc-highlight-strings): New option and new function.
 +	(erc-parse-line-from-server): Use it.
 +	Various empty lines removed.  Various doc strings fixed.
 +
 +	* erc.el 1.14: Removed more empty lines.
 +
 +	* erc.el 1.13 (erc-member-string): replaced by plain member
 +	Otherwise, lots of deleting of empty lines...  I'm not too happy with that
 +	but I feel better when the code is "cleaned up".
 +
 +2001-07-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.12: Ugly hack, but looks nicer when giving commands
 +
 +	* erc-speak.el 1.4: ugly hack, but looks nicer now
 +
 +2001-07-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.11 (try-complete-erc-nick): New function.
 +	(erc-try-complete-nick): New function.
 +	(erc-nick-completion): New option.
 +	(erc-complete): Call hippie-expand such that erc-try-complete-nick
 +	will be called eventually.  Based on erc-nick-completion
 +	try-complete-erc-nick will then complete on the nick at point.
 +
 +2001-07-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.10:
 +	Insert (erc-current-nick) instead of (erc-display-prompt). good night :)
 +
 +	* erc.el 1.9:
 +	small, but it was anoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
 +
 +2001-06-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.8: Use defface to define all faces.
 +	Removed some history from the commentary, as well as some other
 +	commentary editing.
 +
 +2001-06-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.7: hmm, defcustom for erc-user-full-name
 +
 +	* erc-speak.el 1.3, erc.el 1.6: *** empty log message ***
 +
 +2001-06-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.5: typo
 +
 +	* erc.el 1.4: Some more defcustom
 +
 +	* erc-speak.el 1.2: nothing, really
 +
 +2001-06-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.3: Some defcustom stuff. Still no defgroup though :)
 +
 +	* erc.el 1.2:
 +	Initial change to erc.el (2.0). Mainly list of ideas and features
 +	and syntax-table entries.
 +
 +	* erc-speak.el 1.1.1.1, erc.el 1.1.1.1: Initial Import
 +
 +	* erc-speak.el 1.1, erc.el 1.1: New file.
 +
 +    Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
diff --cc ChangeLog.02
index 2d55852,0000000..85be89c
mode 100644,000000..100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@@ -1,2607 -1,0 +1,2622 @@@
 +2002-12-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.398 (erc-split-command):
 +	Removed assignment to free variable "continue".
 +	(erc-strip-controls): New function.  Takes a string, returns the string with
 +	all IRC color/bold/underline/etc. control codes stripped out.
 +	(erc-interpret-controls): If variable erc-interpret-controls-p is nil, now
 +	uses erc-strip-controls to strip control codes.
 +	(erc-ctcp-reply-ECHO): Changed reference and assignment to free variable "s"
 +	into reference/assignment to "msg", which appears to be the original author's
 +	intent.
 +
 +	* erc-list.el 1.8 (erc-chanlist):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.
 +
 +	* erc-notify.el 1.10 (erc-notify-timer):
 +	Changed to use the new erc-once-with-server-event function
 +	instead of the old macro of the same name.  Also fixed a bug were variable
 +	erc-last-ison was being read from a non-server buffer (thus giving its default
 +	value instead of its per-server value).
 +
 +	* erc.el 1.397 (erc-once-with-server-event):
 +	This is now a function.  It was a macro with a
 +	bug (the call to gensym happened at byte-compile-time not macro-call-time).
 +	(erc-toggle-debug-irc-protocol): Now [return] is bound to this function in
 +	the *erc-protocol* buffer.
 +
 +2002-12-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.10 (erc-autoaway-idletimer): Doc,
 +	ref. erc-autoaway-use-emacs-idle.
 +	(autoaway): Doc, explain different idle definitions.  Reestablish
 +	the idletimer only when erc-autoaway-use-emacs-idle is non-nil.
 +	(erc-auto-set-away): Doc, ref erc-auto-discard-away.
 +	(erc-auto-discard-away): Doc, ref erc-auto-set-away.
 +	(erc-autoaway-use-emacs-idle): Doc, ref erc-autoaway-mode, and
 +	added a note that this feature is currently broken.
 +	(erc-autoaway-reestablish-idletimer): Doc.
 +	(erc-autoaway-possibly-set-away): Split test such that
 +	erc-time-diff is only computed when necessary, add a comment why
 +	erc-process-alive is not necessary.
 +	(erc-autoaway-set-away): Test for erc-process-alive.
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.9:
 +	Changed the order of defcustoms to avoid errors in the :set property
 +	of erc-autoaway-idle-seconds.
 +
 +2002-12-29  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.42:
 +	* (erc-track-get-active-buffer): remove superflous (+ arg 0)
 +
 +2002-12-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.8 (erc-autoaway): Moved the defgroup up to the
 +	top, before the define-erc-module call.
 +	(autoaway): Extended doc.
 +	(erc-autoaway-idle-seconds): Use a :set property to handle
 +	erc-autoaway-use-emacs-idle.
 +	(erc-auto-set-away): Set default to t.  Added doc strings where
 +	necessary, reformatted doc strings such that the first line can
 +	stand on its own.  This is important for the output of M-x
 +	apropos.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-auto.in 1.3:
 +	added (provide 'erc-auto), which is required for (require 'erc-auto) :)
 +
 +	* erc.el 1.396 (erc-display-prompt):
 +	Set the face property of the prompt to
 +	everything but the last character.
 +
 +	* erc.el 1.395 (erc-send-current-line):
 +	Check wether point is in the input line. If
 +	not, just beep and do nothing.
 +
 +2002-12-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.394 (erc-bol):
 +	Fixed bug when there is only a prompt, and no property
 +	change.
 +
 +	* erc.el 1.393 (erc-display-prompt): Rewrote using a save-excursion
 +	and erc-propertize.  No longer use a field for the prompt, but a
 +	plain text property called erc-prompt.
 +	(erc-bol): Use the erc-prompt text property instead of a field.
 +	Return point instead of t.
 +	(erc-parse-current-line): No need to call point here, then, since
 +	erc-bol now returns point.
 +
 +	* Makefile 1.11:
 +	make ChangeLog .PHONY, thus forcing it always to be rebuilt.
 +
 +2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.392 (erc-log-irc-protocol):
 +	Removed check wether get-buffer-create
 +	    returned nil. "The value is never nil", says the docstring.
 +
 +	* erc.el 1.391: Day Of The Small Changes
 +
 +	(erc-display-prompt): Make the prompt 'front-sticky, which prevents it
 +	    from being modified. It *should* also make end-of-line move to the
 +	    end of the field (i.e. the end of the prompt) when point is at the
 +	    beginning of the prompt, but it doesn't. Dunno why. :(
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.10:
 +	Added "-f" to "rm" command in rule for target "realclean".
 +
 +	* erc.el 1.390:
 +	New function: erc-log-irc-protocol.  Consolidates nearly duplicate code
 +	from functions erc-send-command and erc-process-filter into one function.
 +
 +	* erc.el 1.389 (erc-toggle-debug-irc-protocol):
 +	Removed unneeded argument PREFIX and code
 +	which referenced it at end of function.
 +	(erc-send-command): Now we only append a newline to the logged copy
 +	of output protocol text if it doesn't have one.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.388 (erc-toggle-debug-irc-protocol):
 +	Display buffer if it's not shown
 +	    already, and use view-mode.
 +	(erc-toggle-debug-irc-protocol), (erc-send-command),
 +	    (erc-process-filter): inhibit-only t to insert into the
 +	    *erc-protocol* buffer (view-mode)
 +
 +2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.387 (erc-mode-map):
 +	Removed keybinding for erc-toggle-debug-irc-protocol.
 +	(erc-toggle-debug-irc-protocol): Now used erc-make-notice to propertize the
 +	face of the enabled/disabled messages in the *erc-protocol* buffer.
 +	(erc-send-command): Now outgoing IRC protocol traffic is logged too.
 +
 +	* erc.el 1.386:
 +	Added user-customizable variable erc-debug-irc-protocol.
 +	Added function erc-toggle-debug-irc-protocol.
 +	(erc-process-filter): Now supports IRC protocol logging.  If variable
 +	erc-debug-irc-protocol is non-nil, all IRC protocol traffic is appended
 +	to buffer *erc-protocol*, which is created if necessary.
 +
 +2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.385 (erc-display-prompt):
 +	Don't make the prompt intangible; that didn't
 +	    make things that much better for the user, but confused ispell,
 +	    which checked the prompt when it should check the first word
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.4: fixed resolve's email add
 +
 +	* AUTHORS 1.3: added damien
 +
 +	* erc.el 1.384 (erc-truncate-buffer-on-save):
 +	Removed documentation that
 +	described behaviour now changed.  It used to say "When nil, no
 +	buffer is ever truncated."  This is no longer true; even when
 +	buffers are NOT truncated on save, they can be truncated, eg. by
 +	adding erc-truncate-buffer to the hook.
 +	(erc-logging-enabled): New function.
 +	(erc-current-logfile): New function.
 +	(erc): Use erc-logging-enabled and erc-current-logfile.
 +	(erc-truncate-buffer-to-size): Rewrote it, and made sure to use a
 +	(save-restriction (widen) ...) such that the truncation actually
 +	runs in the whole buffer, not in the last message only (as
 +	erc-insert-post-hook will do!).  This should fix rw's
 +	out-of-bounds error.
 +	(erc-generate-log-file-name-short): Made all but the BUFFER
 +	argument optional.  Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-generate-log-file-name-long): Doc: Mention
 +	erc-generate-log-file-name-function.
 +	(erc-save-buffer-in-logs): Use erc-logging-enabled and
 +	erc-current-logfile.  Doc: Mention erc-logging-enabbled.
 +
 +	(erc-encode-string-for-target): Only do the real work when
 +	featurep mule; else just return the string unchanged.
 +
 +2002-12-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.383:
 +	erc-encoding-default: check for (coding-system-p) for older emacs versions
 +
 +	* erc.el 1.382 (erc-connect): missing ()s added. "don't commit at 2am"
 +
 +	* erc.el 1.381 (erc-connect):
 +	check if (set-process-coding-system) is available before use
 +
 +2002-12-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* AUTHORS 1.2: added franl
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.14 (pcomplete-parse-erc-arguments):
 +	Reworked, and fixed a bug that had
 +	caused completions to corrupt preceding text under some circumstances.
 +
 +	* erc.el 1.380 (erc-encoding-default): New.
 +	(erc-encode-string-for-target): Use it instead of a hard-coded ctext.
 +	(erc-encoding-coding-alist): Doc.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.379:
 +	Removed fix for bug 658552 recently checked-in, because it doesn't work.
 +
 +	* erc.el 1.378 (erc-kill-buffer-function):
 +	Removed check that connection is up
 +	before running erc-kill-server-hook hooks.  Those hooks should use
 +	erc-process-alive to avoid interacting with the process.
 +
 +	* erc.el 1.377:
 +	Fixed erc-send-current-line so it no longer assigns the free variable "s", and
 +	it doesn't move point to end-of-buffer in non-ERC buffers.  Fixed
 +	erc-kill-buffer-function so it doesn't run the erc-kill-server-hook hooks if the
 +	server connection is closed.  Fixed bug 658552, which is described in detail at
 +	http://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125
 +
 +2002-12-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.376 (erc-cmd-SMV): Bug, now call erc-version-modules.
 +
 +	* erc-pcomplete.el 1.13 (erc-pcomplete-version): New.
 +
 +2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el 1.12:
 +	Fix for bug where you could not complete a nick when there was text following
 +	the nick.
 +
 +2002-12-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.375 (erc-already-logged-in): Use erc-process-alive.
 +	(erc-prepare-mode-line-format): Use erc-process-alive.
 +	(erc-process-alive): Check erc-process for boundp and processp.
 +
 +	* erc.el 1.374 (erc-kill-buffer-function):
 +	Do not check wether the process is
 +	alive before running the hook, because there might be functions on
 +	the hook that need to run even when the process is dead.  And
 +	function that wants to check this, should use (erc-process-alive).
 +	(erc-process-alive): New function.
 +	(erc-kill-server): Use it.
 +	(erc-kill-channel): Use it.
 +
 +	* erc.el 1.373 (erc-kill-buffer-function):
 +	Reverted ignore-error change.
 +	ignore-error is dangerous because we might miss bugs in functions
 +	on erc-kill-server-hook.
 +
 +	* erc.el 1.372 (erc-kill-buffer-function): Use memq instead of member
 +	when checking process-status.  Added doc string with references to
 +	the other hooks.
 +	(erc-kill-server): Only send the command when the erc-process is
 +	still alive.  This prevents the error: "Process
 +	erc-irc.openprojects.net-6667 not running" when killing the buffer
 +	after having used /QUIT.
 +
 +2002-12-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.371 (erc-server-ERROR):
 +	Show the error reason, not only the originating host.
 +
 +	* erc.el 1.370 (erc-kill-buffer-function):
 +	(ignore-errors ...) in 'erc-kill-server-hook.
 +	    When the process for this server does not exist anymore, the hook
 +	    will cause an error, effectively preventing the buffer from being
 +	    killed.
 +
 +2002-12-24  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.9:
 +	Fixed erc-notify-timer so that it passes the correct nick to
 +	the functions on erc-notify-signoff-hook.
 +
 +2002-12-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.41: Doc
 +
 +	* erc-track.el 1.40 (erc-make-mode-line-buffer-name): Removed a
 +	superfluous if construct around erc-track-showcount-string.
 +	(erc-track-modified-channels): Use 1+.
 +	Plus some doc and comment changes.
 +
 +2002-12-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.369: Fix (erc-version) string
 +
 +2002-12-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.368:
 +	Removed unnecessary assignment to free-variable "p" in erc-downcase.
 +
 +	* erc.el 1.367:
 +	Now /PART reason strings are generated the same way /QUIT reason strings
 +	are generated (see variable erc-part-reason).  Also, when a server buffer
 +	is killed, a QUIT command is automatically sent to the server.
 +
 +	* erc.el 1.366:
 +	Changed erc-string-no-properties so that it is more efficient.  Now it uses
 +	set-text-properties instead of creating and deleting a temporary buffer.
 +
 +2002-12-21  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.365:
 +	erc-kill-input: added a check to prevent a (ding) and an error when
 +	    there's nothing to kill (thanks to Francis Litterio, franl on IRC)
 +
 +2002-12-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.364:
 +	AWAY notice duplication prevention. erc-prevent-duplicates now set to ("301") by default, and timeout to 60
 +
 +	* erc.el 1.363: erc-prevent-duplicates: New variable, see docstring
 +
 +2002-12-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.39:
 +	erc-track-modified-channels: Use cddr of cell for old-face. cdr of
 +	    cell is '(1 . face-name), i have no idea why :)
 +
 +2002-12-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.362 (erc-current-nick):
 +	check the server buffer is active before using
 +
 +	Also tabified and cleaned up some trailing whitespace
 +
 +2002-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.38: erc-track-count patch by az
 +
 +2002-12-14  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.361:
 +	last-peers: initialise to a cons. thanks to Francis Litterio
 +	    <franl@world.std.com> for the patch
 +
 +	* erc.el 1.360:
 +	erc-kill-channel-hook, erc-kill-buffer-hook, (erc-kill-channel):
 +	    both hooks now call erc-save-buffer-in-logs, so that query buffers are
 +	    saved properly now, and not just channel buffers.
 +
 +2002-12-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.37 (erc-unique-channel-names): Fix another #hurd
 +	vs. #hurd-bunny bug.
 +
 +	* erc-match.el 1.17 (match): No longer modify erc-send-modify-hook,
 +	since it does not work without a parsed text property, anyway.
 +	(erc-keywords): Allow cons cells.
 +	(erc-remove-entry-from-list): Deal with cons cells.
 +	(erc-keyword-p): Ditto.
 +	(erc-match-message): Ditto.
 +
 +	Moved nil to the beginning of the list, removed :tags for the
 +	-type variables:
 +	(erc-current-nick-highlight-type): Ditto.
 +	(erc-pal-highlight-type): Ditto.
 +	(erc-fool-highlight-type): Ditto.
 +	(erc-keyword-highlight-type): Ditto.
 +	(erc-dangerous-host-highlight-type): Ditto.
 +	(erc-log-matches-flag): Moved nil to the beginning.
 +
 +2002-12-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.359:
 +	erc-beg-of-input-line: Don't do (goto-char (beginning-of-line)), since
 +	    beginning-of-line always moves point and returns nil. Thanks to
 +	    franl on IRC for noting this.
 +
 +	* erc-stamp.el 1.20:
 +	erc-insert-timestamp-left, erc-insert-timestamp-right: Made the
 +	    timestamp a 'field named 'erc-timestamp. Now end-of-line and
 +	    beginning-of-line will move over the timestamp.
 +
 +2002-12-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.34 (erc-button-add-button):
 +	make the created button rear-nonsticky, to allow
 +	cutting and pasting of buttons without worrying about the button properties
 +	being inherited by the text typed afterwards.
 +
 +	* erc.el 1.358: save logfile when killing buffer
 +
 +2002-12-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.36 (erc-modified-channels-display): Reworked.
 +	(erc-track-face-more-important-p): Removed.
 +	(erc-track-find-face): Return only one face.
 +	(erc-track-modified-channels): Reworked.
 +	(erc-modified-channels-string): Changed from (BUFFER FACE...) to
 +	(BUFFER . FACE)
 +
 +	* erc-stamp.el 1.19 (erc-insert-timestamp-right): Do not assume
 +	erc-fill-column is available.
 +
 +2002-12-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.357:
 +	erc-ech-notices-in-minibuffer-flag, erc-minibuffer-notice: Clarified
 +	    the difference in the docstrings.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.356: erc-noncommands-list: added erc-cmd-SM and erc-cmd-SMV
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.355 (erc-cmd-SM): New.
 +	(erc-cmd-SMV): New.
 +
 +	* erc.el 1.354 (erc-modes): New.
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.9:
 +	field-end: use (not (fboundp 'field-end)) instead of (featurep 'xemacs)
 +
 +2002-12-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.353 (erc-version-modules): New.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/changelog 1.19, debian/control 1.7, debian/scripts/startup.erc 1.3:
 +	debian release 3.0.cvs.20021208
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.352 (erc-split-command): Do the right thing with CTCPs.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.18: Be a bit more functional
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-compat.el 1.8:
 +	XEmacs doesn't seem to have field-end, so we provide our own version here.
 +
 +2002-12-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.9: Small fixes to debrelease target
 +
 +2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.351:
 +	make-obsolete-variable: xemacs doesn't have the WHEN parameter, remove it.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-imenu.el 1.5 (erc-create-imenu-index):
 +	Use (forward-line 0) instead of
 +	  (beginning-of-line) now, sine the latter ignores fields (used in the
 +	  prompt).
 +
 +	* erc.el 1.350:
 +	Rewrite of the prompt stuff to use a field named 'erc-prompt:
 +
 +	erc-prompt: Removed getter and setter functions. The properties were
 +	  already set (and overwritten) in erc-display-prompt.
 +	(erc-prompt): Add the trailing space here, not all over the code.
 +	(erc-display-prompt): Cleaned up a bit. The text-properties now are
 +	  valid on the whole prompt. Also, made the prompt 'intangible to
 +	  avoid confused users.
 +	(erc-bol): Now use the field 'erc-prompt for finding the prompt
 +	(erc-parse-current-line): Cleaned up considerably. Uses (erc-bol) now.
 +	(erc-load-irc-script-lines): Adjusted for the new (erc-prompt).
 +	(erc-save-buffer-in-logs): Adjusted for the new (erc-prompt).
 +
 +	* erc.el 1.349:
 +	erc-uncontrol-input-line: The comment said "Consider it deprecated",
 +	so I removed it now.
 +	erc-prompt-interactive-input: Marked obsolete as of 1.348
 +
 +	* erc.el 1.348:
 +	erc-smiley, erc-unmorse: Put at the end to separate it from the
 +	important parts of erc.el.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.17 (erc-insert-timestamp-right): New algorithm.
 +
 +2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.347:
 +	last-peers, erc-message: Explained what last-peers is used for.
 +
 +2002-12-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.3 (erc-cmd-PAGE): New function.
 +	(erc-ctcp-query-PAGE): Use the catalog entry for the message, too.
 +	(erc-ctcp-query-PAGE-hook): Added custom type.
 +	(erc-page-function): Changed custom type from ... function-item to
 +	... function.
 +	As well as doc strings.
 +
 +2002-12-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-page.el 1.2: provide feature at the end
 +
 +2002-12-06  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-nickserv.el 1.10:
 +	Added austnet in erc-nickserv.el (thanks to Damien Elmes
 +	<resolve@repose.cx>)
 +
 +2002-12-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.13: Add autoload cookie
 +
 +	* erc-speak.el 1.24: Small fix to make proper voice-changes
 +
 +2002-12-05  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-lang.el 1.1: New
 +
 +2002-12-03  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.346:
 +	erc-mode-map: Put back C-c C-p (PART) and C-c C-q (QUIT)
 +
 +2002-12-02  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.345:
 +	erc-insert-post-hook: Add :options erc-make-read-only, erc-save-buffer-in-logs
 +	erc-send-post-hook: Add :options erc-make-read-only
 +
 +	* erc.el 1.344: erc-insert-hook: Removed ("this hook is obsolescent")
 +	erc-insert-post-hook: Added :options '(erc-truncate-buffer)
 +
 +2002-12-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.343: Add missing requires
 +
 +2002-11-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.342 (erc-quit-reason-normal):
 +	Remove v before %s so it's "Version ..." not
 +	   "vVersion ..."
 +
 +2002-11-26  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.7 (erc-encode-coding-string): Add second argument
 +		coding-system, and for non-mule xemacsen, use a new defun instead
 +		of identity.
 +
 +	* erc.el 1.341:  (define-erc-module): Use the appropriate group.
 +	(erc-port): Changed custom type.
 +	(erc-insert-hook): Custom group changed to erc-hooks.
 +	(erc-after-connect): ditto
 +	(erc-before-connect): ditto
 +	(erc-disconnected-hook): ditto
 +
 +	* erc-button.el 1.33 (erc-button): New group, changed all custom groups
 +	from erc to erc-button, but left all erc-faces as-is.
 +
 +	* erc-track.el 1.35 (erc-track): New group, changed all custom groups
 +	from erc to erc-track.
 +
 +2002-11-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-macs.el 1.1:
 +	Macros for erc-victim handling.  Primary idea is to use setf and some fancy things to get nice syntax. have a look
 +
 +2002-11-26  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.340:
 +	pings, erc-cmd-PING, erc-ctcp-reply-PING, catalog entry CTCP-PING:
 +	Cleaned up. Removed buffer-local variable pings which stored a list of
 +	all sent CTCP PING requests. Now send our full time with the CTCP PING
 +	request and interpret the answer.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.339: nick-stk: replaced by the local variable current-nick.
 +
 +2002-11-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.338 (erc-send-command): Use erc-encode-string-for-target.
 +	(erc-encode-string-for-target): New.
 +
 +	* erc-compat.el 1.6 (erc-encode-coding-string): Add second argument
 +	coding-system, and for non-mule xemacsen, use a new defun instead
 +	of identity.
 +
 +	* erc-nickserv.el 1.9 (erc-nickserv-version): New.
 +
 +2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* Makefile 1.8:
 +	UNCOMPILED: erc-chess.el depends on chess-network.el, which might not
 +	be installed. Don't compile it.
 +
 +	* erc.el 1.337:
 +	erc-mode-map: Added C-a as erc-bol (no reason why it shouldn't be),
 +	and removed C-c C-p (part channel) and C-c C-q (quite server) as these
 +	are a bit drastic in their consequences and easy to mistype.
 +
 +2002-11-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.34: erc-track-faces-priority-list: Extended list
 +
 +	* erc.el 1.336:
 +	channel-members: Updated docstring: We have a VOICE predicate, too.
 +
 +	* erc-track.el 1.33 (erc-unique-substrings):
 +	Don't shorten a single channel to "#", but
 +	always give at least 2 chars (except when there are no two chars).
 +
 +2002-11-23  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-nickserv.el 1.8:
 +	support for BrasNET. Thanks to rw on IRC for the settings.
 +
 +2002-11-23  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.335: (erc-default-recipients, erc-session-user-full-name)
 +		(nick-stk, pings, erc-announced-server-name, erc-connected)
 +		(channel-user-limit, last-peers, invitation, away, channel-list)
 +		(last-sent-time, last-ping-time, last-ctcp-time, erc-lines-sent)
 +		(erc-bytes-sent, quitting, bad-nick, erc-logged-in)
 +		(erc-default-nicks): Defvars.
 +
 +	* erc-compat.el 1.5: Switched tests to iso-8859-1 instead of latin-1.
 +
 +	* erc-compat.el 1.4 (erc-compat-version): New.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.334 (smiley): Smileys are a very small module, now.
 +
 +2002-11-22  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.333:
 +	erc-event-to-hook, erc-event-to-hook-name: eval-and-compile these,
 +	    since we need them in a macro. ERC now compiles again!
 +
 +	* erc-speak.el 1.23:
 +	erc-minibuffer-privmsg: Removed setting this variable to nil, since it
 +	    was removed from erc.el.
 +
 +	* erc.el 1.332 (erc-interactive-input-map): Added docstring.
 +	(erc-wash-quit-reason): Extended docstring.
 +	(erc-server-ERROR): Added docstring.
 +	(erc-server-321): buffer-local variable channel-list probably
 +	    shouldn't be renamed erc-channel-list - removed FIXME.
 +
 +	* erc.el 1.331: small cleanup.
 +	("was not used anymore" here means "not used in erc/*.el nor in
 +	fsbot", thanks to deego for checking that.)
 +
 +	erc-minibuffer-privmsg: Removed (was not used anymore)
 +	(erc-reformat-command): Removed (was not used anymore)
 +	(erc-strip-erc-parsed-property): Removed (was not used anymore)
 +	(erc-process-ctcp-response): Removed (replaced by ctcp-query-XXX-hook)
 +	(erc-send-paragraph): Removed ("Note that this function is obsolete,
 +	    erc-send-current-line handles multiline input.")
 +	(erc-input-hook): Removed ("This hook is obsolete. See
 +	    `erc-send-pre-hook', `erc-send-modify-hook' and
 +	    `erc-send-post-hook' instead.")
 +	(erc-message-hook): Removed ("This hook is obsolete. See
 +	    `erc-server-PRIVMSG-hook' and `erc-server-NOTICE-hook'.")
 +	(erc-cmd-default-channel): Removed ("FIXME: no clue what this is
 +	    supposed to do." - it was supposed to prepend the default channel
 +	    to a command before sending it. E.g. typing "/FOO now!" would send
 +	    the IRC command "FOO #mycurrentchannel now!")
 +
 +	* erc.el 1.330:
 +	erc-ctcp-query-PING: Send the whole argument back, not just the first
 +	number. This is required for many clients (e.g. irssi, BitchX, ...)
 +	which send their ping times in two different numbers for microsecond
 +	accuracy.
 +
 +2002-11-22  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.32 (erc-track-shorten-function): Allow nil.
 +
 +2002-11-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.31 (erc-unique-channel-names): Fixed bug that appeared
 +	if one target name was a substring of another -- eg. #hurd and
 +	#hurd-bunny.  Added appropriate test.
 +
 +2002-11-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.30:
 +	erc-unique-channel-names: Don't take a substring of channel that could
 +	be longer than the channel, but at most (min (length candidate)
 +	(length channel). (thanks to deego for noticing this)
 +
 +2002-11-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.8: * (require pcomplete): Only when compiling.
 +
 +2002-11-19  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.29:
 +	erc-track-faces-priority-list: New variable, defines what faces will
 +	be shown in the modeline. If set to nil, the old behavior ("all")
 +	remains.
 +	erc-track-face-more-important-p: new function
 +	erc-track-find-face: new function
 +
 +2002-11-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-fill.el 1.20 (erc-stamp): Require it.
 +
 +	* erc-match.el 1.16 (away): devar for the compiler.
 +
 +	* erc-stamp.el 1.16 (stamp): Moved.
 +
 +	* erc.el 1.329 (erc-version-string): New version.
 +
 +	* erc-autoaway.el 1.7 (erc-autoaway-idletimer): Moved to the front of
 +	the file.
 +
 +	* erc-auto.in 1.2: (generated-autoload-file, command-line-args-left):
 +	Added defvar without value to silence byte compiler.
 +
 +	* Makefile 1.7 (realclean): renamed fullclean to realclean.
 +	(UNCOMPILED): New list, for erc-bbdb.el, erc-ibuffer.el,
 +	erc-speak.el.
 +	(SOURCE): Do not compile UNCOMPILED.
 +	(release): New target.
 +	(ChangeLog): New target.
 +	(todo): New target.
 +
 +	* erc-complete.el 1.12 (erc-match): Require it.
 +	(hippie-exp): Require it.
 +
 +	* erc-ezbounce.el 1.3 (erc): Require it.
 +
 +	* erc-imenu.el 1.4 (imenu): Require it.
 +
 +	* erc-nickserv.el 1.7 (erc-networks): Moved up.
 +
 +	* erc-notify.el 1.7 (pcomplete): Require it.
 +
 +	* erc-replace.el 1.5 (erc): Require it.
 +
 +	* erc-sound.el 1.3 (sound): Typo -- define-key in erc-mode-map.
 +
 +	* erc-speedbar.el 1.10 (dframe): Require it.
 +	(speedbar): Require it.
 +
 +	* erc-track.el 1.28 (erc-default-recipients): devar for the compiler.
 +
 +	* README 1.1: New file.
 +
 +2002-11-18  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.1: File needed for mkChangeLog
 +
 +	* mkChangeLog 1.1: Original code by mhp
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.32 (erc-button-list): Renamed to erc-list and moved
 +	to erc.el.
 +
 +	* erc.el 1.328 (erc-list): New.
 +
 +	* erc-track.el 1.27 (erc-make-mode-line-buffer-name): Simplified.
 +	(erc-modified-channels-display): Simplified.  Now works with all
 +	faces, and fixes the bug that when two faces where used (bold
 +	erc-current-nick-face), then no faces was added.
 +
 +	* erc-track.el 1.26: Lots of new tests.  Moved some defuns around in
 +	the file.
 +	(erc-all-channel-names): Renamed.
 +	(erc-all-buffer-names): New name, now include query buffers as
 +	well.
 +	(erc-modified-channels-update-inside): New variable.
 +	(erc-modified-channels-update): Use it to prevent running display
 +	if already inside it.  This prevented debugging of
 +	`erc-modified-channels-display'.
 +	(erc-make-mode-line-buffer-name): Moved.
 +	(erc-track-shorten-names): Don't test using erc-channel-p as that
 +	failed with query buffers.
 +	(erc-unique-substrings): Move setq i + 1 to the end of the while
 +	loop, so that start is used as a default value instead of start +
 +	1.
 +
 +2002-11-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.25:
 +	erc-unique-substrings: define this before using it in assert
 +
 +	* erc.el 1.327:
 +	with-erc-channel-buffer: Define *before* using this macro. This
 +	hopefully fixes a bug noted on IRC.
 +
 +	* erc-notify.el 1.6:
 +	erc-notify-signon-hook, erc-notify-signoff-hook: New hooks. They're
 +	even run when their name suggests!
 +
 +2002-11-18  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-list.el 1.7: Typo.
 +
 +	* erc-speedbar.el 1.9: Whitespace only.
 +
 +	* erc.el 1.326 (define-erc-module): Avoid defining an alias if name and
 +	alias are the same.
 +
 +	* erc-ibuffer.el 1.17: URL
 +
 +	* erc-imenu.el 1.3 (erc-imenu-version): New constant.
 +
 +	* erc-ibuffer.el 1.16 (erc-ibuffer-version): New constant.
 +
 +	* erc-ibuffer.el 1.15: File header, comments.
 +
 +	* erc-fill.el 1.19 (erc-fill-version): New constant.
 +
 +	* erc-ezbounce.el 1.2 (erc-ezb-version): New constant.
 +
 +	* erc-complete.el 1.11 (erc-complete-version): New constant.
 +
 +	* erc-chess.el 1.21 (erc-chess-version): New constant.
 +
 +	* erc-chess.el 1.20: Whitespace only.
 +
 +	* erc-bbdb.el 1.20 (erc-bbdb-version): Typo.
 +
 +	* erc-bbdb.el 1.19 (erc-bbdb-version): New constant.
 +	Lots of whitespace changes.  Changes to the header.
 +
 +	* erc-track.el 1.24 (erc-track-shorten-aggressively): Doc.
 +	(erc-all-channel-names): New function.
 +	(erc-unique-channel-names): New function.
 +	(unique-substrings): Renamed.
 +	(erc-unique-substrings): New name
 +	(unique-substrings-1): Renamed.
 +	(erc-unique-substring-1): New name.  Added lots of tests.
 +	(erc-track-shorten-names): Call erc-unique-channel-names instead
 +
 +	* erc-match.el 1.15 (match): Rewrote a as module.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-netsplit.el 1.6 (erc-netsplit-version): New.
 +	(netsplit): Defined as a module, replacing erc-netsplit-initialize
 +	and erc-netsplit-destroy.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.23 (erc-track-switch-buffer):
 +	define-erc-module defines erc-track-mode,
 +	not erc-track-modified-channels-mode.
 +
 +	* erc.el 1.325:
 +	Variables erc-play-sound, erc-sound-path, erc-default-sound,
 +	erc-play-command, erc-ctcp-query-SOUND-hook and functions
 +	erc-cmd-SOUND, erc-ctcp-query-SOUND, erc-play-sound, erc-toggle-sound
 +	moved to erc-sound.el
 +
 +	Variables erc-page-function, erc-ctcp-query-PAGE-hook and function
 +	erc-ctcp-query-PAGE moved to erc-page.el
 +
 +	* erc-page.el 1.1:
 +	erc-page.el: New file. CTCP PAGE support for ERC, extracted from erc.el.
 +
 +	* erc-sound.el 1.2:
 +	defin-erc-module: Typo. Autoload should do erc-sound-mode and "erc-sound".
 +
 +	* erc-sound.el 1.1:
 +	erc-sound.el: New file. Contains all the CTCP SOUND stuff from erc.el.
 +
 +	* erc.el 1.324 (erc-process-ctcp-request):
 +	Removed (old-style CTCP handling)
 +	(erc-join-autogreet): Removed (was broken anyways)
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.31 (erc-button-version): New constant.
 +
 +	* erc-button.el 1.30 (button): rewrote as a module.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.323: New functions:
 +	(erc-event-to-hook), (erc-event-to-hook-name): Convert an event to the
 +	corresponding hook. The latter only returns the name, while the former
 +	interns the hook symbol and returns it.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-replace.el 1.4:
 +	Practically total rewrite.  All smiley stuff deleted.
 +
 +	* erc-track.el 1.22 (track): typo.
 +
 +	* erc.el 1.322 (define-erc-module): Doc change.
 +
 +2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.6: Changed to use define-erc-module.
 +
 +	* erc.el 1.321 (define-erc-module):
 +	Make the enable/disable functions interactive.
 +
 +	* erc.el 1.320 (erc):
 +	Don't use switch-to-buffer when we're in the minibuffer,
 +	because that does not work. Use display-buffer instead. This leaves
 +	two problems: The point does not advance to the end of the buffer for
 +	whatever reason, and after leaving the minibuffer, the new window gets
 +	buried.
 +
 +2002-11-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.15 (stamp): Doc change.
 +
 +	* erc-stamp.el 1.14 (erc-stamp-version): New constant.
 +	(stamp): downcase alias name of the mode.
 +
 +	* erc.el 1.319 (define-erc-module): Added defalias option, renamed
 +	parameters again.
 +
 +	* erc-track.el 1.21: erc-track-modified-channels-mode is now only an
 +	alias to erc-track-mode.  Only erc-track-mode is autoloaded.
 +	(track): Rewrote call to define-erc-module.
 +
 +2002-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.5: * Spelling fix
 +
 +	* erc-fill.el 1.18: * Fix autoload definition for erc-fill-mode
 +
 +	* debian/control 1.6, debian/maint/postinst 1.4, debian/maint/prerm 1.4:
 +	* Remove /usr/doc -> /usr/share/doc link handling
 +
 +	* debian/changelog 1.18: * Sync with reality
 +
 +	* debian/scripts/startup.erc 1.2:
 +	* Add /usr/share/emacs/site-lisp/erc/ to load-path
 +	* (load "erc-auto")
 +
 +	* debian/README.Debian 1.4:
 +	* Info about the changes since last release updated
 +
 +	* erc-pcomplete.el 1.11: * Fix emacs/xemacs compatibility
 +
 +	* debian/scripts/install 1.10: * Dont compile erc-compat, fix ELCDIR
 +
 +	* debian/control 1.5: * Change maintainer field
 +
 +	* erc.el 1.318:
 +	* (defin-erc-module): Renamed argument mode-name to mname because silly byte-compiler thought we were talking about `mode-name'.
 +
 +	* Makefile 1.6: * Added debrelease target
 +
 +	* erc-bbdb.el 1.18, erc-pcomplete.el 1.10, erc-stamp.el 1.13, erc.el 1.317:
 +	* (define-erc-module): Added mode-name argument.
 +	* Converted erc-bbdb, erc-pcomplete and erc-stamp to new macro.
 +	* autoload fixes
 +
 +	* erc-bbdb.el 1.17:
 +	* Create a global-minor-mode (i.e., make it a proper erc-module)
 +
 +	* erc.el 1.316: * (define-erc-modle): New defmacro
 +
 +2002-11-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.5 (erc-autoaway-idle-seconds):
 +	t in docstrings should be non-nil
 +
 +2002-11-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, 
 +	  erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20:
 +	Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
 +
 +	* erc-stamp.el 1.12 (erc-insert-away-timestamp-function):
 +	New custom type.
 +	(erc-insert-timestamp-function): New custom type.
 +
 +	* erc-fill.el 1.16 (erc-fill-function): Doc, new custom type.
 +	(erc-fill-static): Doc.
 +	(erc-fill-enable): New function.
 +	(erc-fill-disable): New function.
 +	(erc-fill-mode): New function.
 +
 +	* erc-match.el 1.13 (erc-match-enable): add-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +	(erc-match-disable): remove-hook for both
 +	erc-insert-modify-hook and erc-send-modify-hook.
 +
 +2002-11-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.3:
 +	- Added a way to use auto-away using emacs idle timers
 +	- Renamed erc-set-autoaway to erc-autoaway-possibly-set-away for consistency
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.315: erc-mode-map: Removed the C-c C-g binding for erc-grab
 +
 +	* erc.el 1.314:
 +	(erc-server-341) Another instance of the channel/chnl problem i didn't
 +	see last time
 +
 +2002-11-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.3 (erc-decode-coding-string): typo
 +
 +2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.313 (erc-server-341):
 +	variable name should be chnl not channel, as it is
 +	used this way in this function, and the other erc-server-[0-9]* use
 +	chnl too.
 +
 +	* erc-autoaway.el 1.2:
 +	Set back on all servers, not just the current one, since we're set
 +	away on all servers as well.
 +
 +	* HISTORY 1.2: Fixed typo (ngu.org => gnu.org)
 +
 +	* erc-autoaway.el 1.1, erc-fill.el 1.15, erc.el 1.312: erc-autoaway.el:
 +	* new file
 +
 +	erc.el:
 +	* Removed auto-discard-away facility (now included in erc-autoaway.el)
 +	* (erc-away-p): new function
 +
 +	erc-fill.el:
 +	* (erc-fill-variable): Check wether erc-timestamp-format is bound before
 +	                       using it (erc-fill.el does not require erc-stamp).
 +
 +2002-11-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* TODO 1.4:
 +	TODO: moved it to http://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO
 +
 +	* erc.el 1.311 (with-erc-channel-buffer): Rudimentary doc string.
 +
 +2002-11-09  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.28 (erc-nick-popup-alist): Made a defcustom.
 +
 +	* erc-button.el 1.27 (erc-button-disable): New function.
 +	(erc-button-enable): New function, replaces the add-hook calls at top-level.
 +	(erc-button-mode): New minor mode.
 +
 +2002-11-08  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.26 (erc-button-entry): Use erc-button-syntax-table.
 +
 +	* erc.el 1.310, erc-stamp.el 1.10: Doc changes.
 +
 +	* erc-match.el 1.12 (erc-match-mode): New function, replacing the
 +	add-hook.
 +	(erc-match-enable): New function.
 +	(erc-match-disable): New function.
 +	(erc-current-nick-highlight-type): Changed from 'nickname to 'nick
 +	to make it consistent with the others.
 +	(erc-match-message): Ditto.
 +
 +	* erc-button.el 1.25 (erc-button-syntax-table): New variable.
 +	(erc-button-add-buttons): Use it.
 +
 +2002-11-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.309:
 +	1) (bug) ERC pops up a new buffer and window when being messaged
 +	   from an ignored person. fixed
 +	2) (misfeature) ERC notices the user in the minibuffer when it
 +	   ignores something - this can get very annoying, since the
 +	   minibuffer is also visible when not looking at ERC buffers.
 +	   Added a customizeable variable for this, the default is nil.
 +	3) (wishlist) There is no IGNORE or UNIGNORE command.
 +	   Added.
 +	4) (wishlist) Some IRC clients, notably irssi, allow the user to
 +	   ignore "replies" to ignored people. A reply is defined as a
 +	   line starting with "nick:", where nick is the nick of an
 +	   ignored person. Added that functionaly.
 +	Done by Jorgen Schaefer <forcer@forcix.cx>
 +
 +2002-11-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.308 (erc-connect): set-process-coding-system to raw-text.
 +
 +2002-11-01  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-pcomplete.el 1.9, erc-stamp.el 1.9, erc-track.el 1.19:
 +	Fixed more autoloads
 +
 +	* erc-compat.el 1.2: Added autoload for erc-define-minor-mode
 +
 +2002-11-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.307: * (erc-send-command): will break long messages into
 +	a bunch of smaller ones, to prevent them from being truncated by the server.
 +	The patch also axes some trailing whitespace. :-) <resolve>
 +
 +2002-10-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.8 (erc-compat): Require.
 +	(erc-completion-mode): Use erc-define-minor-mode.
 +
 +	* erc-track.el 1.18 (erc-compat): Require.
 +	(erc-track-modified-channels-mode): Use erc-define-minor-mode.
 +
 +	* erc-stamp.el 1.8 (erc-compat): Require.
 +	(erc-timestamp-mode): Use erc-define-minor-mode.
 +
 +	* erc-compat.el 1.1: New file with the code for erc-define-minor-mode,
 +	erc-encode-coding-string and erc-decode-coding-string.  Essentially
 +	all the stuff that cannot be tested for using a simple boundp or
 +	fboundp -- eg. because the number of arguments are wrong.
 +
 +	* erc.el 1.306 (erc-compat): Require.
 +	(erc-process-coding-system): Moved to erc-compat.el.
 +	(erc-connect): Do not set-process-coding-system.
 +	(encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(decode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-encode-coding-string): Compatibility code moved to erc-compat.el.
 +	(erc-decode-coding-string): Compatibility code moved to erc-compat.el.
 +
 +2002-10-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.305 (erc-display-line-1): Removed call to
 +	erc-decode-coding-string.
 +	(erc-parse-line-from-server): Added call to
 +	erc-decode-coding-string before anything gets parsed at all.
 +	(erc-decode-coding-string): Use undecided coding system.
 +
 +2002-10-24  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-button.el 1.24, erc.el 1.304:
 +	Added LASTLOG command and action for nick-button
 +
 +2002-10-22  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.7:
 +	Fixed nopruning bug, added /MODE channel (mode) [nicks...] completion - mode not completed yet.
 +
 +2002-10-16  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.6:
 +	Fixed 'Hi delysid:' bug in SAY completion after realizing that pcomplete on commands already took care of completing the initial nick:
 +
 +2002-10-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.5: update from sachac
 +
 +2002-10-13  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.303 (erc-emacs-time-to-erc-time): Catch when tm is nil.
 +
 +2002-10-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.302:
 +	* Fixed `erc-scroll-to-bottom' to scroll to the bottom even when
 +	  in the middle of a line. Might also fix the Magic ECHAN Bug[tm]. (-:
 +
 +2002-10-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.6: Fixed erc-networks for the opn->freenode change
 +
 +2002-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.4:
 +	Make erc-completion-mode work interactively with already joined channel buffers
 +
 +	* erc-chess.el 1.19: Add autoload cookies
 +
 +	* erc-notify.el 1.5: Add pcomplete support
 +
 +	* erc.el 1.301:
 +	Remove autoload statments, remove autoload cookie from erc-mode and erc-info-mode
 +
 +	* erc-fill.el 1.14, erc-match.el 1.11: add/remove autoload cookies
 +
 +2002-10-06  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-pcomplete.el 1.3 (erc-completion-mode): New global minor mode
 +	with autoload cookie.
 +	(erc-pcomplete-enable): Renamed erc-pcomplete-initialize.
 +	(erc-pcomplete-disable): New function.
 +
 +	* erc-complete.el 1.10: Doc changes.
 +
 +	* erc-stamp.el 1.7 (erc-stamp-enable): Renamed erc-stamp-initialize.
 +	(erc-stamp-disable): Renamed erc-stamp-destroy.
 +	(erc-timestamp-mode): Use new names.
 +
 +	* erc.el 1.300: Removed autload for erc-complete and
 +	erc-track-modified-channels-mode -- the autoload cookie should do
 +	that instead.
 +	(erc-input-message): Doc string, removed binding for erc-complete.
 +	(erc-mode-map): Removed binding for erc-complete.
 +
 +2002-10-03  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.4:
 +	New functions erc-notify-JOIN and erc-notify-QUIT to catch some common cases (warning, untested)
 +
 +2002-10-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.6 (erc-timestamp-mode): New function.  Removed call
 +	to erc-stamp-initialize at the end.
 +
 +2002-09-25  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.299:
 +	Added customizable `erc-process-coding-system' variable.
 +
 +2002-09-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc-fill.el 1.13:
 +	`erc-fill-variable' now does the right thing when `erc-hide-timestamps' is non-nil
 +
 +2002-09-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.12:
 +	patch from Peter Solodov <peter@alcor.concordia.ca>  (note, its slightly broken still
 +
 +2002-09-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.2: Added LEAVE as alias for PART
 +
 +2002-09-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.1:
 +	By sachac (good work!) keep up doing such things
 +
 +2002-08-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.298:
 +	A fix for Bug#133267: now you can put (erc-save-buffer-in-logs) on erc-insert-post-hook to save *every* incoming message.
 +
 +2002-08-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.297:
 +	Changed default value of erc-common-server-suffixes because of the OPN
 +	name change
 +
 +2002-08-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.5: Try to reactivate isearch in xemacs
 +
 +	* erc-stamp.el 1.4:
 +	fixes issues related to comparative emacsology and a silly bug
 +
 +2002-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.296:
 +	New hook erc-send-completed-hook (for robot stuff), changed alexanders email address to reflect reality, little fix to erc-auto-query to get a bit of a speedup
 +
 +2002-08-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.23:
 +	Fixed case-fold-search (thanks sachac), now lambda works in erc-button-alist, added wardwiki+google+symvar+rfc+itime regexps from the wiki
 +
 +2002-08-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.22:
 +	erc-nick-popup-alist: New variable to make erc-nick-popup configurable
 +
 +2002-08-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.21 (erc-recompute-nick-regexp): Fixed regexp.
 +
 +	* erc-button.el 1.20 (erc-button-buttonize-nicks): Changed custom type
 +	to integer.
 +	(erc-button-add-buttons): Moved button removal code to new
 +	function.
 +	(erc-button-remove-old-buttons): New function.
 +	(erc-button-add-button): Removed use of overlays and used
 +	erc-button-add-face instead.
 +	(erc-button-add-face): New function to merge faces as text
 +	properties.  This should be much faster when lots of buttons
 +	appear.
 +	(erc-button-list): New helper function.
 +
 +	* erc.el 1.295 (erc-display-message): Fixed argument list.
 +	(erc-display-prompt): Reduced calls to length, use start-open
 +	property for XEmacs to prevent a little box of erc-prompt-face at
 +	the end of messages other people send.
 +	(erc-refresh-channel-members): Fix XEmacs calls to split-string,
 +	which may return an empty string at the end of the list.  This
 +	would cause hangups in erc-button in re-search-forward loops.
 +	(erc-get-channel-mode-from-keypress): Replaced control codes with
 +	octal escape sequences.
 +
 +2002-08-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.19:
 +	Try to be compatible to XEmacs regexp-opt. (Im going to quit this job if I find more of those damn differencies
 +
 +	* debian/README.Debian 1.3, debian/scripts/install 1.9:
 +	* Added info to README.Debian
 +	* Finished debian/scripts/install
 +
 +2002-08-13  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/scripts/install 1.8: First attempt to fix it
 +
 +	* debian/README.Debian 1.2, debian/changelog 1.17, debian/scripts/install 1.7:
 +	changelog: Changed maintainer and added new entry
 +	README.Debian: Re-explained the byte-compile issue
 +	scripts/install: Exclude erc-bbdb|chess|ibuffer|speedbar from
 +	byte-compiling
 +
 +	* erc-track.el 1.17: Added C-c C-SPC in addition to C-c C-@
 +
 +	* erc-notify.el 1.3: Little docstring change
 +
 +2002-08-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.3:
 +	Change one use of set-text-properties to add-text-properties (tnx Lathi)
 +
 +2002-08-02  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-stamp.el 1.2: added erc-timestamp-only-if-changed-flag
 +
 +2002-07-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.294:
 +	Removed timestamp related code and moved into erc-stampe.l
 +
 +	* erc-stamp.el 1.1:
 +	Timestamping code moved out of erc.el. Additional, now we can timestamp either on the left or on the right side
 +
 +2002-07-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.293:
 +	* Make ctcp ping return its message in the active buffer, instead of the server buffer
 +	* Corrected minimal typo in catalog
 +	* Added var and variable as alias for /set
 +
 +2002-07-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.16:
 +	* New function erc-track-switch-buffer (by resolve)
 +	  Bound to C-c C-SPC, enjoy!
 +
 +2002-07-08  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.16: New snapshot deb
 +
 +	* debian/scripts/install 1.6: Rewrote in make.
 +	Does not byte-compile erc-speak.el at all, and excludes erc-track.el too, if
 +	ran for xemacs.
 +
 +	* debian/control 1.4: Added dependency on make
 +
 +	* debian/copyright 1.2: Updated copyright info
 +
 +	* debian/rules 1.10: Use $(wildcard *.el) instead of a hardcoded list
 +
 +2002-07-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.292:
 +	erc-iswitchb now works correctly if erc-modified-channels-alist is non-nil
 +
 +2002-07-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.8:
 +	* changed how we check if we should activate "Track hidden channels" and
 +	  whether it should be selected - fixes a bug Xemacs where whole menu bar
 +	  does not work if menu is loaded
 +
 +	* erc-menu.el 1.7:
 +	* added "Disconnect from server", only selectable if erc-connected is non-nil
 +
 +	* topic is allowed to be set by normal users if channel mode is not +t
 +
 +	* add " ..." after description if arguments needed after selecting menu item
 +
 +	* only allow selecting of menu points needing a channel if current buffer is
 +	  a channel buffer - done by testing if channel-members is non-nil
 +
 +	* put erc-match functions in new group "Pals, fools and other keywords"
 +
 +	* erc.el 1.291:
 +	* moved definition of erc-show-my-nick to GUI variables section
 +
 +	* erc-connected variable now defined with defvar
 +	  now set in channel and query buffers, was only in server buffer before
 +	  upon disconnect, set erc-connected to nil in all the server's buffers
 +
 +	* added erc-cmd-GQUIT and its alias erc-cmd-GQ - quit all servers at once
 +
 +	* added interactive function erc-quit-server, bound to C-c C-q
 +
 +	* added erc-server-WALLOPS
 +
 +	* added WALLOPS to english catalog, fixed s461 (was showing message twice)
 +
 +	* typo fixes, spacing change
 +
 +2002-06-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.290: Use pp-to-string in /set (without args)
 +
 +	* erc-netsplit.el 1.5:
 +	Make /set anonymous-lign set erc-anonymous-login, also report
 +	which var was set to which val.
 +
 +2002-06-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.6: added "Customize ERC"
 +
 +2002-06-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.289: New variable: erc-use-info-buffers, defaults to nil.
 +	  This prevents info-buffers from being created/updated.
 +	  Set to t if you use :INFO buffers.
 +	  (by rw)
 +	Delete (erc-display-prompt) from reconnect to avoid clutter
 +
 +2002-06-23  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.288:
 +	erc-get-channel-mode-from-keypress is now bound to C-c C-m
 +	erc-insert-mode-command is taken care of by this function as well
 +
 +2002-06-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.15:
 +	Fixed bug where buffer-names suddenly had text-properties.
 +
 +2002-06-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* Makefile 1.5: changed erc-auto.el to $(SPECIAL) in make fullclean
 +
 +	* Makefile 1.4: remove erc-auto.el on make fullclean
 +
 +2002-06-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.10: fixed spelling error
 +
 +	* erc-track.el 1.14, erc-match.el 1.9: * erc-match.el:
 +	  highlight current nickname in its own face (deactivated by default):
 +	  - added erc-current-nick-highlight-type, erc-current-nick-face,
 +	    erc-current-nick-p
 +
 +	* erc-track.el:
 +	  added support for erc-current-nick-face
 +
 +2002-06-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.287: * added beginning suport for 005 numerics:
 +	  - added buffer local variable erc-server-parameters
 +	  - added erc-server-005, which sets erc-server-parameters if the server has
 +	    used this code to show its parameters
 +
 +2002-06-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.286:
 +	* bugfix: when pasting lines with blank lines in between, remove the blank lines
 +	  but send the rest
 +
 +	* since we know the command, use it when checking what's in erc-hide-list
 +	  added check to erc-server-KICK
 +
 +	* added some blank lines for better readability
 +
 +2002-06-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.5 (erc-nickserv-alist): Fixed typo.
 +
 +2002-06-15  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.4 (erc-networks): Added doc string.
 +	(erc-nickserv-alist): Added doc string.
 +
 +2002-06-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el 1.4:
 +	fixed bug so that the prompt and command always get put at the end of the buffer
 +
 +2002-06-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nickserv.el 1.3: Added iip support.
 +	Added :type for erc-nickserv-passwords custom.
 +	Fixed hook usage.
 +
 +2002-06-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.2: * added GalaxyNet
 +
 +	* erc-nickserv-alist:
 +	  - sorting networks alphabetically
 +	  - added two more pieces of information in erc-nickserv-alist:
 +	    word to use for identification and whether to use the nickname
 +
 +	* erc-current-network:
 +	  - made regex case insensitive, downcase server to match
 +	  - uses the new information
 +	  - now uses new variable erc-networks instead of doing checking manually
 +
 +	* added variable erc-networks
 +
 +	* fixed some indentation, documentation
 +
 +2002-06-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.285: Fix for kill-buffer hook stuff
 +
 +2002-06-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.284: Added /squery command
 +
 +2002-06-06  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el 1.5: * made group Channel modes
 +	  - moved change mode and invite only mode to here
 +	  - added secret, moderated, no external send, topic lock, limit, key
 +
 +	* check that user is in a channel buffer and user is a channel operator
 +	  for all op-related actions
 +
 +	* "Identify to nickserv" needs erc-nickserv-identify defined
 +
 +	* added "Show ERC version"
 +
 +	* erc.el 1.283:
 +	* added erc-set-channel-limit, erc-set-channel-key, erc-toggle-channel-mode
 +
 +	* added erc-get-channel-mode-from-keypress, which is binded to C-c m
 +	  sends the next character which is typed to one of the 3 new functions
 +	  - did not remove erc-invite-only-mode and it's key binding in case
 +	    people are used to it, although it probably should be removed...
 +
 +	* in erc-server-MODE:
 +	  added check if tgt equal to user's nick
 +	  removed erc-display-line, only using the erc-display-message
 +
 +	* added s461 to english catalog
 +
 +	* fixed bug where Xemacs would not quit if erc-quit-reason was
 +	  set to erc-quit-reason-various and assoc-default was not defined
 +
 +2002-06-04  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-ezbounce.el 1.1, erc-match.el 1.8:
 +	* erc-ezbounce.el: Added. Provides support for ezbouncer; automatic login,
 +	                   session management implemented. I've contacted the author
 +			   about stuff in EZBounce's logging.
 +	* erc-match.el: Fixed a stupid mistake where
 +	                "*** Your new nick is <foo>" would trigger an error.
 +
 +2002-06-04  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el 1.1, erc.el 1.282: * added erc-nickserv.el
 +	* moved nickserv identification variables and functions to the new file
 +	  (require 'erc-nickserv) is now necessary for this to work
 +
 +	* erc.el 1.281:
 +	* results of /COUNTRY now formatted as notice; errors are ignored, 
 +	  fixing
 +	  bug which made prompt disappear
 +
 +	* added undefined-ctcp error message to english catalog
 +
 +	* changed some (when (not erc-disable-ctcp-replies) to use unless instead
 +	  and some if's without else statments to use when or use
 +
 +	* CTCP replies now use erc-display-message, formatted as notices
 +
 +	* added following to english catalog:
 +	  - undefined-ctcp
 +	  - CTCP-CLIENTINFO, CTCP-ECHO, CTCP-FINGER, CTCP-PAGE, CTCP-PING,
 +	    CTCP-SOUND, CTCP-TIME, CTCP-UNKNOWN, CTCP-VERSION
 +	  - s303, s305, s306, s353
 +
 +	* split erc-server-305-or-306 into erc-server-305 and erc-server-306
 +
 +	* KICK already had buffer set, using it
 +
 +	* erc.el 1.280:
 +	* erc-format-timestamp now only called from erc-display-message and
 +	  erc-send-current-line
 +
 +	* all instances of erc-display-line with erc-highlight-error
 +	  changed to use erc-display-message
 +
 +	* added following error messages to english catalog:
 +	  bad-ping-response, bad-syntax, cannot-find-file, cannot-read-file,
 +	  ctcp-request, flood-ctcp-off, flood-strict-mode, no-default-channel,
 +	  no-target, variable-not-bound
 +
 +	* added following server related messages to english catalog:
 +	  s324, s329, s331, s332, s333, s341, s406, KICK, KICK-you, KICK-by-you, MODE-nick
 +
 +	* ignoring server codes 315, 369
 +
 +	* added erc-server-341, erc-server-406
 +
 +	* channel topic and mode notices displayed in respective channel buffers if they
 +	  exist
 +
 +	* erc-server-KICK: display the message before removing this channel so that we
 +	  can track the kick
 +
 +	* send parsed to erc-ctcp-query-ACTION-hook so that actions can be checked
 +	  by erc-match
 +
 +	* fixed bug where nil was shown if no reason was given by users on /PART
 +
 +2002-06-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el 1.7:
 +	* fixed bug where erc-log-matches produced an error when the value of
 +	  (erc-default-target) was not a channel
 +	* use erc-format-timestamp, if it's non-nil, for %t in erc-log-match-format
 +
 +2002-06-01  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el 1.18:
 +	* made action case insensitive in erc-nick-popup and added a more descriptive
 +	  error message
 +
 +2002-05-30  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.279:
 +	Removed multiple calls of `erc-prompt' in `erc-display-prompt'
 +
 +2002-05-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.278:
 +	First step timestampkiller cleanup. I'm tired, do the rest tomorrow.
 +
 +	* erc.el 1.277:
 +	New functionality: Catch channel/server buffer kills through kill-buffer-hook.
 +	Currently, it only does a PART if you kill a channel buffer.
 +
 +2002-05-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.276:
 +	defvar'ed some buffer-local variables to make elint at least a bit more happy.
 +	  Moved comments into docstrings.
 +	Changed some instances of member to memq.
 +
 +	* erc-track.el 1.13, erc.el 1.275:
 +	erc.el: (erc-message-type-member): New function, used to test
 +	for message type. Require erc-parsed text-property.
 +	erc-track.el: erc-track-exclude-types: New variable. Defaults to ("JOIN" "PART") right now for testing, it should eventually set to nil soon again.
 +	(erc-track-modified-channels): Use above fun and var to optionally exclude certain message types from channel tracking.
 +
 +2002-05-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* CREDITS 1.5: added myself, vain as it sounds ;)
 +
 +2002-05-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.274: * Some small docstring fixes
 +	* (erc-display-line): Now takes also a process object in the buffer argument.
 +	  Used for easy sending to the server buffer.
 +	* Several places: Just pass proc, not (process-buffer proc)
 +
 +2002-05-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.273: Mostly docstring fixes/additions
 +
 +	* erc-netsplit.el 1.4: Doc fixes, and a new netjoin-done message.
 +
 +	* erc-fill.el 1.11: Doc fixes, erc-fill custom group, autoloads.
 +
 +	* erc-netsplit.el 1.3: Fix to erc-netsplit-timer.
 +
 +	* erc-netsplit.el 1.2: Fixed a silly typo
 +
 +	* erc-maint.el 1.1: is this really necessary?
 +
 +	* erc.el 1.272: Added new variable erc-hide-list.
 +	It affects erc globally right now, and is used to hide certain IRC type messages like JOIN and PART.
 +
 +	* Makefile 1.3: Doh, I should really test this before checkin :)
 +
 +	* Makefile 1.2: Silly cut&paste bug fixed
 +
 +	* erc-list.el 1.6: Added autoload cookie
 +
 +	* erc-match.el 1.6: Added missing require erc.
 +
 +	* erc-notify.el 1.2: Autoload cookies and a -initialize function.
 +
 +	* erc-chess.el 1.18: Added autoload cookies
 +
 +	* Makefile 1.1: Finally, we have a Makefile.
 +	Primarily used for autoload definition generation right now.
 +
 +	* erc-auto.in 1.1: First version.
 +
 +	* erc-track.el 1.12: Added autoload cookie
 +
 +	* erc-netsplit.el 1.1:
 +	New module, used to autodetect and hide netsplits.
 +	(Untested, no netsplit happened yet :) )
 +
 +	* erc-nets.el 1.3: Added some old code I once worked on.
 +	Added autoload cookie
 +
 +2002-05-24  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.10:
 +	removed reference in documentation to old variable, changed it to the new one
 +
 +	* erc.el 1.271:
 +	* added new function erc-connection-established which is called after receiving
 +	  end of MOTD (does nothing if it's been called before)
 +
 +	* added new hook erc-after-connect which is called from
 +	  erc-connection-established with the arguments server (the announced server)
 +	  and nick - which other arguments should be sent??
 +
 +	* added buffer variable erc-connected which is set to t the first time
 +	  erc-connection-established is called, set to nil again if we've been
 +	  disconnected
 +
 +	* set initial user mode
 +	  - added custom variable erc-user-mode which can be a string or a function
 +	    which returns a string
 +	  - new function erc-set-initial-user-mode gets called from
 +	    erc-connection-established
 +
 +2002-05-22  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.270: fixed bug where prompt was missing after reconnect
 +
 +2002-05-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.269:
 +	in erc-nickserv-identify: if network is unknown, just use "Nickserv"
 +
 +	* erc.el 1.268: * fixed some typos
 +
 +	* timestamping
 +	  - ctcp request messages and replies now have timestamp
 +	  - timestamps in front of error messages now in timestamp face
 +	  - added timestamp to more error messages
 +
 +	* ctcp reply messages, server ping message updated
 +
 +	* added variable erc-verbose-server-ping - check this instead of erc-paranoid
 +
 +	* added whowas on no such nick:
 +	  - added variable erc-whowas-on-nosuchnick
 +	  - in erc-server-401 do WHOWAS if erc-whowas-on-nosuchnick is non-nil
 +
 +	* erc.el 1.267: forgot documentaion for erc-nickserv-alist
 +
 +	* erc.el 1.266: NickServ identification changed and enhanced:
 +	- erc-nickserv-identify-autodetect now called from erc-server-NOTICE-hook
 +	- now possible to identify automatically without prompt:
 +	  - added custom variables erc-prompt-for-nickserv-password and
 +	    erc-nickserv-passwords
 +	- added erc-nickserv-alist containing the different networks' nickserv details
 +	- added function erc-current-network to determine the network symbol
 +	- fixed bug where identification on dalnet didn't work, because they now
 +	  require NickServ@services.dal.net
 +	  now sends to all NickServ with nick@server where possible
 +
 +2002-05-17  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-fill.el 1.9:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +	* erc.el 1.265: erc.el:
 +	* fixed bug where topic wasn't being set when chanel name was provided
 +
 +	erc-fill.el:
 +	* filling with erc-fill-variable now works with custom defined fill width:
 +	  - changed erc-fill-column from defvar to defcustom
 +	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 +
 +2002-05-16  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.264: whitespace fix
 +
 +2002-05-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.263:
 +	* added explanation of empty string working in erc-quit-reason-various-alist
 +	* removed the text property from erc-send-message, it caused problems
 +	  with /SV (as noticed by gbvb on IRC) and is obviously not needed
 +	* when receiving a ctcp query, convert type to uppercase to allow for
 +	  "/ctcp nick time" and not just "/ctcp nick TIME"
 +	* timestamp in front of server notices now shown in the timestamp face
 +
 +2002-05-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el 1.262:
 +	- in erc-format-privmessage: `erc-format-timestamp' added to message after
 +	  message's text properties are applied so that it doesn't lose its face
 +
 +	- /quit without reason now works when `erc-quit-reason' is set to
 +	  `erc-quit-reason-various' and the empty string "" is defined in
 +	  `erc-quit-reason-various-alist'
 +
 +2002-05-13  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.16:
 +	* Applied Drewies patch to pop-up on nick changes when -popup-type is 'visible
 +
 +2002-05-12  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.15, erc.el 1.261:
 +	* erc-bbdb.el: pop up the buffer on /whois when erc-bbdb-popup-type is 'visible
 +	* erc.el: fix for empty quit reason problem by drewie.
 +
 +2002-05-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.260: disumu nick patch
 +	- added erc-show-my-nick (default t)
 +	  if t, show nickname like <nickname>
 +	  if nil, only show a > character before the message
 +	- added faces erc-nick-default-face and erc-nick-msg-face
 +	  - nicknames (channel, msgs, notices) are now in bold face by default
 +	  - the msg face matches the erc-direct-msg-face color
 +
 +2002-05-10  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.259 (erc-send-pre-hook): Doc change.
 +
 +	* CREDITS 1.4: Alexander L. Belikoff is confirmed original author.
 +
 +2002-05-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.258:
 +	timestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumu
 +
 +2002-05-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.257: *** empty log message ***
 +
 +2002-05-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.256:
 +	New var: erc-echo-notices-in-minibuffer-flag. defaults to t.
 +
 +2002-05-04  John Wiegley  <johnw@gnu.org>
 +
 +	* TODO 1.3: *** empty log message ***
 +
 +2002-05-03  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.255: Copyright notice, version string updates.
 +
 +2002-05-02  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.254: Comment: dme is David Edmondson
 +
 +2002-05-01  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.253 (erc-warn-about-blank-lines): New option.
 +	(erc-send-current-line): Use it.
 +	(erc-quit-reason-various-alist): New option.
 +	(erc-quit-reason): New option.
 +	(erc-quit-reason-normal): New function.
 +	(erc-quit-reason-zippy): New function.
 +	(erc-quit-reason-various): New function.
 +	(erc-cmd-QUIT): Use them.
 +
 +2002-04-30  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.252: Version 2.92
 +
 +	* erc.el 1.251 (erc-send-modify-hook): Default value is nil.
 +
 +2002-04-27  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.250:
 +	Don't redisplay the prompt if the ERC buffer is no longer alive.
 +
 +2002-04-26  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.249:
 +	Don't call `set-buffer' on old-buf unless the buffer is valid.  It's
 +	often not when separate frames are being used.
 +
 +2002-04-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.17: fixed up erc-nick-regexp
 +
 +2002-04-22  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.248:
 +	`erc-prompt' may now be a function that returns a string (which is
 +	used as the prompt). I don't use Customize but I think customization
 +	of it may be broken if it's not a string.
 +
 +	There is a new `erc-prompt' function that returns the prompt as a
 +	string (e.g., returning either the result of `(funcall erc-prompt)' or
 +	`erc-prompt').
 +
 +	This allows for dynamic prompts, such as a LispWorks-like prompt, or
 +	one containing simply the current channel name. It was requested by
 +	Mojo Nichols (nick michols) in #emacs today, 21-Apr-2002; cf. the
 +	#emacs logs at <URL:http://www.tunes.org/~nef/logs/emacs/02.04.21.
 +
 +2002-04-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.247:
 +	fix erc-send-current-line to work on empty lines again (without sending the prompt)
 +	Fix C-c C-t to not include the nick/time info
 +	(both from antifuchs)
 +
 +	* erc-complete.el 1.9: Fix for xemacs elt behaviour
 +
 +2002-04-17  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.17:
 +	Added a missing arg in a call to erc-chess-handler.
 +
 +2002-04-15  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.16: *** empty log message ***
 +
 +2002-04-14  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.15: *** empty log message ***
 +
 +2002-04-12  John Wiegley  <johnw@gnu.org>
 +
 +	* erc-chess.el 1.14: *** empty log message ***
 +
 +	* erc-chess.el 1.12: bug fixes
 +
 +	* erc-chess.el 1.11: *** empty log message ***
 +
 +2002-04-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.6: change order.
 +
 +	* erc-chess.el 1.5: more fixing.
 +
 +	Now, the 'match question works. It sends an accept back.
 +	But display popup doesnt work..
 +
 +	* erc-chess.el 1.4: fixup (still far from working)
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.246:
 +	* Added :options entry for erc-mode-hook (erc-add-scroll-to-bottom)
 +
 +2002-04-11  John Wiegley  <johnw@gnu.org>
 +
 +	* erc.el 1.245: remove trailing \n from any sent text
 +
 +	* servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, 
 +	  erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, 
 +	  erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, 
 +	  erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 1.244:
 +	clean whitespace
 +
 +	* erc.el 1.243: Replaced erc-scroll-to-bottom.
 +
 +2002-04-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.10:
 +	try to fix behaviour when used with different frames.
 +
 +2002-04-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-chess.el 1.2:
 +	fixup release, far from ready for real usage, but it appears to work.
 +
 +	* erc.el 1.242:
 +	speed improvments based on elp-instrument-package RET erc- RET results
 +
 +	* erc-chess.el 1.1: initial version.
 +	please test it
 +	Get chess.el from johnw's cvs:
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot login
 +	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot co chess
 +
 +	(as usual, blank password)
 +
 +	Add the resulting dir to your load-path and reqire erc-chess.
 +
 +	Usage: Just do /chess nickname
 +	The remote end much use erc, as no other irc client I know of supports this ...
 +
 +	See erc-chess-default-display and maybe set it to chess-images or chess-ics1 if you prefer those over chess-plain.
 +	Also, see erc-chess-user-full-name to set the name you use in chess games.
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.241: New hackery latenightwise
 +
 +	* erc.el 1.240: upupadowndowncase
 +
 +2002-04-04  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.15: Updated for the new snapshot
 +
 +	* debian/rules 1.9: Install README.Debian into the package
 +
 +	* debian/README.Debian 1.1: Initial check-in
 +
 +2002-04-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.239:
 +	Fixed that /me in query buffers ended up in server buffer
 +
 +	* erc.el 1.238: * Implemented joining +k channels
 +
 +2002-03-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.237: New utility function: erc-channel-list
 +	minor fix to erc-get-buffer. hopefully that helps shapr
 +
 +2002-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.236:
 +	New /command: /QUOTE for sending directly to the IRC server
 +	Removed erc-fill from erc-insert-modify-hook. To activate filling, simply customize that var.
 +
 +2002-03-09  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.3: *** empty log message ***
 +
 +2002-03-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.7:
 +	New variable: erc-nick-completion-ignore-case. Defaults to t.
 +
 +	* erc-track.el 1.9:
 +	* erc-track-shorten-name-function can now be set to nil to avoid treating of channel names at all.
 +
 +2002-03-06  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.14, debian/rules 1.8: update to new snapshot
 +
 +2002-03-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.235:
 +	Fixed nasty bug which prevented channel limit from correctly display/handling
 +
 +	* erc-track.el 1.8: Made shortening code highly customizable.
 +	Now, there is the variable erc-track-shorten-function which holds
 +	a function which gets called with one argument, CHANNEL-NAMES, which is a list
 +	of strings of the channel names.
 +	It needs to return a list of strings of the same length with the modified values...
 +
 +	* erc-track.el 1.7:
 +	Added erc-track-shorten-aggressively, default to nil
 +	if it is set to t, erc will shorten a bit more.
 +	if nil, erc will shorten the name only if it would get shorter than just
 +	one char...
 +
 +	* erc-speak.el 1.21: added iirc to the abbreviation expansion list.
 +
 +	* erc-track.el 1.6:
 +	Added customization variable: erc-track-use-faces. defaults to t.
 +
 +	* erc-track.el 1.5: *** empty log message ***
 +
 +	* erc-track.el 1.4:
 +	experimental: Added face support to mode-line channel activity tracker.
 +	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal acitivity...)
 +
 +2002-03-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.6: * added docfixes (thanks ore)
 +
 +	* erc-track.el 1.3: Fixed channel-name reduction.
 +	thanks again alex.
 +	Renamed the vars to erc-track-opt-start and erc-track-opt-cutoff.
 +
 +	* erc.el 1.234: fixed another silly error
 +
 +	* erc-track.el 1.2: Implemented channel name shortening.
 +	Vars erc-track-cutoff says: all channel names longer than this will be shortened.
 +	Var erc-track-minimum-channel-length says: dont make names shorten than this.
 +	(Thanks go out to kensanata for the nice unique-substrings utility function).
 +
 +	* erc.el 1.233: silly typo corrected
 +
 +	* erc.el 1.232:	* erc.el 1.232: * New varialbe: erc-common-server-name-suffixes
 +	  This alist can be used to change the server names displayed in mode-line
 +	  to a shorter version..
 +	* New function: erc-shorten-server-name (uses var above)
 +	* Changed erc-prepare-mode-line to use erc-shorten-server-name.
 +
 +2002-02-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.231:
 +	CTCP handling rewritten. Seems to work. please test and report probs.
 +
 +2002-02-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.230:
 +	Fixed emacs20 backward compatibility (new defun/alias: erc-propertize)
 +
 +2002-02-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.15: *** empty log message ***
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.14, erc.el 1.229:
 +	minor fixup related to read-only prompts and command renaming.
 +
 +2002-02-21  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.228: * modify `erc-remove-text-properties-region' to work.
 +	  Could even be a little faster now. (-:
 +
 +2002-02-21  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ring.el 1.3:
 +	fixed erc-replace-command to behave right when text is read-only.
 +	Also, use erc-insert-marker and (point-max) now.
 +
 +	* erc.el 1.227: * Made erc-prompt read-only
 +	* new function: erc-make-read-only. Can be used on erc-insert-post-hook and erc-send-post-hook to ensure read-only buffer text too
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.4: added comment to docstring
 +
 +	* erc-speak.el 1.20: minor updates, use erc-nick-regexp now
 +
 +	* erc.el 1.226:
 +	ensure that erc-timer-hook is called inside the server-buffer.
 +
 +2002-02-19  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.4:
 +	* Probably fixed the "number-char-or-marker-p: nil" bug.
 +
 +2002-02-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.1: Initial release.
 +
 +	* erc.el 1.225: added #303 handling
 +	moved timer and added an arg (erc-current-time)
 +
 +	* erc-list.el 1.3, erc.el 1.224:
 +	slightly changed the erc-once-with-server-event macro
 +
 +	* erc-button.el 1.13: erc-button-alist: doc fix and custom type fix
 +
 +2002-02-18  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-list.el 1.2, erc.el 1.223: new macro: erc-once-with-server-event
 +	erc-list.el: use it
 +
 +	* erc-match.el 1.3:
 +	Minor fix related to hook call method change (-until-seccess now)
 +
 +	* erc.el 1.222: fixed ctcp behaviour abit (with auto-query on)
 +
 +	* erc-list.el 1.1: ChanList mode.
 +	Load it, and type M-x erc-chanlist RET
 +	Demonstrates how the new hook system can be nicely used.
 +
 +	* erc.el 1.221:
 +	new hook: erc-default-server-hook. This one gets called if we dont have anything defined for a certain IRC server message.
 +	New function: erc-default-server-handler. (used by above hook).
 +	New function: erc-debug-missing-hooks: Used by above hook to save a list of unimplemented server messages.
 +	New function: erc-server-buffer, erc-server-buffer-p.
 +	Various places: use it.
 +	Minor fixup.
 +
 +	* erc-button.el 1.12: fix regexp to not buttonize ~user@host hostnames
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-complete.el 1.5, erc.el 1.220: Eliminated erc-command-table
 +	Upcased the command defuns (erc-cmd-join is now erc-cmd-JOIN)
 +	Fixed erc-complete to not require erc-command-table.
 +	Implemented erc-cmd-HELP
 +	  (You have to try that, its tooo coool!)
 +	  e.g. /help auto-q
 +	fixed autoloads for erc-add-pal and so on to be interactive.
 +
 +2002-02-17  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-match.el 1.2:
 +	* Fix unfunctional code in `erc-get-parsed-vector-type'.
 +
 +	* erc-bbdb.el 1.13, erc-button.el 1.11, erc-match.el 1.1, erc.el 1.219:
 +	* Be careful: MANY changes ahead. I won't go into too much details.
 +
 +	* erc.el, new file erc-match.el: split out all pattern-matching code.
 +	* erc.el: removed all defcusts for erc-{...}-highlight-props. They are
 +	  quite useless, anyway.
 +	* moved erc-add-entry-to-list and -remove- over to erc-match. changed
 +	  their arg list.
 +	* erc.el: add autoloads for erc-{add,delete}-{keyword,pal,fool,dangerous-host}
 +	* erc.el: erc-server-PRIVMSG-or-NOTICE:
 +	  - remove all the highlighting crap
 +	  - add a (when (eq s nil) ...) so that untreated CTCP messages don't
 +	    get misdisplayed.
 +	* erc.el: erc-mark-message: removed this function, it's useless
 +	* erc.el: minor bugfixes.
 +
 +	* erc-match.el: first checkin. This file now contains all the pattern
 +	  matching stuff. there is now another defcust group, erc-match,
 +	  containing all match related stuff (erc-keywords, ...)
 +	* erc-match.el: added functionality to log matching lines. Quite
 +	  customizable, check out the docstring of defun erc-log-matches
 +	* erc-match.el: added functionality to make foolish messages
 +	  invisible/intangible. This could replace erc-ignore-list
 +	  sometime. it's more powerful right now, anyway.
 +	* erc-match.el erc-text-matched-hook: new hook. run when Text matches
 +	  anything (pal, fool, etc.).
 +
 +	* erc-button.el: Make nick buttonization customizable.
 +	* erc-button.el: Give nick buttonization a lower priority so that it
 +	  does not break url buttons.
 +
 +	* erc-bbdb.el: Add \n to the separators by which we split nicknames.
 +
 +2002-02-17  Mario Lang  <mlang@delysid.org>
 +
 +	* TODO 1.2: Added item
 +
 +2002-02-17  Brian P Templeton  <bpt@tunes.org>
 +
 +	* CREDITS 1.2, erc.el 1.218: Added invisible timestamp support.
 +
 +2002-02-16  Gergely Nagy  <algernon@debian.org>
 +
 +	* debian/changelog 1.13, debian/rules 1.7, debian/scripts/install 1.5:
 +	updated to new snapshot
 +
 +2002-02-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.217:
 +	Fixed channel limit format overflow in mode-line display.
 +	(Having to use floats if integers are to large is quite strange, isn't it?)
 +
 +	* TODO 1.1: TODO list created.
 +	Add comments and expand it.
 +
 +	* erc.el 1.216:
 +	Fixed bug in query buffer handling (only happend in mixed-case situations)
 +
 +	* erc.el 1.215: shapr checkdoc patch #1
 +	massive docfixes! yay, keep going!
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.214: various other fixes
 +	make s301 a catalog entry
 +
 +2002-02-15  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.213: * erc-server-NICK and erc-server-INVITE: fixed to use
 +	  `erc-display-message'. These I missed in the first checkin.  I
 +	  didn't say it in the last log message, but please test these.
 +
 +	* erc-fill.el 1.7, erc.el 1.212:
 +	* erc.el: updated many functions to use `erc-display-message'. Now, we
 +	  should go for getting highlighting out of
 +	  erc-server-PRIVMSG-or-NOTICE. The part I want to attack has been
 +	  marked.
 +	* erc-fill.el: updated static filling to leave the erc-parsed property alone.
 +
 +2002-02-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.211:
 +	first step, new function: erc-display-message
 +
 +	* erc.el 1.210: added numreply 379 and 405.
 +
 +	* erc.el 1.209: stupid typo fixed
 +
 +	* erc.el 1.208:
 +	Finally renamed erc-frame-dedicated-p to erc-frame-dedicated-flag
 +	Removed usage of erc-interpret-controls from info buffer drawing (major speedup)
 +	Other speedups based on the results from elp.
 +	ERC is now about 300%-500% faster in some situations with very full channels!!!!!
 +
 +2002-02-14  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.207:
 +	* erc-downcase now downcases {}|^ with []\~ -- 'stolen' from zenirc.
 +	* various checkdoc fixes. Just the upper third of the file, but that
 +	  should help a little, too. (-: Again, if you have any writing
 +	  skills, take out that dusty keyboard and tap it to the beat of M-x
 +	  checkdoc!
 +
 +2002-02-14  Gergely Nagy  <algernon@debian.org>
 +
 +	* erc.el 1.206 (erc-format-privmessage):
 +	fix it, so timestamp-coloring works again (patch from antifuchs)
 +
 +2002-02-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.205: Many fixes based on M-x checkdoc RET.
 +	If you have write access, and some english knowledge, help document erc too!
 +	M-x checkdoc RET, and follow the instructions.
 +
 +	* erc-button.el 1.10, erc-ibuffer.el 1.13: minor fixes
 +
 +	* erc.el 1.204: Use nreverse instead of reverse.
 +	Use eq instead of equal where possible.
 +	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isnt good ina  defun which is called so often)
 +
 +2002-02-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.9, erc.el 1.203:
 +	In erc.el, new hook: erc-channel-members-changed-hook.
 +	erc-button.el: Now highlight all nicknames. uses regexp-opt.
 +
 +2002-02-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-nets.el 1.1:
 +	Database of irc networks. Use erc-server-select to interactively select one.
 +
 +	* erc.el 1.202: * erc-format-nick-function: New variable.
 +	* (erc-format-nick): The default for above var. Just return the nick.
 +	* (erc-format-@nick): Prefix NICK with @ or + if OP or VOICE.
 +	* Removed erc-track-modified-channels related code and moved into erc-tracke.l
 +	   Its auto-loaded now
 +
 +	* erc-track.el 1.1: Split code from erc.el
 +
 +2002-02-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.12:
 +	* erc-target now uses erc-port-to-string
 +
 +	* servers.pl 1.1:
 +	Script to convert mircs servers.ini to a elisp salist kind of thing.
 +	(development tool, it doesnt help you much as a user)
 +
 +	* erc.el 1.201:
 +	* erc-display-line-buffer: renamed to erc-display-line-1
 +	* erc-port-equal: New function.
 +	* erc-normalize-port: Used by erc-port-equal
 +	* minor docstring fixes
 +
 +2002-02-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.200:
 +	* erc-already-logged-in-p: compare ports is more robust now.
 +
 +	* erc-button.el 1.8: * Add buttonization to erc-send-modify-hook, too
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.199:
 +	Use insert-before-markers instead of insert in erc-display-line-buffer
 +	This fixed point@column 0 problem and gives us some speedup! yay
 +
 +	* erc-ibuffer.el 1.11, erc.el 1.198: minor fixes
 +
 +	* erc.el 1.197:
 +	* (erc-line-beginning-position): Renamed to erc-beg-of-input-line.
 +	* (erc-line-end-position): Renamed to erc-end-of-input-line.
 +	* erc-multiline-input-p: Variable removed.
 +
 +	* erc.el 1.196:
 +	Minor docstring fixes (using M-x checkdoc-current-buffer)
 +	  If you find time, and you are native english speaker, do that too!!
 +
 +	* erc.el 1.195: fixed macro-invokation
 +
 +2002-01-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.194: * erc-with-all-buffers-of-server: use erc-list-buffers
 +	* erc-process-away, erc-{save,kill}-query-buffers: use it.
 +	* erc-cmd-away-all: new command. Set away/back on all servers.
 +
 +	* erc.el 1.193:
 +	* Fix last multiline bug in erc-send-distinguish-noncommands.
 +
 +2002-01-31  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.10, erc.el 1.192: minor fixes
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.9, erc-menu.el 1.3, erc-speak.el 1.19, erc.el 1.191:
 +	Renamed erc-track-modified-channels-minor-mode to erc-track-modified-channels-mode (at least, its a bit shorter)
 +	Added docstring to erc-server-hooks (through the macro)
 +	Minor docfix in obsolete hook
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.190:
 +	* erc-send-current-line: fix behaviour where buffer changes.
 +	* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
 +
 +	* erc-ring.el 1.2, erc.el 1.189:
 +	* new hooks: erc-send-pre-hook, erc-send-modify-hook, erc-send-post-hook
 +	* erc-send-this: new variable
 +	* erc-noncommands-list: new constant.
 +	* erc-send-distinguish-noncommands: use it. (First filter function for sending! yay!)
 +	* erc-send-current-line: nearly completely rewritten.
 +	  - now handles multiline input. (yay!)
 +	  - now uses the three hooks from above.
 +	* erc-process-line: new arg, no-command: don't process this line as a command.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.12, erc-button.el 1.7, erc-speak.el 1.18, erc.el 1.188:
 +	hook handling rewrite phase 1.
 +
 +2002-01-30  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.187: * Rework erc-server-PRIVMSG-or-NOTICE
 +	* New function: erc-is-message-ctcp-p
 +	* New function: erc-format-privmessage
 +	* New function: erc-mark-message
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +
 +2002-01-30  Mario Lang  <mlang@delysid.org>
 +
 +	* CREDITS 1.1, HISTORY 1.1:
 +	Initial checkin.
 +
 +2002-01-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.186: * erc-put-text-properties: make OBJECT optional
 +	* erc-put-text-property: same
 +	* erc-server-PRIVMSG-or-NOTICE: use them.
 +	* Make erc-display-line-buffer: add the "\n" even when the string would be invisible.
 +	* same: make the \n invisible, too (:
 +
 +2002-01-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.8, erc.el 1.185:
 +	Rewrote channel tracking using window-configuration-change-hook instead of defadvices.
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-fill.el 1.6, erc.el 1.184:
 +	* Macro define-erc-highlight-customization: Ease up defining
 +	  erc-{fool,pal,..}-highlight-props defcusts.
 +	* defcusts:
 +	  - erc-fool-highlight-props
 +	  - erc-pal-highlight-props
 +	  - erc-dangerous-host-highlight-props
 +	  - erc-keyword-highlight-props
 +
 +	  Customizable to either nil or "Hide message".
 +	* erc-string-invisible-p: check for invisible chars in string
 +	* erc-display-line-buffer: use it.
 +	* erc-put-text-properties: put a list of props into a piece of text.
 +	* erc-server-PRIVMSG-or-NOTICE: use it; set appropriate
 +	  highlight-props for entire incoming message. This set of changes
 +	  allows you to e.g. auto-ignore fools.
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.7:
 +	Added highlight detection support to the Mark column.
 +	Now p, k, f, and d indicate pal, keyword, fool and dangerous-host related activity.
 +
 +	* erc.el 1.183:
 +	Highlight tracking finished. All necessary info should now be in erc-modified-channels.
 +
 +	* erc.el 1.182, erc-ibuffer.el 1.6, erc-speedbar.el 1.7:
 +	Added highlight tracking to track-modified-channels
 +	   no display code yet, the info is just kept in erc-modified-channels
 +	Added erc-modified column to ibuffer
 +	speedbar update
 +
 +	* erc-ibuffer.el 1.5: Added erc-members column
 +
 +	* erc-ibuffer.el 1.4: *** empty log message ***
 +
 +2002-01-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.11:
 +	* Fix a slight typo. The hook function should be called in
 +	  erc-server-376-hook (-:
 +
 +2002-01-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.3: *** empty log message ***
 +
 +2002-01-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-ibuffer.el 1.2: Fixup, it sort of works now. Try it
 +
 +	* erc-ibuffer.el 1.1: Initial version
 +
 +2002-01-26  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.181: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.10: * fix two bad things:
 +	  - fix the "proc trick": pass proc as an arg through
 +	    ...-insinuate-... to ...-show-entry
 +	  - hook highlighting into the 376 hook. This one is bound to get
 +	    called (-:
 +	* We now only append to hooks only.
 +	* Highlighting of changing records gets updated automatically.
 +
 +2002-01-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.180: *** empty log message ***
 +
 +2002-01-25  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-bbdb.el 1.9: * nearly complete rewrite of erc-bbdb:
 +	  -  Removed code duplication in erc-bbdb-NICK and -JOIN.
 +	  -  Made erc-bbdb-show-entry more general and intelligent.
 +	  -  erc-bbdb-insinuate-entry is now erc-bbdb-insinuate-and-show-entry
 +	     (note the different arglist!):
 +	  -  erc-search-name-and-create now creates "John Doe" users if name
 +	     is not specified.
 +	  -  No sign of "mail" anywhere anymore. It's all finger-host. (-:
 +	  -  erc-bbdb-popup-p is now called erc-bbdb-popup-type.
 +	  -  New customize values:
 +	     . erc-bbdb-irc-channel-field     channel field name
 +	     . erc-bbdb-irc-highlight-field   (see below)
 +	     . erc-bbdb-auto-create-on-nick-p auto-create record on join
 +
 +	* Highlighting based on BBDB is now here! Specify which type of
 +	  highlighting a person in the BBDB (whose nick you know) and have
 +	  fun! Read help to erc-bbdb-init-highlighting for details. Changes:
 +	  -  new function erc-bbdb-init-highlighting: gets called on server
 +	     connect.
 +	  -  new function erc-bbdb-highlight-record: highlights a person's
 +	     nick names.
 +
 +2002-01-24  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-button.el 1.6:
 +	* Fix the erc-button-alist regexp for EmacsWiki stuff. delYsid's version
 +	  is better (-:
 +
 +	* erc-button.el 1.5: * Added an Ewiki: specifier to the url-regexp.
 +	  <nickname> EmacsWiki: EmacsIRCClient tells you <bla>
 +	  should highlight "EmacsWiki: EmacsIRCClient" and allow you to
 +	  browse to the wiki when the button is activated.
 +	* new custom: erc-emacswiki-url.
 +	* new function: erc-browse-emacswiki: use it.
 +
 +2002-01-23  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-bbdb.el 1.8:
 +	erc-bbdb-NICK: Added regexp-quote around fingerhost search.
 +
 +2002-01-10  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.179:
 +	* Channel saving/killing on quit from server implemented:
 +	 - defcust erc-save-queries-on-quit: Save server's channel buffers on quitting from server
 +	 - defcust erc-kill-queries-on-quit: Kill server's channel buffers on quitting from server
 +	 - Macro erc-with-all-buffers-of-server: Run a form inside all the server's query buffers
 +	 - Functions erc-{kill,save}-query-buffers: use it.
 +	* Added indent-tabs-mode: t to Local Variables section.
 +
 +2002-01-07  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-replace.el 1.2: * fix stupid documentation errors.
 +
 +2002-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.178:
 +	* (toplevel): Revert previous change. This resulted ina  recursive load...
 +	   You have to put (require 'erc-button) into your .emacs for now
 +
 +2002-01-05  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.177:
 +	* Added require for erc-button. This is devel. so I need testers :)
 +
 +	* erc-button.el 1.4: * Added proper file headers (GPL).
 +
 +2002-01-04  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.3: * erc-button-alist: Added entry for finger
 +
 +	* erc-button.el 1.2: * Removed bogus usage of :button-keymap.
 +	P
 +	   Does anyone know what this was supposed to do anyway?
 +
 +	* erc-button.el 1.1: * Initial version.
 +	* This module allows a way of buttonizing text in IRC buffers.
 +	  Default it is used for URLs, but other things could be added.
 +	  see if you can find another use, erc-button-alist
 +
 +See ChangeLog.01 for earlier changes.
 +
 +    Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
diff --cc ChangeLog.03
index cf0f4f7,0000000..aade9cd
mode 100644,000000..100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@@ -1,2151 -1,0 +1,2166 @@@
 +2003-12-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.595 (erc-cmd-HELP):
 +	Changed to prefer giving help for erc-cmd-* functions over
 +	   similarly-named Elisp functions (e.g., erc-cmd-LIST vs. list).
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.594 (erc-query-buffer-p): Added this function.
 +
 +2003-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.593 (erc-cmd-SV): Use erc-emacs-build-time.
 +
 +	* erc-compat.el 1.15: erc-emacs-build-time: New variable.
 +
 +	* erc.el 1.592 (erc-cmd-SAY):
 +	Reintroduced the feature where the spaces between
 +	"/SAY" and the rest of the line were being sent with the message.
 +
 +2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.591 (erc-server-buffer-p):
 +	Fixed a bug where this function sometimes would return
 +	    nil when it should return t.
 +
 +2003-12-27  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.590 (erc-generate-new-buffer-name):
 +	Really fixed a bug where ERC would reuse
 +	    a connected server buffer when erc-reuse-buffers is non-nil.
 +	(erc-cmd-JOIN): Now we tell the user when he attempts to join the same
 +	    channel twice on the same server.
 +
 +	* erc.el 1.589 (erc-generate-new-buffer-name):
 +	Fixed a bug where ERC would reuse a connected server buffer when erc-reuse-buffers is non-nil.
 +
 +	* erc.el 1.588 (erc-cmd-SAY):
 +	Fixed a bug where the spaces between "/SAY" and the rest of the
 +	    line were being sent with the message.
 +
 +	* erc-list.el 1.15: Fixed another typo.
 +
 +	* erc-list.el 1.14: Fixed a typo.
 +
 +	* erc-list.el 1.13:
 +	Added text to the top of the channel list buffer describing the keybinding for
 +	function erc-chanlist-join-channel.
 +
 +	* erc-list.el 1.12: Minor appearance changes.  No functional change.
 +
 +	* erc-list.el 1.11:
 +	Implemented function erc-chanlist-join-channel.  Added variable
 +	erc-chanlist-channel-line-regexp.  Got rid of function
 +	erc-chanlist-pre-command-hook.  Changed the logic for how channel lines are
 +	highlighted.
 +
 +2003-12-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-list.el 1.10:
 +	Removed a bunch of unused code.  No semantic change.
 +
 +	* erc-list.el 1.9: Added lots of functionality.
 +
 +2003-12-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.58, erc.el 1.587:
 +	New custom type erc-message-type, use it in erc-hide-list and erc-track-exclude-types
 +
 +2003-12-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.57 (track-when-inactive): New module.
 +	(erc-track-visibility): New option.
 +	(erc-buffer-activity): New variable.
 +	(erc-buffer-activity-timeout): New variable.
 +	(erc-user-is-active): New function.
 +	(erc-buffer-visible): New function.
 +	(erc-modified-channels-update): Replace get-buffer-window call
 +	with call to erc-buffer-visible.
 +	(erc-track-modified-channels): Ditto.
 +
 +2003-12-14  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-track.el 1.56 (erc-modified-channels-update):
 +	Force update of modeline.  Makes sure
 +	that the tracked channels disappear in other buffers too.
 +
 +2003-12-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.586 (define-erc-module):
 +	New optional argument LOCAL-P.  If non-nil, then
 +	mode will be created as buffer-local rather than a global mode.
 +	(erc-cmd-CTCP): Fix indentation from last commit.
 +
 +	* erc-compat.el 1.14 (erc-define-minor-mode):
 +	Deal with :global and :group keywords.
 +
 +	* erc-nickserv.el 1.13 (erc-current-network):
 +	Make server regex more permissive.
 +
 +	* erc.el 1.585 (erc-cmd-CTCP):
 +	Don't add a space to end of command when ARGS are
 +	empty.  This fixes a bug whereby requests of the form "VERSION " were
 +	being sent, and ignored.
 +
 +2003-11-27  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.9: From Adrian Aichner <adrian@xemacs.org>
 +	* erc-log.el (erc-log-file-coding-system): Use 'binary
 +	coding-system under XEmacs (instead of 'emacs-mule).
 +	* erc-log.el (erc-w32-invalid-file-characters): Removed as no
 +	longer needed.
 +	* erc-log.el (erc-generate-log-file-name-long): Use
 +	`convert-standard-filename', which exists in XEmacs too.
 +
 +2003-11-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-identd.el 1.1: Code provided by johnw, thanks!
 +
 +2003-11-09  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.584 (erc-latest-version): Clean up docstring.
 +	Remove requirement for w3, wrap REQUIRE statement in IGNORE-ERRORS.
 +	Update viewcvs url to correct location.
 +	(erc-ediff-latest-version): Make sure that we find the uncompiled
 +	erc.el, error if not.
 +
 +2003-11-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.583: Add more info to /sv
 +
 +2003-11-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.582: Added optional argument BUFFER to erc-server-buffer-p.
 +
 +2003-11-04  Mario Lang  <mlang@delysid.org>
 +
 +	* AUTHORS 1.6: Add sachac
 +
 +2003-11-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.581 (erc-server-366):
 +	chnl is 4th element of parsed, not fifth.
 +	(erc-channel-end-receiving-names): Pass correct number of arguments
 +	to delete-if-not.
 +
 +	* erc.el 1.580 (erc-update-current-channel-member):
 +	 Use erc-downcase when comparing
 +	nick entries.  Cleanup indentation.
 +
 +2003-11-01  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-sound.el 1.4: Added a (provide 'erc-sound) line.
 +
 +	* erc.el 1.579 (erc-cmd-NAMES): send to TGT, not CHANNEL.
 +
 +2003-10-29  Sandra Jean Chua  <sacha@free.net.ph>
 +
 +	* erc-pcomplete.el 1.21, erc.el 1.578, CREDITS 1.6:
 +	Merged Jeremy Maitin-Shepard's patch for time-sensitive nick completion.
 +
 +2003-10-27  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.19, debian/changelog 1.24:
 +	New Debian package 4.0.cvs.20031027
 +
 +2003-10-25  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.577: Fix typo tuncate->rruncate
 +
 +2003-10-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.80: From Stephan Stahl <stl@isogmbh.de>:
 +	 * (erc-dcc-send-block): Kill buffer if transfer completed correctly.
 +
 +2003-10-22  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.55 (erc-track-disable):
 +	Do not deactivate all advices for `switch-to-buffer',
 +	just disable the erc specific one. (Bug#217022).
 +
 +2003-10-18  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-log.el 1.8 (erc-log-file-coding-system): New variable.
 +	(erc-save-buffer-in-logs): Use it.
 +
 +2003-10-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.576 (erc-interpret-mirc-color): New boolean defcustom
 +
 +	* erc.el 1.575: Do not use -nowait on darwin (thanks johnw)
 +
 +2003-10-15  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.574 (define-erc-module):
 +	Set erc-FOO-mode appropriately in erc-FOO-enable
 +	and erc-FOO-disable.
 +
 +2003-10-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.12 (erc-mode):
 +	Reset idletime on connect. Fixes an annoying bug which
 +	flooded the server with aways on reconnect.
 +	(erc-autoway-reset-idletime): Accept optional args so we can hook it
 +	onto erc-server-001-hook.
 +
 +2003-10-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.573 (erc-hide-list): Add a nice defcustom type
 +
 +2003-10-08  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.18, debian/changelog 1.23, debian/control 1.8:
 +	Debian snapshot 20031008
 +
 +	* erc-speedbar.el 1.11:
 +	Patch from Eric M. Ludlam <eric@siege-engine.com>:
 +	 - (erc-install-speedbar-variables): Add functions list (needs new speedbar?)
 +	 - (erc-speedbar-buttons): Add doc.  Clear the buffer
 +	 - (erc-speedbar-sort-channel-members): New function.
 +	 - (erc-speedbar-expand-channel): Call new sort function.  Change some visuals.
 +	 - (erc-speedbar-insert-user): Change some visuals based on channel data.
 +	 - (erc-speedbar-line-text, erc-speedbar-item-info): New functions
 +	Add proper elisp file header.
 +
 +2003-10-02  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.22 (erc-match-syntax-table): New variable.
 +	(erc-match-current-nick-p): Use it.
 +
 +	* erc.el 1.572 (erc-quit-reason-zippy, erc-part-reason-zippy): Use
 +	`erc-replace-regexp-in-string' rather than
 +	`replace-regexp-in-string'.
 +	(erc-command-indicator-face): New face, used to show commands if
 +	`erc-hide-prompt' is nil and `erc-command-indicator' is non-nil.
 +	(erc-command-indicator): Clean up doc-string.
 +	(erc-display-prompt): New optional argument FACE, use this rather
 +	than `erc-prompt-face' to fontify the prompt if non-nil.
 +	(erc-send-current-line): Pass in `erc-command-indicator-face' to
 +	`erc-display-prompt'.
 +
 +	* erc-compat.el 1.13 (erc-replace-regexp-in-string): New function.
 +	Alias for `replace-regexp-in-string' on Emacs 21.
 +	Argument massaging for `replace-in-string' for XEmacs.
 +
 +2003-09-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.571 (erc-keywords): Removed. Wasn't used by anything.
 +
 +2003-09-25  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.570: ERC-HIDE-PROMPT: add custom group
 +	ERC-COMMAND-INDICATOR: new variable.
 +	ERC-COMMAND-INDICATOR: new function.
 +	ERC-DISPLAY-PROMPT: new argument, PROMPT, used to override default
 +	prompt.
 +	ERC-SEND-CURRENT-LINE: pass ERC-COMMAND-INDICATOR to ERC-DISPLAY-PROMPT.
 +
 +2003-09-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.569 (erc-parse-line-from-server):
 +	Ignore empty lines as required by RFC.
 +
 +2003-09-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.568: Add lag time calculation
 +
 +2003-09-13  Mario Lang  <mlang@delysid.org>
 +
 +	* Makefile 1.17, debian/README.Debian 1.7, debian/changelog 1.22:
 +	New debian release
 +
 +	* erc-notify.el 1.22:
 +	Call erc-notify-install-message-catalogs on load, not on module init
 +
 +	* erc.el 1.567 (erc-update-modules):
 +	Use `load' instead of `require'.  XEmacs appears
 +	to have the NOERROR arg only sometimes... Strange
 +
 +	* erc.el 1.566: No fboundp if we have a defvar
 +
 +	* erc.el 1.565: Properly defvar erc-ping-handler
 +
 +2003-09-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.564 (erc-setup-periodical-server-ping):
 +	check if erc-ping-handler is
 +	    bound before referencing it
 +
 +2003-09-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.563 (erc-cmd-NICK):
 +	Warn about exceeded NICKLEN if we know it.
 +
 +	* erc.el 1.562: Make erc-server-PONG obey erc-verbose-server-ping.
 +	Cancel old `erc-ping-handler' timer when restablishing connection in the same
 +	buffer.
 +
 +	* debian/changelog 1.21, Makefile 1.16: New debian snapshot
 +
 +	* erc-dcc.el 1.79, erc-xdcc.el 1.6:
 +	Use new function erc-dcc-file-to-name to convert spaces to underscores
 +
 +	* erc-xdcc.el 1.5: Add autoload for erc-xdcc-add-file
 +
 +2003-09-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.78: indent fixes and copyright update
 +
 +	* erc.el 1.561:
 +	erc-send-ping-interval: New defcustom which defaults to 60.
 +	Every 60 seconds, we send PING now.
 +	This should fix the "connection silently lost" bug.
 +	Please test this change extensively, and report problems.
 +
 +2003-09-07  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.560 (erc-default-coding-system):
 +	Test for undecided and utf-8
 +	before setting.
 +
 +2003-09-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.559 (erc-modules): Add some more symbols to the set
 +
 +	* erc.el 1.558 (erc-modules):	* erc.el 1.558 (erc-modules): Add :greedy t to the set in 
 +
 +	* erc-dcc.el 1.77:
 +	More autoloads which make dcc autoload upon ctcp dcc query received.
 +
 +	* erc-dcc.el 1.76 (erc-cmd-DCC): Add Autoload.
 +	(pcomplete/erc-mode/DCC): Ditto, makes DCC autoloadable just by using
 +	completion.
 +	Also only offer "send" if fboundp make-network-process.
 +
 +	* erc-autojoin.el 1.6: Update copyright
 +
 +	* erc-autojoin.el 1.5 (erc-autojoin-add):
 +	Only add the channel if it is not already there.
 +
 +	* erc-notify.el 1.21:
 +	Use `define-erc-module' instead of old `erc-notify-initialize'.
 +	Now defines the global minor mode erc-notify-mode, and should also
 +	be controllable via `erc-modules' with symbol `notify'.
 +
 +	* erc.el 1.557 (erc-modules):
 +	Fix paren-in-column-zero bug in docstring.
 +	Add a sort of bogus, but still better :type.
 +	Add autojoin and netsplit by default.
 +	(erc-update-modules): Dont barf with an error if `require' fails.
 +	We can still error out if the mode is not defined.
 +
 +2003-08-31  Andreas Fuchs  <asf@void.at>
 +
 +	* erc.el 1.556:
 +	* make 353 (NAMES reply) output go into the appropriate channel buffer
 +	  (if it exists) or into the active erc buffer (if not).
 +
 +2003-08-29  mtoledo  <mtoledo@confusibombus>
 +
 +	* erc.el 1.555:
 +	Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today.
 +
 +2003-08-29  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.554: Fix typo in varname which led to a compiler warning
 +
 +	* AUTHORS 1.5: Added lawrence
 +
 +2003-08-27  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.75:
 +	Set process and file-coding system to 'binary (for Windows)
 +
 +	* erc-stamp.el 1.30: Rename custom group erc-timestamp to erc-stamp.
 +
 +2003-08-07  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-fill.el 1.23 (erc-fill-disable):
 +	Remove erc-fill, not erc-fill-static from
 +	erc-insert-modify-hook.
 +
 +2003-08-05  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.553 (erc-send-current-line):
 +	Now we display the prompt for previously entered commands
 +	    based on the value of customization variable erc-hide-prompt.  This change is
 +	    closely related to revision 1.552 by wencem.
 +
 +2003-08-04  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el 1.552 (erc-send-current-line):
 +	If we're sending a command, don't display
 +	the prompt.
 +
 +2003-08-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.54: patch from David Edmondson (dme AT dme DOT org)
 +
 +	This patch makes button 3 on the erc-track buffer names in the
 +	modeline show the selected buffer in another window. It's analogous to
 +	button 2 which shows the buffer in the current window.
 +
 +2003-07-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.551 (erc-display-line-1):
 +	Fixed bad indentation on one line.  No semantic change.
 +
 +2003-07-29  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc-match.el 1.21:
 +	Quote open paren in docstring of erc-text-matched-hook
 +
 +	* erc.el 1.550: Anchor match only at beginning in erc-ignored-user-p.
 +
 +	* erc-button.el 1.47: New variable erc-button-wrap-long-urls.
 +	Modified erc-button-add-buttons:
 +	  New optional argument REGEXP.
 +	  If we're buttonising a URL and erc-button-wrap-long-urls is
 +	  non-nil, try and wrap them
 +
 +	Modified erc-button-add-buttons-1:
 +	  Pass regexp to erc-button-add-buttons.
 +
 +2003-07-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.549 (erc-network-name):
 +	Improved docstring.  Removed an unnecessary call to erc-server-buffer.
 +
 +2003-07-28  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.548: By lawrence:
 +	(erc-ignored-user-p): Use anchored regexp.
 +	(smiley): Fix missing quote in `remove-hook' call.
 +
 +2003-07-26  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-nets.el 1.4, erc-nickserv.el 1.12, erc.el 1.547:
 +	Changed all references to Openprojects into references to Freenode.
 +
 +2003-07-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.546:
 +	Now variable erc-debug-irc-protocol is defvar'ed instead of defcustom'ed.
 +	Made the docstring clearer too.
 +
 +	* erc.el 1.545: Fixed a wrong-type-argument error from window-live-p.
 +
 +2003-07-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.7 (erc-log-setup-logging):
 +	set buffer-file-name to "", as (basic-save-buffer)
 +	    will prompt for a buffer name before invoking hooks. the buffer-file-name
 +	    will be overridden by (erc-save-buffer-in-logs) anyway - the main danger
 +	    of doing this is write-file-contents hooks. Let's see if anyone complains.
 +	(erc-save-buffer-in-logs): return t, so that further write hooks are not run
 +
 +2003-07-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.74 (erc-dcc-open-network-stream):
 +	-nowait still crashes emacs cvs - disable for now
 +
 +2003-07-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.544 (erc): Minor docstring modification.
 +
 +2003-07-01  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-match.el 1.20 (erc-match-current-nick-p):
 +	match only on word boundaries
 +
 +	* erc-log.el 1.6 (erc-log-setup-logging):
 +	not sure how this crept in again - make sure we set
 +	    buffer-file-name to nil, since otherwise it is not possible to open
 +	    previous correspondence in another buffer while a conversation is open
 +
 +2003-06-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.543 (erc-network-name):
 +	Now makes some intelligent guesses if the server didn't tell
 +	    us the network name.
 +
 +2003-06-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.542 (erc-default-coding-system): Use utf-8 as the default
 +	encoding for outgoing stuff and undecided as the default for
 +	incoming stuff.
 +	(erc-coding-sytem-for-target): New.
 +	(erc-encode-string-for-target): Use it.
 +	(erc-decode-string-from-target): Use it.  Removed the flet
 +	erc-default-target hack and documented the dynamically bound
 +	variable `target' instead.
 +
 +2003-06-25  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.541 (erc-log-irc-protocol):
 +	Now we keep point on the bottom line of the window
 +	    displaying the *erc-protocol* buffer if it is at the end of the
 +	    *erc-protocol* buffer.
 +
 +	* erc.el 1.540:
 +	Added some text to the docstring for variable erc-debug-irc-protocol.
 +
 +2003-06-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.73 (erc-dcc-auto-mask-p):
 +	Fixed a docstring typo that caused a load-time error.
 +
 +	* erc-dcc.el 1.72 (erc-dcc-auto-mask-p):
 +	Changed reference to undefined variable erc-dcc-auto-mask-list
 +	    to erc-dcc-auto-masks.
 +	Changed default value of variable erc-dcc-auto-masks to nil and added text to its
 +	    docstring.
 +
 +	* erc-notify.el 1.20 (erc-notify-timer and erc-notify-QUIT):
 +	Added network name to notify_off message.
 +
 +	* erc.el 1.539 (erc-network-name):
 +	Now returns the name of the IRC server if the network name
 +	    cannot be determined.
 +
 +	* erc-notify.el 1.19 (erc-notify-JOIN and erc-notify-NICK):
 +	Added argument ?m to call to erc-display-message.
 +
 +	* erc-dcc.el 1.71 (erc-dcc-do-LIST-command):
 +	Fixed a bug where I assumed (plist-get elt :type)
 +	    returns a string -- it really returns a symbol.
 +
 +	* erc-notify.el 1.18 (erc-notify-timer):
 +	Now we include the network name in the notify_on message.
 +
 +	* erc.el 1.538:
 +	New function: erc-network-name.  Returns the name of the network that the
 +	    current buffer is associate with.  Not every server sends the 005 messages
 +	    that enable the network name to be known.  If the network name is
 +	    not known, the string "UNKNOWN" is returned.
 +
 +	* erc-dcc.el 1.70 (erc-dcc-chat-setup):
 +	Added a comment.  Fixed a bug where a DCC CHAT buffer has no
 +	    prompt when it first appears.
 +
 +	* erc-dcc.el 1.69 (erc-dcc-chat-parse-output):
 +	Now a DCC chat buffer displays the nick using
 +	    erc-nick-default-face just like in a channel buffer.
 +
 +2003-06-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.537 (erc-display-prompt):
 +	Fixed incorrect indentation.  No semantic change.
 +
 +	* erc.el 1.536 (erc-strip-controls):
 +	Minor change to regexp that matches IRC color control
 +	    codes.  I was seeing usage as follows: ^C07colored text^C^C04other color.
 +	    Now we strip a ^C followed by zero, one, or two digits.  Before this change,
 +	    we stripped a ^C followed by one or two digits.
 +
 +	* erc-dcc.el 1.68 (erc-dcc-do-LIST-command):
 +	Improved format of output of /DCC LIST.  Now the
 +	    "Size" column for a DCC GET includes the percentage of the file that has
 +	    been retrieved.
 +	(erc-dcc-do-GET-command): Now it works if erc-dcc-default-directory is set.
 +
 +2003-06-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-log.el 1.5:
 +	* added quickstart information to the comments up the top
 +
 +2003-06-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.535:
 +	Default to open-network-stream on MS Windows. (thanks lawrence)
 +
 +2003-06-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.534 (erc-process-input-line):
 +	refactor so that wrong-number-of-arguments is
 +	    caught when using do-not-parse-args - this lets do-not-parse-args
 +	    commands display help messages on incorrect syntax in a uniform manner.
 +	    This no longer raises a bad-syntax error - was this a catch-all to stop a
 +	    backtrace? Does it belong?
 +	(erc-cmd-APPENDTOPIC): the correct way to display help when you want to
 +	    accept an abitrary string is to (signal 'wrong-number-of-arguments nil).
 +	    This fixes a bug where people could not /at topics with a space in them.
 +
 +2003-06-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.533:
 +	Re-add the last few changes which weren't merged for some reason.
 +
 +	* erc.el 1.532 (erc-cmd-APPENDTOPIC): show help when given no arguments
 +
 +	Patch from MrBump. Fixes problem with erc-set-topic inserting ^C characters
 +	into the topic. Also removes dependency on CL.
 +
 +2003-06-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.531:
 +	Added comment to explain (eval-after-load "erc" '(erc-update-modules)).
 +
 +2003-06-01  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-pcomplete.el 1.20: Add completion for /unignore
 +
 +2003-05-31  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-compat.el 1.12 (erc-encode-coding-string): The default binding,
 +	if encode-coding-string was not available, must be a defun that
 +	takes multiple arguments.  Did that.
 +
 +2003-05-30  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.530:
 +	Add handlers for 313 and 330 (by arne@rfc2549.org, thanks)
 +
 +2003-05-30  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.529:
 +	patch from MrBump to make /mode #foo +b work again (erc-cmd-BANLIST only
 +	temporarily changes them now)
 +
 +2003-05-29  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.528 (erc-select):
 +	server is now defaulted with erc-compute-server.
 +	A few cosmetic fixes.
 +	(erc-default-coding-system): Renamed from erc-encoding-default.
 +	(erc-encoding-default): Renamed to erc-default-coding-system.
 +	(erc-encoding-coding-alist): Documentation updated to cover regexps.
 +	(erc-encode-string-for-target): Now considers keys of
 +	erc-encoding-coding-alist to be regexps.  Rely on erc-compat
 +	wrt. MULE support.
 +	(erc-decode-string-from-target): New function.
 +	(erc-send-current-line): eq -> char-equal fix.
 +	(erc-server-TOPIC): topic is now decoded with
 +	erc-decode-string-from-target.
 +	(erc-parse-line-from-server): Line from server is no longer decoded
 +	here.
 +	(erc-server-PRIVMSG-or-NOTICE): Message from a user is decoded here,
 +	sspec -> sender-spec for clarity.  Cosmetic if -> when fix.
 +	(erc-server-TOPIC): sspec -> sender-spec
 +	(erc-server-WALLOPS): Ditto.
 +
 +	* erc-compat.el 1.11 (erc-decode-coding-string):
 +	Now requires coding-system as an argument.
 +
 +2003-05-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.527:
 +	erc-part|quit-hook is only run on a part|quit directed to our nick, reflect that in the docstring to avoid confusion
 +
 +2003-05-01  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-truncate.el 1.3:
 +	* erc-truncate-buffer-to-size: use fboundp. Scheme takes its toll...
 +
 +2003-05-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el 1.2: remove require of erc-log
 +	(erc-truncate-buffer-to-size): use erc-save-buffer-in-logs when it's
 +	there, else, dont.
 +
 +2003-04-29  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.4, erc-truncate.el 1.1, erc.el 1.526: erc.el:
 +		* erc-cmd-QUIT: Remove references to code in erc-log.el, to
 +		  not force autoloading of erc-log.el
 +		* erc-server-PART: ditto.
 +		* erc-quit-hook: new hook, run when /quit command is
 +		  processed.
 +		* erc-cmd-QUIT: use it.
 +		* erc-part-hook: new hook, run then PART message is
 +		  processed.
 +		* erc-cmd-PART: use it.
 +		* erc-connect-pre-hook: new hook, run before connection to IRC
 +		  server is started.
 +		* erc: use it.
 +		* erc-max-buffer-size: Move truncation variables and functions
 +		  to erc-truncate.el
 +		* erc-truncate-buffer-on-save: moved to erc-log.el
 +		* erc-initialize-log-marker: new function.
 +	erc-log.el:
 +		* erc-truncate-buffer-on-save: New defcust here; from erc.el
 +		* erc-truncate-buffer-on-save: Put it in group `erc-log'
 +		* erc-log-channels-directory: Remove trailing slash from
 +		  default value.
 +		* Add functions to erc-connect-pre-hook, erc-part-hook and
 +		  erc-quit-hook to avoid getting autoloaded.
 +
 +	erc-truncate.el:
 +		* Contains the truncation functions and defcusts from erc.el.
 +		* define-erc-module clause added; new erc-truncate-mode.
 +
 +2003-04-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.525 (erc):
 +	Check wether erc-save-buffer-in-logs is bound, too
 +
 +	* erc.el 1.524 (erc):
 +	Check wether erc-logging-enabled is bound before using it - not
 +	everyone is using erc-log.el!
 +
 +2003-04-28  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-log.el 1.3:
 +	* while we're at it, remove the (declare (ignore ignore)) statements.
 +
 +	* erc-log.el 1.2:
 +	* add autoload statement for erc-log-mode/etc. Sorry for the delay.
 +
 +	* erc-log.el 1.1, erc.el 1.523: * erc.el:
 +		- move variables and functions to erc-log.el:
 +			 defgroup `erc-log'
 +	                 defcustom `erc-log-channels-directory'
 +			 defcustom `erc-log-insert-log-on-open'
 +			 defcustom `erc-generate-log-file-name-function'
 +			 defun `erc-save-buffer-in-logs' (autoloads from erc-log.el)
 +	 		 defuns `erc-generate-log-file-name-*'
 +			 defun `erc-current-logfile'
 +			 defun `erc-logging-enabled' (autoloads from erc-log.el)
 +		- erc-truncate-buffer-to-size: fix for double-saving bug when
 +		  writing out truncated buffer contents. Thanks, lawrence mitchell <wence@gmx.li>!
 +		- erc-remove-text-properties-region: Fix case for read-only text.
 +		- erc-send-current-line: update insert-marker before calling the hooks.
 +		                         also, wrap (erc-display-prompt) so that it doesn't toggle
 +					 buffer-modified-p.
 +		- erc-interpret-controls: remove /very/ old commented-out function
 +		- erc-last-saved-position: make it a marker
 +		- erc: use it.
 +
 +	* erc-log.el: (thanks, lawrence mitchell <wence@gmx.li>!)
 +		- Move logging code from erc.el here
 +		- define-erc-module log: add; minor mode erc-log-mode is the
 +		  same as adding the `erc-save-buffer-in-logs' to
 +		  erc-send-post-hook and `erc-insert-post-hook'.
 +		- erc-w32-invalid-file-characters: add.
 +		- erc-enable-logging: add.
 +		- erc-logging-enabled: use it.
 +		- erc-logging-enabled: autoload.
 +		- erc-save-buffer-in-logs: fix for truncating saved buffer with read-only text.
 +		- erc-save-buffer-in-logs: use erc-last-saved-position.
 +		- erc-save-buffer-in-logs: fix saving half-written messages on
 +		  the prompt when saving the log file. (simply uses
 +		  erc-insert-marker as an upper bound for saving).
 +
 +2003-04-27  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.522:	* erc.el 1.522: erc-modules: added 
 +
 +2003-04-27  Alex Schroeder  <alex@gnu.org>
 +
 +	* Makefile 1.15 (UNCOMPILED): Added erc-compat.el.
 +	(clean): Remove .elc files, too.
 +	Patch by Hynek Schlawack <hynek+erc@hys.in-berlin.de>
 +
 +2003-04-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-button.el 1.46:
 +	erc-button-keymap: set the parent keymap to erc-mode-map
 +
 +2003-04-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.521:
 +	erc-official-location: shouldn't the official location be the base URL of erc?
 +
 +	* erc.el 1.520:
 +	erc-modules: updated the docstring to make the semantics clearer
 +
 +2003-04-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.519:
 +	Fix problem where % in NOTICE produced errors (from mmc)
 +
 +2003-04-18  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.518 (erc-toggle-debug-irc-protocol):
 +	moved a reference to 'buf' inside the let
 +	    statement which defines it. it's difficult to tell what the original
 +	    intentions were here - at the moment the debug window is displayed when
 +	    toggling either way.
 +
 +	* README 1.3, erc.el 1.517:
 +	(erc-update-modules: added a condition in for erc-nickserv -> erc-services
 +
 +	* erc-pcomplete.el 1.19:
 +	- that change to erc-update-modules making it require the modules first means
 +	  we don't need any special case handling here, so i reverted the previous
 +	  change
 +
 +	* erc.el 1.516:
 +	- don't require 'erc-auto, since windows users don't have access to make.
 +	  instead, we handle it in (erc-update-modules)
 +
 +2003-04-17  Damien Elmes  <erc@repose.cx>
 +
 +	* README 1.2, Makefile 1.14:
 +	Updated Makefile and documentation to reflect the new release
 +
 +	* erc.el 1.515:
 +	- note the previous change also updated the release number to erc 4.0!
 +	(erc-connect): fix a bug introduced by the previous release
 +
 +	* erc.el 1.514:
 +	fixed about 20 instances of (message (format ...)) which will break if the
 +	format returns a string with %s in it
 +
 +	* erc.el 1.513: erc-error-face: make it red, not pink
 +
 +	* erc-pcomplete.el 1.18:
 +	since pcomplete is autoloaded via erc-completion-mode, and completion is in
 +	erc-modules by default, we remove completion when pcomplete is added
 +
 +	* erc.el 1.512 (define-erc-module): no need for delete, use delq
 +
 +	* erc-members.el 1.5 (erc-nick-channels):
 +	(erc-person-channels) takes one arg
 +	(erc-format-user): again, they all take an arg
 +
 +	* erc.el 1.511:
 +	- require erc-auto when loading, so the default `erc-modules' can be loaded.
 +	  this makes erc-auto no longer a convenience but a necessity - all the name
 +	  of user friendliness.
 +	(define-erc-module): the enable and disable routines now update erc-modules
 +	    accordingly
 +	erc-modules: new variable controllig the modules which erc has loaded/will
 +	    load. when customising, it will automatically enable modules. it won't
 +	    automatically disable modules which are removed, yet.
 +	(erc-update-modules): enable all modules in `erc-modules'
 +
 +	* erc-dcc.el 1.67 (erc-dcc-open-network-stream):
 +	use the -nowait equiv if available
 +	erc-dcc-server-port: removed
 +	erc-dcc-port-range: allows a range of values, so you can have more than one
 +	    dcc
 +	(erc-dcc-server): support erc-dcc-port-range
 +	(erc-dcc-chat): use OCHAT for outgoing chat for now. we need to fix the
 +	    issues with allowing more than one chat with the same person
 +
 +	* erc.el 1.510:
 +	erc-log-channels: removed; set the directory to start logging
 +	(erc-directory-writeable-p): create directory if it doesn't exist, check if
 +	    it's writeable
 +	(erc-logging-enabled): don't reference erc-log-channels
 +
 +2003-04-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.509 (erc):
 +	but when inserting the contents of a previous logfile, use the logfile
 +	    name, not ""!
 +
 +	* erc.el 1.508 (erc):
 +	set buffer-file-name to "", since we have a custom saving function and
 +	    it's not needed. this enables one to open a log file with previous
 +	    correspondence, while talking to the person at the same time
 +
 +2003-03-29  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.507 (erc-prepare-mode-line-format):
 +	Now strips all text properties from the target before
 +	    putting it in the mode line.  Keeps the mode line looking consistent.
 +	(erc-channel-p): Improved docstring.
 +
 +2003-03-28  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.506 (erc-generate-log-file-name-with-date): New function.
 +	(erc-generate-log-file-name-function): Make it available.
 +
 +2003-03-24  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.505:
 +	Fix erc-prompt and erc-user-mode custom :type (Closes: #185794)
 +
 +2003-03-20  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.504:
 +	erc-server-hook-list: correct documentation of ordering of (proc parsed)
 +
 +2003-03-16  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.53 (erc-modified-channels-string):
 +	Make it a risky-local-variable.
 +
 +2003-03-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-track.el 1.52 (erc-track-modified-channels):
 +	Use (point-min) if we don't find a
 +	parsed-property, so it won't error out with nil...
 +
 +2003-03-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.51 (erc-track-switch-buffer):
 +	removed call to erc-modified-channels-update, as
 +	    this is done correctly on buffer switching in both emacs and xemacs now
 +
 +2003-03-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-track.el 1.50 (erc-find-parsed-property):
 +	simplified a little, so it shouldn't return nil anymore
 +
 +	* erc.el 1.503: erc-send-post-hook: document narrowing which occurs
 +
 +2003-03-14  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-track.el 1.49 (erc-find-parsed-property): New function.
 +	(erc-track-modified-channels): Use it instead of relying on
 +	point-min.
 +
 +2003-03-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.502:
 +	Fix erc-set-topic to accept a channel name as first word
 +
 +2003-03-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.66:
 +	Small patch (<10 lines, also slightly modified by Jorgen Schäfer) from
 +	David Spreen <netzwurm@debian.org> to add hostmask-authentication to
 +	DCC auto-accept.
 +
 +	erc-dcc-auto-mask-list: New variable
 +	(erc-dcc-handle-ctcp-send): Check erc-dcc-auto-mask-list
 +	(erc-dcc-auto-mask-p): New function
 +	erc-dcc-send-request: Docstring now mentions erc-dcc-auto-mask-list
 +
 +2003-03-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.11 (erc-clear-input-ring):
 +	New function.  Erases the contents of the input ring for
 +	   the current ERC buffer.
 +
 +2003-03-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.501:
 +	(erc-display-line-1) and (erc-send-current-line): Now these functions reset erc-insert-this
 +	    to t as soon as possible after consuming the value of that variable.  See the comments in
 +	    the code for the strange symptom this fixes.
 +	(erc-bol): Changed to call point-at-eol instead of line-end-position.  This increases XEmacs
 +	    portability, since XEmacs doesn't have line-end-position.  Patch suggested by Scott Evans
 +	    on the ERC mailing list.
 +
 +2003-03-04  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.500: banlist*: patch from mrbump to avoid using cl packages
 +
 +2003-03-04  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.499:
 +	Changed erc-noncommands-list from a constant to variable, so that users can
 +	    add their own erc-cmd-* functions to the list.  Improved the docstring too.
 +
 +2003-03-02  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.498 (erc-server-353):
 +	Now the output of "/NAMES #channel" appears in the currently
 +	    active ERC buffer, even if the user is not a member of #channel.
 +
 +	* erc.el 1.497 (erc-cmd-DEOP):
 +	Fixed a syntax error: invalid read syntax ")" caused by my last change.
 +
 +2003-03-01  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.496 (erc-cmd-DEOP):
 +	Fixed a wrong-type-argument error caused by calling split-string
 +	    on a list instead of on a string.  Removed the call to split-string entirely,
 +	    because it wasn't needed.
 +
 +	* erc.el 1.495 (erc-cmd-HELP):
 +	Changed to use intern-soft instead of intern.  Now "/HELP floob"
 +	    doesn't create a void function symbol erc-cmd-FLOOB.
 +
 +2003-02-25  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.494 (erc-cmd-SERVER):
 +	remove erroneous references to line, use server instead
 +
 +2003-02-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.493 (erc-toggle-debug-irc-protocol):
 +	Fixed a bug where the global value of
 +	    kill-buffer-hook was being modified instead of the buffer-local value.
 +
 +2003-02-22  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.492 (erc-cmd-KICK):
 +	Now supports any number of words in the REASON string.  Examples
 +	    of the /KICK command are:
 +	      /KICK franl You don't belong here
 +	      /KICK franl Bye
 +	      /KICK franl
 +	      /KICK #channel franl Go away now
 +	      /KICK #channel franl Bye
 +	      /KICK #channel franl
 +
 +2003-02-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.29 (erc-insert-timestamp-right):
 +	Make the timestamp rear-nonsticky, so
 +	C-e works at the beginning of the next line.
 +
 +2003-02-16  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.28:
 +	* s/choose/choice/ in customize options, as kensanata requested.
 +
 +2003-02-15  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.491 (erc-toggle-debug-irc-protocol):
 +	Now if the *erc-protocol* buffer is killed,
 +	    logging is turned off.  Prior to this change, the buffer would come back
 +	    into existence (generally unbeknownst to the user) after being killed.
 +
 +2003-02-11  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.490 (erc-send-current-line):
 +	we can't inhibit everything here when not connected,
 +	    as the user will expect commands like /server still to work. the
 +	    erc-cmd-handler should recover from errors instead
 +
 +2003-02-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.489:
 +	* we now run erc-after-connect on 422 (no motd) messages as well as the motd
 +	  messages
 +	(erc-login): revert the previous change
 +
 +	* erc.el 1.488 (erc-login): register that we're connected
 +
 +2003-02-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-members.el 1.4: * Provide erc-members
 +	* Fix excessive )
 +	* Comment out broken self-tests
 +
 +2003-02-07  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.487 (erc-connect):
 +	notify the user we're trying to connect when using asych
 +	    connections
 +
 +	* erc.el 1.486 (erc-connect): support an asyncronous connection
 +	(erc-process-sentinel): ditto
 +
 +	* erc-track.el 1.48:
 +	* advise switch-to-buffer in the case of xemacs, since it doesn't have
 +	  window-configuration-change-hook
 +
 +	* erc.el 1.485 (erc-send-current-line):
 +	if not connected, refuse to send either a message or
 +	    a command
 +
 +	* erc.el 1.484: (erc-save-buffer-in-logs):
 +	    - check for a sensibile region before saving the buffer. if the
 +	      connection process is killed early on, there is not a sensible region
 +	      to save
 +	    - don't set buffer-file-name on save. we don't need it, and it means we
 +	      can now find-file a log while an existing query is open with that
 +	      user
 +
 +	* erc.el 1.483 (erc-process-input-line):
 +	when displaying the help for a function, if no
 +	    documentation exists, don't fall over
 +	(erc-cmd-SAY): new function for quoting lines begining with /
 +	(erc-server-NICK):
 +	    - fix a bug where the "is now known as" message doesn't appear on newly
 +	      created /query buffers
 +	    - when a user changes their nick, update the query to point to the new
 +	      nick
 +
 +	* erc.el 1.482 (erc-send-current-command):
 +	don't reject multi-line commands. since
 +	    multiline-p is used as the no-command arg to erc-process-current-line,
 +	    multi-line text is never interpreted as a command. i believe this is the
 +	    correct behavior - it allows people to post the output of things like df
 +	    (sans header). if you want to change this, please provide a rationale
 +	    in the changelog
 +
 +	* erc.el 1.481 (erc-send-current-line):
 +	only match the first line when determining if a
 +	    multi-line command is allowed
 +
 +2003-02-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-bbdb.el 1.21 (erc-bbdb-highlight-record):
 +	Use alternate strings, not character
 +	classes to split the nick-field.
 +
 +2003-02-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.479 (erc-process-sentinel):
 +	Now we set erc-connected to nil every time we disconnect
 +	    from a server, not just when an unexpected disconnect happens.
 +
 +	* erc.el 1.478 (erc-connected):
 +	Removed redundant defvar of this variable.  Improved the
 +	    docstring.
 +	(erc-login): Changed to send a correct RFC2812 USER message (see section
 +	    3.1.3 of RFC2812 for the documentation of the semantics of each argument
 +	    of the USER message.
 +
 +2003-02-02  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.477 (erc-cmd-NOTICE): fix from mrbump
 +
 +2003-01-31  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.476 (erc-cmd-JOIN):
 +	Now we only send one JOIN command to the server when a channel
 +	    key is provided.
 +
 +2003-01-30  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.475 (erc-remove-channel-member):
 +	Fixed so that it runs erc-channel-members-changed-hook
 +	    with the channel buffer current, as is documented in the docstring for variable
 +	    erc-channel-members-changed-hook: "The buffer where the change happened is
 +	    current while this hook is called."
 +
 +2003-01-28  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.474:
 +	(erc-ignored-user-p),(erc-cmd-IGNORE),(erc-cmd-UNIGNORE): Now nicks are ignored
 +	    on a per-server basis.  Now, erc-ignore-list is only valid in server
 +	    buffers!  Do not reference it in channel buffers.
 +
 +	* erc.el 1.473 (erc-cmd-IGNORE):
 +	Now says "Ignore list is empty" if it erc-ignore-list is empty
 +	    instead of showing an empty list.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-nickserv.el 1.11 (services): Defined a module
 +
 +2003-01-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.472 (erc-process-ctcp-query):
 +	Display recipient of CTCP query if it's not
 +	our current nick.
 +
 +	* erc.el 1.471 (erc-cmd-WHOIS):
 +	Accept an optional second argument SERVER.
 +
 +2003-01-25  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.27 (stamp): erc-add-timestamp must always be added
 +	with the APPEND parameter -- not only when adding it on the right.
 +
 +2003-01-24  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-members.el 1.3 (erc-channel-members-changed-hook): Obsolete, use
 +	erc-members-changed-hook instead.  When it is set, add its content
 +	to erc-members-changed-hook.
 +	(erc-update-channel-member): Obsolete, use erc-update-member
 +	instead.  Defalias to that effect.
 +	(erc-remove-channel-member): New and already obsolete.  Use
 +	erc-remove-nick-from-channel instead.
 +	(erc-update-channel-info-buffer): Obsolete, use ignore instead.
 +	Yes, these have to go.
 +	(erc-channel-member-to-user-spec): Obsolete, use erc-format-user
 +	instead.
 +	(erc-format-user): New.
 +	(erc-ignored-reply-p): New, use it.
 +
 +	* erc-members.el 1.2:
 +	Further along the way.  Any function from erc.el that uses
 +	channel-members should end up in this file, rewritten to use
 +	erc-members.
 +
 +	(erc-person): Call erc-downcase before getting
 +	something from the hash.
 +	(erc-nick-in-channel): Checking wether erc-process must be used is
 +	unnecessary -- this will be done in erc-person.
 +	(erc-nick-channels): New.
 +	(erc-add-nick-to-channel, erc-update-member): Call erc-downcase
 +	before putting something into the hash.
 +	(erc-buffer-list-with-nick): New.
 +	(erc-format-nick, erc-format-@nick): New, backwards incompatible.
 +	Must check for other places that call these!
 +	(erc-server-PRIVMSG-or-NOTICE): Use the new version.
 +
 +	* erc-compat.el 1.10 (view-mode-enter): defalias to view-mode, if
 +	view-mode-enter is not fboundp and view-mode is -- as is the case
 +	in XEmacs.  We need view-mode-enter in erc-match.el.
 +
 +2003-01-23  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.470 (erc-default-server-handler):
 +	Minor performance improvement: allow the lambda
 +	    expression to be byte-compiled.
 +
 +2003-01-23  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.469 (erc-cmd-BANLIST):
 +	in the absence of a fill-column, use the screen width
 +
 +2003-01-22  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.468:
 +	patch from MrBump to delay fetching the banlist until /bl is run, so we don't
 +	fetch it when joining a channel anymore
 +
 +	* erc-ring.el 1.10:
 +	* instead of adjusting hooks when loaded, provide (erc-ring-mode). you'll
 +	  need to run (erc-ring-mode 1) now to get the ring
 +	* (erc-previous-command), (erc-next-command):
 +	    - check if the ring exists and create it if necessary
 +	    - don't do anything if the ring is empty
 +
 +	* erc-pcomplete.el 1.17:
 +	Put "how to use" documentation in the comments up the top
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.4 (erc-autojoin-version): New.
 +
 +	* erc-autojoin.el 1.3 (erc-autojoin-add): Added body.
 +	(erc-autojoin-remove): Added body.
 +	(erc-autojoin): Provide it.
 +
 +2003-01-21  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.467: erc-cmd-*: removed a bunch of references to force
 +
 +2003-01-21  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.2 (erc-autojoin-channels-alist): More doc.
 +
 +2003-01-20  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-autojoin.el 1.1:
 +	new, based on resolve's mail, and the stuff on the wiki
 +
 +	* erc-members.el 1.1: new
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/README.Debian 1.6, debian/changelog 1.20, debian/scripts/install 1.11, 
 +	  debian/scripts/startup.erc 1.4, Makefile 1.13:
 +	Prepare for 20030119 debian package
 +
 +	* erc-dcc.el 1.65: <rant>
 +	* (erc-decimal-to-ip): Since XEmacs decides that return a completely
 +	and utterly wrong number from string-to-number if it is larger than
 +	the integer boundary, instead of sanely converting the thing to
 +	a float, we now (concat dec ".0").
 +	</rant>
 +
 +	* erc.el 1.466:
 +	* (erc-log-irc-protocol): Use erc-propertize, not propertize
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.45 (erc-button-add-buttons): Added regexp-quote for
 +	the list case, too.
 +
 +2003-01-19  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.64 (erc-dcc-member): fix for case where a prop is nil
 +
 +	* erc-dcc.el 1.63 (erc-dcc-member):
 +	fix for xemacs's version of plist-member
 +
 +2003-01-19  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-notify.el 1.17: Delete empty strings from the ison-list
 +
 +	* erc-track.el 1.47:
 +	* (erc-track-switch-buffer): Call erc-modified-channels-update here.
 +
 +	* erc-track.el 1.46: * toplevel: require 'erc-match
 +
 +	* erc-track.el 1.45: * (erc-track-mode): Make autoload interactive
 +
 +	* erc-button.el 1.44: * (button): Make the autoload interactive
 +
 +	* erc.el 1.465:
 +	* (erc-mode): Comment out the case-table stuff, breaks xemacs
 +	* (erc-downcase): Revert.
 +
 +	* erc-dcc.el 1.62:
 +	* (erc-dcc-handle-ctcp-send): Use erc-decimal-to-ip on the ip we get...
 +
 +	* erc-speak.el 1.25:
 +	Eliminate reference to erc-nick-regexp, which no longer exists
 +
 +2003-01-19  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-stamp.el 1.26 (erc-timestamp-right-column): New, default nil.
 +	(erc-insert-timestamp-right): Use it, if non-nil.  Verbose
 +	doc string.
 +
 +2003-01-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.464 (erc-downcase): Use the old behavior in non-CVS Emacs.
 +
 +	* erc.el 1.463 (erc-cmd-QUIT): Remove &rest. The correct fix follows.
 +	(erc-cmd-GQUIT): Pass "" to erc-cmd-QUIT.
 +	(erc-mode): Use the case-table only in CVS Emacs. See comment.
 +
 +	* erc.el 1.462 (erc-cmd-QUIT): make reason optional.
 +
 +	* erc.el 1.461 (erc-cmd-GQUIT): Fixed typo.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.460:
 +	* (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
 +
 +	* erc.el 1.459: * (erc-mode): Define a proper case-table.
 +	* (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
 +
 +	* erc-button.el 1.43: * (erc-button-add-buttons): regex-quote the nick
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.42 (button): erc-channel-members-changed-hook no
 +	longer has erc-recompute-nick-regexp.
 +	(erc-button-alist): Use channel-members instead of
 +	erc-nick-regexp.
 +	(erc-button-add-buttons): Split some code into
 +	erc-button-add-buttons-1, and now handle strings, lists, and
 +	alists.  Regular expressions in lists and alists are enclosed in
 +	< and >.
 +	(erc-button-add-buttons-1): New.
 +	(erc-nick-regexp): Deleted.
 +	(erc-recompute-nick-regexp): Deleted.
 +
 +	* erc-button.el 1.41: Remove require cl again.
 +	(erc-mode-map): No longer bind widget-backward and widget-forward.
 +	(erc-button-alist): Explain why byte-compiling makes no sense, and
 +	remove all calls to byte-compile.
 +	(erc-button-keymap): Define it the standard way, without exposing
 +	the list nature of the keymap.
 +	(erc-button-marker-list): Deleted.
 +	(erc-button-add-buttons): Simplify.  In particular, create the
 +	button using the real callback, instead of using the intermediate
 +	erc-button-push, and only store the data as described for
 +	erc-button-alist.
 +	(erc-button-remove-old-buttons): Simplify.  No more list munging.
 +	Instead, just remove all the properties that we add in
 +	erc-button-add-button.
 +	(erc-widget-press-button): Deleted.
 +	(erc-button-click-button): New, for mouse clicks.  Moves point to
 +	where the mouse is, and calls erc-button-push.
 +	(erc-button-push): Instead of matching again, just use the
 +	erc-callback and erc-data properties at point to do the right
 +	thing.
 +	(erc-button-entry): Deleted.
 +	(erc-button-next): Use error instead of the beep plus message
 +	combo.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-autoaway.el 1.11 (erc-autoaway-set-back):
 +	Don't pass a force argument to erc-cmd-GAWAY.
 +
 +	* erc.el 1.458 (erc-cmd-AWAY): Removed usage of the force variable.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.40 (button):
 +	erc-recompute-nick-regexp is no longer added to
 +	erc-channel-members-changed-hook unconditionally, but only if
 +	erc-button-mode is enabled, and if it is disabled, it is removed
 +	again.
 +	(erc): Require cl for delete-if.
 +	(erc-button-remove-old-buttons): Rewrote using delete-if to
 +	prevent exceesive consing.  Having the marker list is still ugly,
 +	so another solution needs to be found.
 +
 +2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.457 (erc-banlist-store):
 +	Don't assume there's always a setter in the banlist reply.
 +
 +2003-01-17  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc-button.el 1.39 (erc-button-url-regexp): Changed regexp according
 +	to a suggestion by Max Froumentin <mf@w3.org>.
 +
 +2003-01-17  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.456:
 +	fix erc-remove-channel-member again to not error out on nil as first arg...
 +
 +	* erc.el 1.455: * (erc-occur): New function
 +
 +2003-01-17  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.454: erc-banlist-*: return nil so further hooks are called
 +
 +	* erc.el 1.453 (erc-server-368):
 +	supress "end of ban list" messages - use /listbans now
 +
 +	* erc.el 1.452 (erc-send-current-line):
 +	removed the check for leading whitespace again - the
 +	    only time we want to prohibit multi-line commands is if / is the first
 +	    thing on the line
 +	(erc-get-arglist): new defun for reading a function's arglist which should
 +	    work with older copies of emacs. we use help-function-arglist if it's
 +	    available, though, since that has support for reading subrs, etc
 +
 +	* erc.el 1.451 (erc-cmd-JOIN): fixed (again)
 +
 +	* erc.el 1.450: * fixed call to erc-cmd-NICK when connecting
 +	* support for listing bans and mass unbanning, again thanks to MrBump
 +
 +	* erc.el 1.449 (erc-set-topic):
 +	patch from MrBump (Mark Triggs, mst@dishvelled.net) to strip
 +	    control chars and topic attribution in C-c C-t
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.448:
 +	* (erc-remove-channel-member): Do not use delq, modify the list using setcdr like delq does.
 +	In theory, this should be way faster since the list doesnt get traverse two times.
 +	Measurement didn't show any real difference though :(, this system is flawed for channels with >300 users it seems...
 +	Also moved some defcustoms up.
 +
 +2003-01-16  Brian P Templeton  <bpt@tunes.org>
 +
 +	* erc.el 1.447: moved misplaced paren
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.446 (erc-cmd-UNIGNORE):
 +	reference argument directly - no string matching
 +
 +	* erc.el 1.445 (erc-extract-command-from-line):
 +	hmm, thinko in the canonicalisation. should
 +	    be fixed
 +
 +2003-01-16  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.444 (erc-send-current-line):
 +	Changed the regexp used to match /COMMANDs so that leading
 +	    whitespace is taken into account.
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.61: * (erc-dcc-do-SEND-command): Fix it
 +
 +	* erc-ezbounce.el 1.4, erc-lang.el 1.2: Arglist changes...
 +
 +	* erc.el 1.443: Various docstring fixes and additions.
 +
 +	* erc-notify.el 1.16:
 +	* (erc-cmd-NOTIFY): Change the function arglist to (&rest args)
 +
 +	* erc-netsplit.el 1.8: * (erc-cmd-WHOLEFT): Has no args...
 +
 +2003-01-16  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-fill.el 1.22:
 +	erc-fill-column: default to 78, so things like docstrings don't get wrapped
 +	    in an ugly manner
 +
 +2003-01-16  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.442:
 +	* (erc-cmd-default): Take a substring, now /mode works again.
 +	* (erc-cmd-AWAY): Put do-not-parse-args t
 +	* (erc-cmd-GAWAY): Ditto, and fix it.
 +	* (erc-cmd-CTCP): Switch to argument system.
 +	* (erc-cmd-KICK): Do the same.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.60:
 +	* (erc-cmd-DCC): Fixed for the new scheme, simplified.
 +	* (erc-dcc-do-CHAT-command): Ditto.
 +	* (erc-dcc-do-CLOSE-command): Ditto.
 +	* (erc-dcc-do-LIST-command): Ditto.
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.441:
 +	erc-error-face: setting a background doesn't work so well with multi-line
 +	    messages, so we don't. fg colour is negotiable ;-)
 +	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
 +	(erc-send-current-line): allow multi-line messages provided they don't start
 +	    with a slash - there's no need to prohibit them if the slash isn't the
 +	    first character
 +
 +	* erc.el 1.440: * bad-syntax now reports like incorrect-args
 +	* bunch of extra cmds fixed, nick, sv etc.
 +
 +	* erc.el 1.439 (erc-cmd-HELP): fixed
 +	(erc-extract-command-from-line): when deterimining canon-defun, make sure we
 +	    have a valid symbol
 +	(erc-cmd-KICK): fixed
 +
 +	* erc.el 1.438:
 +	* removed duplicate do-no-parse-args properties for the defaliased defuns
 +	(erc-process-input-line): show function signature when incorrect args
 +	(erc-extract-command-from-line): canonicalise defaliases before extracting
 +	    plist
 +	(erc-cmd-CLEAR): fixed
 +	(erc-cmd-UNIGNORE): fixed again
 +
 +	* erc.el 1.437 (erc-cmd-SET): fixed
 +	(erc-cmd-UNIGNORE): fixed
 +	(erc-process-input-line): report when incorrect arguments are provided to a
 +	    command, and show the command's docstring
 +
 +	* erc.el 1.436 (erc-cmd-APPENDTOPIC): fixed
 +	(erc-process-input-line): more informative error message than 'bad syntax'
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.435: * (erc-cmd-IGNORE): fixed
 +
 +	* erc.el 1.434: * (erc-cmd-NAMES): fixed
 +
 +	* erc.el 1.433:
 +	* (erc-cmd-CLEARTOPIC): Simplify, fix doc, make interactive
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.432 (erc-cmd-JOIN):
 +	correct invite behavior, and document it.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.431: * (erc-cmd-PART): Put 'do-not-parse-args t
 +
 +2003-01-15  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.430 (erc-cmd-JOIN): new cmd argument syntax
 +	(erc-process-input-line): check if (erc-extract-command-from-line) returned a
 +	    list, and apply if that's the case
 +
 +	* erc.el 1.429:
 +	erc-cmd-*: remove optional force and references to `force' in the code
 +	(erc-cmd-AMSG): call erc-trim-string, not trim-string
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.428:
 +	* (erc-cmd-CLEARTOPIC): LINE is now ARGS and already parsed.
 +	Set erc-cmd-TOPIC to 'do-not-parse-args for now.
 +	(comment: I think we should have 'first, so that only first word is parsed...
 +	 Or we could autodetect erc-channel-p in the parser before that somehow...)
 +
 +	* erc.el 1.427: * (erc-cmd-OP): LINE is PEOPLE now, and already parsed.
 +
 +	* erc-notify.el 1.15:
 +	* (erc-cmd-NOTIFY): Arg LINE is now ARGS, and already parsed.
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.25 (erc-insert-timestamp-right):
 +	Prefer erc-fill-column to window-width,
 +	because on wide screens the timestamp could wander off too far to the
 +	right.
 +
 +2003-01-15  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.426: This is the "everything is suddenly broken!" release
 +	You know, this is CVS, you can still go back, and wait until the transition
 +	is finished, but here is patch one, which basicly breaks every command
 +	which is typed on the prompt.
 +	Hit me, we can still revert, but something needs to be done about this.
 +	* (erc-extract-command-from-line): intern-soft the function here.
 +	If the function symbol has a property 'do-not-parse-args, operate as before,
 +	otherwise, split the arguments prior to calling the command handler.
 +	* (erc-process-input-line): Updated to accomodate the change above.
 +	* (erc-send-distinguish-noncommands): Ditto.
 +	* (erc-cmd-NAMES): Ditto.
 +	* (erc-cmd-ME): Put 'do-not-parse-args property.
 +
 +	* erc-dcc.el 1.59:nick:	* erc-dcc.el 1.59: * erc-dcc-list: Renamed 
 +	* (erc-dcc-member). Treat :nick as either a nick!user@host or nick,
 +	do appropriate comparisons, simplified.
 +	* (erc-dcc-list-add): New functions
 +	various callers of (cons (list ...) erc-dcc-list) updated.
 +	Other stuff I'm to bored to document now
 +
 +2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.24 (erc-insert-timestamp-right):
 +	Removed redundant code that overrid the
 +	window-width. Now substracts (length string) from every found
 +	indentation positions.
 +
 +2003-01-14  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.425:
 +	* (erc-cmd-AMSG): Remove useless call to erc-display-message.
 +
 +	* erc-dcc.el 1.58:
 +	* erc-dcc-chat/send-request: New variables, control how to treat
 +	incoming dcc chat or send requests. Can be set to 'ask, which behaves
 +	like it did before, 'auto, which accepts automatically, and
 +	'ignore, which ignores those type of requests completely.
 +	* (erc-cmd-CREQ): New user-level command.
 +	* (erc-cmd-SREQ): Ditto.
 +
 +	* erc.el 1.424: * (erc-cmd-AMSG). New command.
 +
 +	* erc-xdcc.el 1.4: * (erc-xdcc): delete empty strings from ARGS
 +
 +	* erc-dcc.el 1.57: * erc-dcc-ipv4-regexp: New constant
 +	* (erc-ip-to-decimal): Use it.
 +	* erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:	* erc-dcc-host: :type
 +	* (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
 +	* Some docstring/comment fixes.
 +
 +	* erc-stamp.el 1.23:
 +	* (erc-insert-timestamp-right): Subtract (length string) from
 +	POS in any case, otherwise, linewrap occurs.
 +
 +	* erc-dcc.el 1.56:
 +	* Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
 +	  and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
 +	* Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
 +	* Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
 +
 +2003-01-13  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-xdcc.el 1.3:
 +	* erc-xdcc-help-text: New variable which makes replies to the originator
 +	much more flexible.
 +	* erc-xdcc-help-format: Removed.
 +	* (erc-xdcc-help): Handle the new variable.
 +	* (erc-xdcc): Simplified
 +
 +	* erc-xdcc.el 1.2: * erc-xdcc-handler-alist: New variable.
 +	* (erc-xdcc): Move code for list and send sub-commands into
 +	* (erc-xdcc-help): New function.
 +	* (erc-xdcc-list): New function.
 +	* (erc-xdcc-send): New function.
 +
 +2003-01-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.423 (erc-server-JOIN):
 +	Oops, send MODE command only when *we* joined a channel.
 +
 +	* erc.el 1.422:
 +	Fixing ERCs behavior wrt IRCnet's !channels have a different name for
 +	JOIN than in reality (e.g. you can join !forcertest or !!forcertest
 +	and really get to !ABCDEforcertest)
 +
 +	(erc-cmd-JOIN): Removed erc-send-command MODE.
 +	(erc-server-JOIN): Ask for MODE now.
 +
 +2003-01-12  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.55:
 +	(erc-dcc-get-filter), (erc-dcc-get-file): store size as a string, not an
 +	    integer. check size > 0 for the case where a size wasn't provided, since
 +	    string-to-int will return 0 on an empty string
 +
 +2003-01-12  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.54: * Use RAWFILE arg with find-file-noselect
 +	* Fix alist/plist conversion left-over
 +	* Add verbose-info about sending blocks.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.53: * (pcomplete-erc-mode/DCC): Fixes
 +
 +	* erc-xdcc.el 1.1: Initial version.
 +
 +	* erc-pcomplete.el 1.16:
 +	* (erc-pcomplete): Fix so that cycle-completion works again.
 +	* (pcomplete-parse-erc-arguments): If there is a space after the last word
 +	before point, we need to return a "" arg, and it's position.
 +
 +	* erc-dcc.el 1.52: Fix to pcomplete/erc-mode/DCC
 +
 +	* erc-dcc.el 1.51: * (pcomplete/erc-mode/DCC): New function
 +
 +	* erc-dcc.el 1.50: *** empty log message ***
 +
 +	* erc-dcc.el 1.49: Move code around, just basic changes
 +
 +2003-01-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el 1.22 (erc-insert-timestamp-right):
 +	Check wether erc-fill-column is
 +	available before using it. Else default to fill-column or if
 +	everything else fails, the window width of the current window. For the
 +	fill-columns, use them directly as the starting position for the
 +	timestamp.
 +
 +2003-01-11  Andreas Fuchs  <asf@void.at>
 +
 +	* erc-stamp.el 1.21:
 +	erc-insert-timestamp-right: use correct window's window-width. If
 +	                  buffer is not in a window, use erc-fill-column.
 +
 +2003-01-11  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.48:	* erc-dcc.el 1.48: * (erc-dcc-do-LIST-command): Fix 
 +
 +	* erc-dcc.el 1.47:
 +	* buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
 +	  Keep This info in erc-dcc-member :sent and :confirmed plist values
 +	* :	* :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
 +	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-conntected, which now prints a msg...
 +
 +	* erc-dcc.el 1.46:
 +	* (erc-dcc-chat-accept): Renamed from erc-dcc-chat. Callers updated.
 +	* (erc-dcc-chat): Renamed from erc-dcc-chat-request.
 +	Callers updated, and interactive form added.
 +	* (erc-dcc-server-accept): No longer do any type-specific stuff.
 +	* (erc-dcc-chat-sentinel): Call erc-dcc-chat-setup if event is "open from "
 +	from here, otherwise call erc-dcc-chat-close.
 +
 +	* (
 +
 +	* erc-dcc.el 1.45: *** empty log message ***
 +
 +	* erc-dcc.el 1.43: Moved some functions around.
 +	Doc string fixes.
 +	"/dcc send nick filename" works now
 +
 +2003-01-11  Alex Schroeder  <alex@gnu.org>
 +
 +	* erc.el 1.421 (erc-send-command): Fixed flood protect message.
 +
 +	* erc-button.el 1.38 (erc-button-syntax-table): Make `-' a legal nick
 +	constituent.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.42: Some more steps toward dcc send.
 +
 +2003-01-10  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-notify.el 1.14 (erc-notify-timer):
 +	Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-JOIN): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-NICK): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-notify-QUIT): Changed to make it IRC-case-insensitive when comparing nicks.
 +	(erc-cmd-NOTIFY): Now "/notify -l" lists the nicks on your notify list.  Now
 +	    when you remove a nick from your notify list, you no longer recieve a spurious
 +	    signoff notification for that nick.  Changed to make it IRC-case-insensitive when
 +	    comparing nicks.
 +
 +	* erc.el 1.420 (erc-ison-p):
 +	Fixed so it calls erc-member-ignore-case instead of member.
 +
 +	* erc.el 1.419 (erc-member-ignore-case):
 +	New function.  Just like member-ignore-case, but obeys
 +	    the IRC protocol case matching rules.
 +
 +2003-01-10  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.41:
 +	(erc-dcc-do-GET-command), (erc-dcc-get-file): use the plist syntax, this
 +	    fixes dcc get again
 +
 +2003-01-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.418: erc-complete-functions: New variable.
 +	erc-mode-map: Bind \t to 'erc-complete-word
 +	erc-complete-word: New function.
 +
 +	* erc-pcomplete.el 1.15 (erc-pcomplete-mode):
 +	Use new erc-complete-functions
 +	(erc-pcomplete): Check that we're in the input line, else return nil.
 +
 +	* erc-button.el 1.37 (erc-button-mode): Use new erc-complete-functions
 +	erc-button-old-tab-command: Removed.
 +	(erc-button-next-or-old): Removed
 +	(erc-button-next): check that we're not in the input line, else just return nil.
 +
 +2003-01-10  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.40: cleanup
 +
 +	* erc-dcc.el 1.39:
 +	* (erc-dcc-chat-request): No longer use erc-send-ctcp-message.
 +
 +	* erc-dcc.el 1.38:
 +	* (erc-dcc-no-such-nick): Also call delete-process if we have a peer already
 +
 +	* erc-dcc.el 1.37:
 +	* (erc-dcc-no-such-nick): New function, server event handler for event 401.
 +	If we send a CTCP message requesting something dcc related, we set up an
 +	entry in erc-dcc-list before sending the request (for the server proc object
 +	for listening conns for example).  But if that nick does not exist
 +	on that server, we now nicely cleanup erc-dcc-list again.
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.36: Moved code around a bit, and doc fixes
 +
 +	* erc-dcc.el 1.35: *** empty log message ***
 +
 +	* erc-dcc.el 1.34: Rename erc-dcc-plist to erc-dcc-list
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.33 (erc-dcc-server (erc-dcc-chat-setup):
 +	use erc's (erc-setup-buffer) to determine how to
 +	    display new DCC windows
 +	(erc-dcc-chat-buffer-killed): buffer-local hook for DCC buffers to close the
 +	    process
 +	(erc-dcc-chat-close): code common to a killed buffer or a disconnection from
 +	    the other side
 +	(erc-dcc-chat-sentinel): use (erc-dcc-chat-close)
 +	(erc-dcc-server-accept): use (erc-log) instead of (message)
 +
 +	* erc.el 1.417:
 +	(erc), (erc-setup-buffer): factor out window generation code so DCC can use
 +	    it too
 +
 +	* erc-dcc.el 1.32:
 +	(erc-dcc-do-CLOSE-command), (erc-dcc-do-LIST-command): work with erc-dcc-plist
 +
 +	* erc-dcc.el 1.31:
 +	erc-dcc-alist: became erc-dcc-plist, so we can more easily grab particular
 +	    properties
 +	dcc catalog: unify use of DCC: and [dcc] (either's fine, but let's be
 +	    consistent)
 +	(erc-dcc-member): takes an arbitrary list of constraints now
 +	(erc-dcc-proc-member): removed, as (erc-dcc-member) can be used for this
 +	(erc-dcc-do-CHAT-command): use the catalog to show the user what's going on
 +	(erc-dcc-chat-server): removed
 +	(erc-dcc-server): takes name sentinel and filter arguments, can be used for
 +	    both send and chat now
 +
 +	.. this release means all send/get support is broken until we fix up the
 +	things that still expect to be using an alist. this include /dcc list, /dcc
 +	close
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.9 (erc-previous-command):
 +	If you have a partially typed input line and press M-p,
 +	    you lose what you typed.  Now we save it so you can come back to it.
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-ring.el 1.8 (erc-add-to-input-ring): s/nullp/null/
 +
 +2003-01-09  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-ring.el 1.7 (erc-add-to-input-ring):
 +	set up the ring if it's not already setup
 +
 +	* erc-dcc.el 1.30 (erc-dcc-member): case insensitive match of nicknames
 +	(erc-dcc-do-CHAT-command): echo what we're doing (at least for now)
 +
 +2003-01-09  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.29: (temporarily) fix erc-process setting...
 +
 +	* erc-dcc.el 1.28: * (erc-dcc-chat-send-line): Removed
 +
 +	* erc.el 1.416:
 +	Check if target is stringp (we can now also have 'dcc as value...)
 +
 +	* erc-dcc.el 1.27 (erc-dcc-chat-send-input-line):
 +	New function, used for
 +	erc-send-input-line-function.
 +	Use erc-send-current-line now.
 +
 +	* erc-dcc.el 1.26: evt to elt...
 +
 +	* erc-dcc.el 1.25: Remove () from a var (how silly!)
 +
 +	* erc-dcc.el 1.24: * (erc-dcc-get-host): Use format-network-address.
 +	* (erc-dcc-host): Change semantic.  If erc-dcc-host is set, use it.
 +	Otherwise, try to figure out the host by calling erc-dcc-get-host.
 +	* (erc-dcc-server-port): New variable.
 +	* erc-dcc-chat-log: Renamed to erc-dcc-server-accept
 +
 +	* erc-dcc.el 1.23 (erc-dcc-do-CHAT-command):
 +	Change arg of call to erc-dcc-chat-request from elt to nick
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.415 (erc-send-current-line):
 +	Now rejects multi-line commands (i.e., lines that
 +	    start with "/" and contain newlines).
 +
 +2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-button.el 1.36:
 +	Functionality to use TAB to jump to the next button:
 +
 +	(erc-button-next-or-old): New function.
 +	(erc-button-next): New function.
 +	erc-button-keymap: added erc-button-next
 +	erc-button-old-tab-command: New variable.
 +	define-erc-module button: Add and remove 'erc-button-next-or-old as
 +	appropriate.
 +
 +2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.414:
 +	New variable: erc-auto-reconnect (defaults to t).  If non-nil, ERC will
 +	    automatically reconnect to a server after an unexpected disconnection.
 +	(erc-process-sentinel): Changed to refer to variable erc-auto-reconnect.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.413:
 +	* erc-send-input-line-function: New variable, used for dispatch...
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.22 (erc-dcc-chat-sentinel):
 +	check event type before killing process
 +	(erc-dcc-chat-log): new, handles the setup of dcc chats for incoming
 +	    connections
 +	(erc-dcc-chat): use (erc-dcc-chat-setup)
 +	(erc-dcc-chat-setup): code common to incoming and outgoing DCC chats
 +	(erc-dcc-chat-request): request a DCC chat with another user
 +	(erc-dcc-proc-member): locate a member in erc-dcc-alist by process
 +
 +	The very first ERC to ERC DCC chat was held between delysid and resolve today!
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-track.el 1.44 (erc-all-buffer-names):
 +	Check for erc-dcc-chat-mode too
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-ring.el 1.6, erc.el 1.412 (erc-kill-input):
 +	Resets erc-input-ring-index to nil, so that invoking this
 +	    command conceptually puts you after your most recent input in the input
 +	    history.
 +	(erc-previous-command and erc-next-command): Changed so that history movement
 +	    is more intuitive.  Also preserves the blank input line that marks the
 +	    place after the newest command in the history ring (i.e., you'll see a
 +	    blank command once every trip around the ring in either direction).
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.21 (erc-dcc-chat): Add docstring
 +	Add self-test.
 +	Fix error if /dcc chat nick doesnt find the nick
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* Makefile 1.12:
 +	Changed so that "make" works correctly under Cygwin.  Before this change, the
 +	pathname passed to Emacs on the command line under Cygwin had the form
 +	"/cygwin/c/...", which prevented emacs from finding the file.  Now the pathname
 +	has the form "c:/...".  This works for any drive letter.
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-button.el 1.35: reindent some code, and add TODO to comments
 +
 +	* erc-dcc.el 1.20: *** empty log message ***
 +
 +	* erc-dcc.el 1.19: Make dcc-chat-ended a notice
 +	Remove now bogus comment
 +
 +2003-01-08  Damien Elmes  <erc@repose.cx>
 +
 +	* erc-dcc.el 1.18 (erc-pack-int): from erc-packed-int
 +	(erc-unpack-int): new
 +
 +	* erc-dcc.el 1.17 (erc-unpack-str): added
 +
 +2003-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.411 (erc-server-482):
 +	New handler, handles KICK reply if you're not channel-op
 +
 +	* erc-dcc.el 1.16: Document SEND in erc-dcc-alist.
 +	Move sproc, parent-proc and file into erc-dcc-alist
 +
 +	* erc-dcc.el 1.15: stubs
 +
 +	* erc-dcc.el 1.14 (erc-dcc-get-host):
 +	Change :iface to :local since Kim committed it now to CVS emacs
 +
 +	* erc-dcc.el 1.13 (erc-dcc-get-host):
 +	New function, requires the not-yet-in-CVS-emacs local-address.patch to process.c.
 +	Some other minor additions
 +
 +2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.410 (erc-cmd-IGNORE):
 +	Now returns t to prevent "Bad syntax" error.
 +	(erc-cmd-UNIGNORE): Now returns t to prevent "Bad syntax" error.
 +	(erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
 +
 +	* erc.el 1.409 (erc-scroll-to-bottom):
 +	Temporarilly bind resize-mini-windows to nil so that
 +	    users who have it set to a non-nil value will not suffer from premature
 +	    minibuffer shrinkage due to the below recenter call.  I have no idea why
 +	    this works, but it solves the problem, and has no negative side effects.
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc-dcc.el 1.12:
 +	erc-dcc-ctcp-query-chat-regexp: The IP is not really an IP, but a
 +	number (no . allowed there).
 +	(erc-dcc-send-ctcp-string): use let* here to avoid cluttering up the
 +	match data.
 +	Also, use erc-decimal-to-ip to get the IP.
 +	(erc-ip-to-decimal): Removed some pasted ERC timestamps
 +	(erc-decimal-to-ip): New function.
 +	erc-dcc-chat-mode-map: Return map in the initialization.
 +
 +2003-01-07  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc-match.el 1.19 (erc-match-fool-p):
 +	Changed to call erc-match-directed-at-fool-p instead of
 +	     erc-directed-at-fool-p.
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.11 (erc-cmd-DCC):
 +	Change (cond ... (t nil)) to (when ...)
 +
 +	* erc-dcc.el 1.10: Use erc-current-nick-p
 +
 +2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.408:
 +	erc-join-buffer: Added 'window-noselect to docstring and :type.
 +	erc-auto-query: Added 'window-noselect to :type.
 +	(erc): Treat erc-join-buffer being 'window-noselect appropriately.
 +
 +	* erc.el 1.407 (erc-current-nick-p): New function.
 +	(erc-nick-equal-p): New function.
 +	(erc-already-logged-in), (erc-server-JOIN), (erc-auto-query),
 +	(erc-server-PRIVMSG-or-NOTICE): Use erc-current-nick-p.
 +	(erc-update-channel-member): Use erc-nick-equal-p.
 +
 +	* erc-match.el 1.18 (erc-match-current-nick-p):
 +	Renamed from erc-current-nick-p
 +	(erc-match-pal-p): Renamed from erc-pal-p
 +	(erc-match-fool-p): Renamed from erc-fool-p
 +	(erc-match-keyword-p): Renamed from erc-keyword-p
 +	(erc-match-dangerous-host-p): Renamed from erc-dangerous-host-p
 +	(erc-match-directed-at-fool-p): Renamed from erc-directed-at-fool-p
 +	(erc-match-message): Use erc-match-TYPE-p instead of erc-TYPE-p
 +
 +	* erc.el 1.406:
 +	Support for IRCnets' "nick/channel temporarily unavailable"
 +
 +	(erc-nickname-in-use): New function (mostly copied from erc-server-433).
 +	(erc-server-433): Use erc-nickname-in-use
 +	(erc-server-437): New function.
 +	erc-server-hook-list: Added (437 erc-server-437).
 +
 +2003-01-07  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-fill.el 1.21: Add autoload cookie
 +
 +	* erc-notify.el 1.13:
 +	Now also pass SERVER argument to signon/off hooks, and provide a erc-notify-signon/off function for echo-area printing
 +
 +	* erc-notify.el 1.12 (erc-notiy-QUIT):
 +	Change use of delq to delete, delq does not work with strings
 +
 +2003-01-06  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.405 (erc-ctcp-query-VERSION):
 +	v%s -> %s, so we are no longer vVersion...
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc.el 1.404: Small change to erc-ison-p, and fixme tag
 +
 +2003-01-06  Francis Litterio  <franl@users.sourceforge.net>
 +
 +	* erc.el 1.403 (erc):
 +	Fixed bug where variable "away" would be nil in new channel buffers
 +	       even if the user is away when joining the channel.
 +	(erc-strip-controls): Fixed a bug where erc-strip-controls accidentally
 +	       removed all text properties from the string.
 +
 +2003-01-06  Mario Lang  <mlang@delysid.org>
 +
 +	* erc-dcc.el 1.9:
 +	Some stub functions, some code, nothing really works yet
 +
 +	* erc.el 1.402 (erc-ison-p): New function
 +
 +	* erc-dcc.el 1.8: Some functions which will be needed for dcc send
 +
 +	* erc-dcc.el 1.7 (erc-ip-address-to-decimal):
 +	New function, thanks lawrence
 +
 +	* erc-dcc.el 1.6: Again, simplify code, fix stuff, DCC CHAT works now
 +
 +	* erc-dcc.el 1.5: Many fixes, chat nearly works now
 +
 +	* erc-netsplit.el 1.7: Also detect fast netsplit/joins
 +
 +	* erc-dcc.el 1.4: some more fixes
 +
 +	* erc-dcc.el 1.3: Fixup stage 1, now dcc get works
 +
 +	* erc-dcc.el 1.2: make /dcc LIST work
 +
 +	* erc-dcc.el 1.1:
 +	Initial checkin, dont use it!  its really far from complete.  Hackers: help!
 +
 +	* erc-notify.el 1.11:
 +	New function erc-notify-NICK, and added signon/off hooks which were missing
 +
 +2003-01-05  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el 1.401 (erc-truncate-buffer-to-size):
 +	set inhibit-read-only to t for the
 +	deletion. This is usually done by the function calling the hook, but
 +	not if it's called interactively. Also, rewrote some weird if/if
 +	combination.
 +
 +	* erc-track.el 1.43 (erc-track-shortennames):
 +	Documentation fix (erc-all-buffers is really
 +	erc-all-buffer-names)
 +
 +	These changes make server buffers be tracked as well, as there are
 +	quite a few interesting things going on there (e.g. CTCP etc.)
 +	(erc-all-buffer-names): Check for (eq major-mode 'erc-mode) instead of
 +	erc-default-recipients.
 +	(erc-track-modified-channels): Don't require a default target (e.g.,
 +	this-channel being non-nil)
 +
 +2003-01-03  Damien Elmes  <erc@repose.cx>
 +
 +	* erc.el 1.400:
 +	erc-auto-query: can now be set to a symbol to control how new messages should
 +	    be popped up (or not popped up, as the case may be)
 +	(erc-query): new function which handles the bulk of what (erc-cmd-QUERY) did
 +	    previously
 +	(erc-cmd-QUERY): use (erc-query)
 +	(erc-auto-query): use (erc-query)
 +
 +	* erc.el 1.399 (erc-current-logfile):
 +	Downcase result of log generation function, as IRC is
 +	case insensitive. Fixes problems where "/query user" results in a different
 +	log file to a query from "User". Avoided adding an extra flag to control this
 +	behavior - if you think this was the wrong decision, please correct it and
 +	I'll remember it for next time.
 +
 +See ChangeLog.02 for earlier changes.
 +
 +    Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
diff --cc ChangeLog.04
index 75c2b71,0000000..feaead1
mode 100644,000000..100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@@ -1,2080 -1,0 +1,2095 @@@
 +2004-12-29  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-interpret-controls-p): Changed docstring to
 +	reflect the new meaning if this is set to 'remove.
 +	(erc-controls-interpret): Rephrased docstring to be more accurate.
 +	(erc-controls-strip): New function that behaves like the
 +	recently-removed erc-strip-controls -- it removes all IRC color
 +	and highlighting control characters.
 +	(erc-controls-highlight): Changed to support the new 'remove value
 +	that variable erc-interpret-controls-p might have.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-ibuffer.el, erc-list.el, erc-page.el, erc-speedbar.el:
 +	Changed all calls to erc-interpret-controls (which no longer
 +	exists) to call erc-controls-interpret (the new name of the same
 +	function).
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-interpret): Added this function to
 +	replace the recently-removed erc-interpret-controls.  Also added
 +	a (require 'erc) to solve a byte-compile problem.
 +
 +2004-12-28  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-controls-interpret): Added this function to replace
 +	the recently-removed erc-interpret-controls.
 +
 +2004-12-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Check for
 +	logging even better (via lawrence).
 +
 +2004-12-26  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el (erc-truncate-buffer-to-size): Much saner
 +	logging detection (via lawrence).
 +
 +2004-12-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el (erc-controls-highlight): Treat single C-c
 +	correctly.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: Deleted IRC control character processing
 +	and implemented a sane version in erc-goodies.el as a module.
 +
 +	* erc.el (erc-merge-controls, erc-interpret-controls,
 +	erc-decode-controls, erc-strip-controls, erc-make-property-list,
 +	erc-prepend-properties): Removed.
 +
 +	(erc-interpret-controls-p, erc-interpret-mirc-color, erc-bold-face
 +	erc-inverse-face, erc-underline-face, fg:erc-color-face0,
 +	fg:erc-color-face1, fg:erc-color-face2, fg:erc-color-face3,
 +	fg:erc-color-face4, fg:erc-color-face5, fg:erc-color-face6,
 +	fg:erc-color-face7, fg:erc-color-face8, fg:erc-color-face9,
 +	fg:erc-color-face10, fg:erc-color-face11, fg:erc-color-face2,
 +	fg:erc-color-face13, fg:erc-color-face14, fg:erc-color-face15,
 +	bg:erc-color-face1, bg:erc-color-face2, bg:erc-color-face3,
 +	bg:erc-color-face4, bg:erc-color-face5, bg:erc-color-face6,
 +	bg:erc-color-face7, bg:erc-color-face8, bg:erc-color-face9,
 +	bg:erc-color-face10, bg:erc-color-face11, bg:erc-color-face2,
 +	bg:erc-color-face13, bg:erc-color-face14, bg:erc-color-face15,
 +	erc-get-bg-color-face, erc-get-fg-color-face,
 +	erc-toggle-interpret-controls): Moved.
 +
 +	* erc-goodies.el (erc-beep-p, irccontrols, erc-controls-highlight,
 +	erc-controls-propertize): New.
 +
 +2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit.
 +	 Moved some functions from erc.el to erc-goodies.el, and
 +	transformed them to erc modules in the process.
 +	- imenu autoload stuff moved. I don't know why it is here at all.
 +	- Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
 +	smiley,   unmorse, erc-occur (the last isn't a module, but still
 +	moved)
 +	(erc-input-line-position, erc-add-scroll-to-bottom,
 +	erc-scroll-to-bottom, erc-make-read-only, erc-noncommands-list,
 +	erc-send-distinguish-noncommands, erc-smiley, erc-unmorse,
 +	erc-occur): Moved from erc.el to erc-goodies.el.
 +	(smiley): Module moved from erc.el to erc-goodies.el.
 +	(scrolltobottom, readonly, noncommands, unmorse): New modules.
 +
 +2004-12-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-away-status): Use `a', not `away' - that's
 +	why it's there.
 +	(erc-update-mode-line-buffer): The values of `mode-line-process'
 +	and `mode-line-buffer-identification' are normally lists.
 +	Conform.
 +
 +2004-12-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-ctcp-query, erc-process-ctcp-reply): Display
 +	message in the active window, not the server window.
 +
 +2004-12-16  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Check for
 +	'erc-track-mode variable with boundp. From Adrian Aichner
 +	<adrian@xemacs.org>.
 +
 +2004-12-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-upcase-first-word): New function. The old way used
 +	in erc-send-ctcp-message would eat consecutive whitespace etc.
 +	(erc-send-ctcp-message, erc-send-ctcp-notice): Use it.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Fix braino with my previous
 +	patch. It always helps to C-x C-s before `cvs commit'.
 +
 +2004-12-15  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc.el (erc-send-ctcp-message): Only upcase the ctcp command,
 +	and not the entire message. Revision 1.707 had broken /me.
 +	Shouting is bad! :)
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-networks-alist): Change undernet to Undernet as
 +	is used in `erc-server-alist', so that completion works when using
 +	`erc-server-select'.  This should fix Debian bug #282003 (erc:
 +	cannot connect to Undernet).
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el: (def-edebug-spec): Only run this if 'edebug is
 +	available.
 +
 +2004-12-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: The last change to `erc-mode-line-format' introduced a
 +	bug in Xemacs - it can't handle the #(" "...) strings at all.  The
 +	following changes fix the bug and simplify the mode-line handling
 +	considerably.  (erc-mode-line-format): Now defined as a string
 +	which will be formatted using `format-spec' and take the place of
 +	`mode-line-buffer-identification' in the mode line.
 +	(erc-header-line-format): Now defined as a string to be formatted
 +	using `format-spec'.
 +	(erc-prepare-mode-line-format): Removed.
 +	(erc-format-target, erc-format-target-and/or-server,
 +	erc-format-away-status, erc-format-channel-modes): New functions.
 +	Basically the old `erc-prepare-mode-line-format' split apart.
 +	(erc-update-mode-line-buffer): Set
 +	`mode-line-buffer-identification' to the formatted
 +	`erc-mode-line-format', set `mode-line-process' to ": CLOSED" if
 +	the connection has been terminated, and set `header-line-format'
 +	(if it is bound) to the formatted `erc-header-line-format', then
 +	do a `force-mode-line-update'.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Disable modules removed with `customize'.
 +	(erc-update-modules): Try to give a more descriptive error
 +	message.
 +
 +2004-12-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-complete.el, erc.el, erc-list.el, erc-nets.el,
 +	erc-nicklist.el, erc-pcomplete.el, erc-replace.el, erc-speak.el,
 +	erc-truncate.el: (erc-buffers, erc-coding-systems, erc-display,
 +	erc-mode-line-and-header, erc-ignore, erc-query,
 +	erc-quit-and-part, erc-paranoia, erc-scripts, erc-old-complete,
 +	erc-list, erc-networks, erc-nicklist, erc-pcomplete, erc-replace,
 +	erc-truncate): New customization groups.  (erc-join-buffer,
 +	erc-frame-alist, erc-frame-dedicated-flag, erc-reuse-buffers): Use
 +	'erc-buffers as `:group'.  (erc-default-coding-system,
 +	erc-encoding-coding-alist): Use 'erc-coding-systems as `:group'.
 +	(erc-hide-prompt, erc-show-my-nick, erc-prompt,
 +	erc-input-line-position, erc-command-indicator, erc-notice-prefix,
 +	erc-notice-highlight-type, erc-interpret-controls-p,
 +	erc-interpret-mirc-color, erc-minibuffer-notice,
 +	erc-format-nick-function): Use 'erc-display as `:group'.
 +	(erc-mode-line-format, erc-header-line-format,
 +	erc-header-line-uses-help-echo-p, erc-common-server-suffixes,
 +	erc-mode-line-away-status-format): Use 'erc-mode-line-and-header
 +	as `:group'.
 +	(erc-hide-list, erc-ignore-list, erc-ignore-reply-list,
 +	erc-minibuffer-ignored): Use 'erc-ignore as `:group'.
 +	(erc-auto-query, erc-query-on-unjoined-chan-privmsg,
 +	erc-format-query-as-channel-p): Use 'erc-query as `:group'.
 +	(erc-kill-buffer-on-part, erc-kill-queries-on-quit,
 +	erc-kill-server-buffer-on-quit, erc-quit-reason-various-alist,
 +	erc-part-reason-various-alist, erc-quit-reason, erc-part-reason):
 +	Use 'erc-quit-and-part as `:group'.
 +	(erc-verbose-server-ping, erc-paranoid, erc-disable-ctcp-replies,
 +	erc-anonymous-login, erc-show-channel-key-p): Use 'erc-paranoia as
 +	`:group'.
 +	(erc-startup-file-list, erc-script-path, erc-script-echo): Use
 +	'erc-scripts as `:group'.
 +	(erc-nick-completion, erc-nick-completion-ignore-case,
 +	erc-nick-completion-postfix): Use 'erc-old-complete as `:group'.
 +	(erc-chanlist-progress-message, erc-no-list-networks,
 +	erc-chanlist-frame-parameters, erc-chanlist-hide-modeline,
 +	erc-chanlist-mode-hook): Use 'erc-list as `:group'.
 +	(erc-server-alist, erc-networks-alist): Use 'erc-networks as
 +	`:group'.
 +	(erc-settings): Use `defvar' instead of `defcustom' since this is
 +	only a draft which doesn't work.
 +	(erc-nicklist-window-size): Use 'erc-nicklist as `:group'.
 +	(erc-pcomplete-nick-postfix,
 +	erc-pcomplete-order-nickname-completions): Use 'erc-pcomplete as
 +	`:group'.
 +	(erc-replace-alist): Use 'erc-replace as `:group'.
 +	(erc-speak-filter-timestamp): Use 'erc-speak as `:group'.
 +	(erc-max-buffer-size): Use 'erc-truncate as `:group'.
 +
 +2004-12-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Go to the end of the buffer
 +	before recentering. This allows editing multiple lines more
 +	conveniently in CVS Emacs. This also undos a change by antifuchs
 +	who said this goto-char would mess up redisplay. Extensive testing
 +	couldn't reproduce that problem.
 +
 +2004-12-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-send-ctcp-message): upcase the ctcp message (so that
 +	version becomes VERSION, for example).
 +	(erc-iswitchb): Make the argument optional in non-interactive
 +	invocation, so erc-iswitchb can be substituted directly for
 +	iswitchb in code.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): Allow for the
 +	fact that `erc-track-mode' isn't bound when file is loaded.
 +
 +2004-12-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-position-in-mode-line): New customizable
 +	variable.  (erc-track-remove-from-mode-line): New function.
 +	Remove `erc-modified-channels-string' from the mode-line.
 +	(erc-track-add-to-mode-line): New function.  Add
 +	`erc-modified-channels-string' to the mode-line using the value of
 +	`erc-track-position-in-mode-line' to determine whether to add it
 +	to the beginning or the end of `mode-line-modes' (only available
 +	with GNU Emacs versions above 21.3) or to the end of
 +	`global-mode-string'.
 +	(erc-track-mode, erc-track-when-inactive-mode): Use the new
 +	functions.
 +
 +2004-12-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use (buffer-name) and not
 +	(erc-default-target) for the buffer name - buffer names are case
 +	sensitive.
 +
 +2004-12-11  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-message-type): Added the message "MODE" to the known
 +	erc-message-type widget, so that (for example) people can tell
 +	erc-track-exclude-types to ignore mode changes. The others tag
 +	also needed to be made an inline list, so that it's merged with
 +	the given constants, instead of being inserted as a list.
 +
 +2004-12-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el, erc.el: Update to get ERC look nicely in CVS Emacs.
 +
 +	* erc.el (erc-mode-line-format): When on CVS emacs, use the new
 +	format.
 +
 +	* erc-track.el (track module): When on CVS emacs, modify
 +	mode-line-modes instead of global-mode-string. The latter is way
 +	to far too the right.
 +
 +2004-11-18  Mario Lang <mlang@delysid.org>
 +
 +	* Makefile, debian/changelog: debian release 20041118-1
 +
 +2004-11-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-buttonize-nicks): Set default value to
 +	`t'.  Updated documentation and customization `:type' to reflect
 +	usage.
 +
 +2004-10-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* AUTHORS: Added self.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Added local variables for this file.
 +	(erc-list-version): New.
 +	(erc-cmd-LIST): Take &rest rather than &optional arguments, as was
 +	done in revision 1.21.  Allow for input when called interactively.
 +	(erc-prettify-channel-list, erc-chanlist-toggle-sort-state): Use
 +	`unless' instead of when not.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): Fixed so
 +	that the contents are only shown once. (MOTD): Display lines in
 +	the server buffer if it's the first MOTD sent upon connection.
 +	This is to avoid the problem of having the MOTD of one server
 +	showing up in another server's buffer if it took a while to get
 +	connected.
 +	(004): Fixed to show the user modes and channel modes correctly.
 +	(303): Now displays the nicknames returned by ISON instead of the
 +	user's nickname.
 +	(367, 368): Moved up into 300's section of the code.  Added
 +	documentation.  Use `multiple-value-bind' to set variables in 367.
 +	(391): Fixed so that the server name is shown correctly.
 +
 +2004-10-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Use CPROC instead of
 +	`erc-process' in debug message.  Should fix a bug where an error
 +	saying "Buffer *scratch* has no process" would occur when
 +	disconnected.
 +	(erc-cmd-SV): Check for X toolkit after checking for more specific
 +	features.  (erc--kill-server): Set `quitting' to non-nil so that
 +	we don't automatically reconnect.
 +
 +2004-10-05  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-ignored-user-p): Don't require regexes to match the
 +	beginning.
 +
 +2004-09-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: group erc: Moved to 'applications (patch by bojohan)
 +
 +2004-09-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: (erc-button-remove-old-buttons): Remove 'keymap
 +	not 'local-map.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Typo fix of the last
 +	commit.
 +
 +2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: JOIN response handler: Run `erc-join-hook'
 +	without arguments as specified in the docstring.
 +
 +2004-08-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-current-line): Removed unused variable SENTP.
 +
 +2004-08-19  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: ERC-SEND-COMPLETED-HOOK used to be run when the prompt
 +	was already displayed. We restore this behavior (thanks to bojohan
 +	and TerryP for noticing). We also fix the docstring of
 +	ERC-SEND-COMPLETED-HOOK, since the hook is (and used to be) called
 +	even if nothing was sent to the server.
 +	(erc-send-completed-hook): Fixed docstring.
 +	(erc-send-current-line): Add incantation for
 +	erc-send-completed-hook.
 +	(erc-send-input): Remove incantation for erc-send-completed-hook.
 +
 +2004-08-18  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: response-handler 368: Use s368, not s367.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Don't scroll when we're not
 +	connected anymore.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: Handle /mode #emacs b output without
 +	errors and such. First, handle unknown format specs gracefully
 +	(that is, give a useful error). Then, provide handlers for the
 +	banlist replies.
 +
 +	* erc-backend.el: New handler for 367 and 368. Removed from default
 +	handler.
 +
 +	* erc.el: Provide english catalog for s367 and s368.
 +	(erc-format-message): Give an error message when we don't find an
 +	entry.
 +
 +2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: erc-fill-variable could be confused about really
 +	long nicks. We put an upper limit on the length of the fill prefix.
 +	(erc-fill-variable): Adjust fill-prefix.
 +	erc-fill-variable-maximum-indentation: New variable.
 +
 +2004-08-17  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-send-input): Fixed a bug where this function
 +	referenced variable "input" instead of variable "str".
 +
 +2004-08-16  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-highlight-line): Fixed a bug where
 +	this function failed to set the correct face for highlighting the
 +	current line.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el (erc-fill-variable): Don't fuck up when the
 +	looking-at didn't work.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-send-single-line): Call the hooks to change the
 +	appearance for something only if we actually inserted something,
 +	doh.
 +	(erc-display-command): Display the prompt outside of the area that
 +	set the text properties on.
 +
 +2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: Refactored erc-send-current-line. This should fix some
 +	dormant bugs, and make the whole thing actually readable. Yay.
 +	Some changes in behavior were made. Whitespace at the end of lines
 +	sent is not removed anymore, but that shouldn't bother anyone.
 +	Additionally, errors in commands or hooks shouldn't prevent the
 +	prompt from showing up again now.
 +	(erc-parse-current-line): Removed.
 +	(erc-send-current-line): Refactored.
 +	(erc-send-input): New function.
 +	(erc-send-single-line): New function.
 +	(erc-display-command): New function.
 +	(erc-display-msg): New function.
 +	(erc-user-input): New function.
 +
 +2004-08-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SERVER): Use newer keyword call interface to
 +	erc-select, and handle the error if it can't resolve the host.
 +
 +2004-08-11  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc.el: erc-backend.el (404 response handler):
 +	New function. We now support "cannot send to channel".
 +
 +	* erc.el (erc-define-catalog call): Added s404. erc.el
 +	(erc-ctcp-ECHO-reply, erc-ctcp-CLIENTINFO-reply,
 +	erc-ctcp-FINGER-reply, erc-ctcp-PING-reply, erc-ctcp-TIME-reply,
 +	erc-ctcp-VERSION-reply): Display reply in the active window, not
 +	the server window.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Actually make it left
 +	to right, doh.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-all-buffers-of-server): Evaluate left-to-right
 +	so we don't surprise a user.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Parentophobia! Another
 +	paren-fix.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el: PRIVMSG NOTICE response handler: Killed one paren
 +	too much. Poor paren. Got resurrected.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-track.el: Make server buffers showing up in the mode line
 +	optional. Thanks to Daniel Knapp on the EmacsWiki for this patch.
 +
 +	erc-track-exclude-server-buffer: New variable.
 +	(erc-track-modified-channels): Return a server buffer only if
 +	erc-track-exclude-server-buffer is nil.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-DESCRIBE): Don't parse arguments.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-truncate.el: (erc-truncate-buffer-to-size): Use
 +	erc-insert-marker, not (point-max), to decide the length of the
 +	buffer. A long input line shouldn't make the buffer smaller.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-macs.el, erc-members.el: The change to hashes for channel
 +	members has been made some time ago.  Clean up the various tries to
 +	do this in the past.
 +
 +	erc-macs.el: Removed.  erc-members.el: Removed.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-backend.el, erc-ibuffer.el, erc-members.el, erc.el: Nothing
 +	big changed here. Really. Uhm, maybe the info-buffers are gone or
 +	so.  Can't really remember. Don't worry, nothing important is
 +	missing.
 +
 +	erc-speedbar.el looks nice btw, did you know?
 +
 +	Adjusted various places in erc.el, erc-backend.el, erc-ibuffer.el
 +	and erc-members.el - too numerous to list here, sorry.
 +
 +	* erc.el: erc-use-info-buffers: Removed.  erc-info-mode-map:
 +	Removed.
 +	(erc-info-mode): Removed.
 +	(erc-find-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffer): Removed.
 +	(erc-update-channel-info-buffers): Removed.
 +
 +	* erc-members.el: erc-update-member renamed to
 +	erc-update-channel-member for better clarity.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: This change improves the help output on a bogus command
 +	invocation. We display the command as it would be typed by the
 +	user, not as it is seen by Emacs.
 +
 +	(erc-get-arglist): Is now called erc-function-arglist, and returns
 +	now an arglist without the enclosing parens.
 +	(erc-command-name): New function.
 +	(erc-process-input-line): Pass the command name, not the function
 +	name.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-process-input-line): Fix bug when the command
 +	doesn't have an arglist or no documentation. Thanks bojohan again
 +	:)
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list),
 +	(erc-remove-entry-from-list): Update docstring, a TEST argument is
 +	not given.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Really fix this docstring.
 +
 +2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-with-buffer): Fix double evaluation in macro, and
 +	fix docstring.
 +
 +2004-08-10  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-cmd-JOIN): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-backend.el: Define an "Edebug specification" for the
 +	`define-erc-response-handler' macro. This means that one can step
 +	through response handlers defined by this macro with edebug. Maybe
 +	more macros would benefit from this?
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/CTCP): New function.
 +	Completion for the /CTCP command.  (erc-pcomplete-ctcp-commands):
 +	New variable. List of ctcp commands.
 +
 +2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-list.el: Clean up docstrings.
 +	(erc-prettify-channel-list): Extend properties to cover the entire
 +	line, including the newline, to make it look
 +	better.
 +	(erc-chanlist-highlight-line): Ditto.
 +	(erc-chanlist-mode-hook): Make it a defcustom.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-compute-full-name): Typo fix, should be full-name,
 +	not name.
 +
 +2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc): Setup the buffer to be shown in a window at the
 +	end of this function. This enables 'window-noselect to work
 +	properly.
 +	(erc, erc-send-current-line): Fix some
 +	goto-char/open-line/goto-char to goto-char/insert.
 +
 +2004-08-08  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-parse-user): Live with bogus info from bouncers.
 +
 +2004-07-31  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select): Change the docstring to reflect the new
 +	arguments; include the arguments in the docstring for non-cvs
 +	emacs. Change the parameters to call erc-compute-* instead of
 +	using the erc-* variables directly.
 +	(erc-compute-server): Made argument optional.
 +	(erc-compute-nick): ditto.
 +	(erc-compute-full-name): ditto.  (erc-compute-port): ditto.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where channel-banlist was
 +	not reset to nil before fetching an updated banlist from the
 +	server.
 +
 +2004-07-30  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: (erc-cmd-BANLIST): Fixed a bug where the
 +	'received-from-server property on variable channel-banlist was not
 +	being reset to nil.  This fixes the symptom where one types
 +	/BANLIST and sees "No bans for channel: #whatever" when you know
 +	there are bans.
 +
 +2004-07-23  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-select-read-args): Use erc-compute-nick to
 +	calculate the default nickname
 +
 +2004-07-20  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el: (erc-process-sentinel-1): New function. This is an
 +	auxiliary function refactored out of erc-process-sentinel to
 +	decide a server buffer's fate (whether it should be killed, and
 +	whether erc should attempt to auto-reconnect).  Michael Olson
 +	<mwolson@gnu.org> helped with this.
 +	(erc-kill-server-buffer-on-quit): New variable. Used in
 +	erc-process-sentinel-1 to decide whether to kill a server buffer
 +	when the user quit normally.
 +	(erc-process-sentinel): Auxiliary function erc-process-sentinel-1
 +	split out.  The function body has `with-current-buffer' wrapped
 +	around it, to ensure separation of messages if multiple
 +	connections were being made.  Use `if' instead of `cond' in places
 +	where the decision is binary.  The last (useless, since the server
 +	connection is closed) prompt in the server buffer is removed.
 +	Color "erc terminated" and "erc finished" messages with
 +	erc-error-face.  Mark the buffer unmodified so that, if not killed
 +	automatically, the user is not prompted to save it.
 +
 +2004-07-16  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc.el (erc-select-read-args): New function. Prompts the user
 +	for arguments to pass to erc-select and erc-select-ssl.
 +	(erc-select): Use (erc-select-read-args) when called interactively
 +	to get its arguments.  When non-interactively, use keyword
 +	arguments.
 +	(erc-select-ssl): Ditto.
 +	(erc-compute-port): New function. Parallel to erc-compute-server,
 +	but comes up with a default value for an IRC server's port.
 +
 +2004-07-16  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Quote the current nickname.
 +
 +2004-07-12  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-mode): Remove explicit invocation of
 +	erc-chanlist-mode-hook, since it's automatically invoked by
 +	define-derived-mode
 +
 +2004-07-03  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-current-nick-p): Quote current nick for
 +	regexp parsing.
 +
 +2004-06-27  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-nickserv.el (erc-nickserv-identify-mode): Fix erroneous
 +	parentheses in call to `completing-read'.
 +
 +2004-06-23  Alex Schroeder <alex@gnu.org>
 +
 +	* Makefile (release): Depend on autoloads, and copy erc-auto.el
 +	into the tarball.
 +
 +2004-06-14  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed minor bug where each line
 +	received from a server was logged as two lines (one with text and
 +	one blank).
 +
 +2004-06-08  Brian Palmer <bpalmer@gmail.com>
 +
 +	* erc-list.el (erc-chanlist-frame-parameters): Made customizable.
 +	(erc-chanlist-header-face): Changed to use defface with some
 +	reasonable defaults instead of make-face, and removed the
 +	associated -face variable.
 +	(erc-chanlist-odd-line-face): Ditto.
 +	(erc-chanlist-even-line-face): Ditto.
 +	(erc-chanlist-highlight-face): New variable. Holds a face used for
 +	highlighting the current line.
 +	(erc-cmd-LIST): Use erc-member-ignore-case instead of
 +	member-ignore-case.
 +	(erc-chanlist-post-command-hook): Change to move the highlight
 +	overlay instead of refontifying the entire buffer.
 +	(erc-chanlist-dehighlight-line): Added to detach the highlight
 +	overlay from the buffer.
 +
 +2004-05-31  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-mode-line-format: Add column numbers.
 +
 +2004-05-31  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-autojoin.el: Typo fix.
 +
 +	* erc-dcc.el (erc-dcc-do-GET-command): Use expand-file-name.
 +	(erc-dcc-get-file): XEmacs set-buffer-multibyte compatibility.
 +
 +	* erc-log.el: Append `erc-log-setup-logging' to
 +	`erc-connect-pre-hook' so that `erc-initialize-log-marker' is run
 +	first (markers are needed by `erc-log-setup-logging').
 +	(erc-enable-logging): Docstring fix.
 +	(erc-log-setup-logging): Move `erc-log-insert-log-on-open' to (1-
 +	(point-max)) when doing `erc-log-insert-log-on-open'.  Modified
 +	version of a patch by Lawrence Mitchell.
 +	(erc-log-all-but-server-buffers): Do `save-excursion' as well.
 +	(erc-current-logfile): Pass buffer name as target
 +	argument to `erc-generate-log-file-name-function' if
 +	`erc-default-target' is nil.
 +	(erc-generate-log-file-name-with-date): Use expand-file-name.
 +	(erc-generate-log-file-name-short): Ditto.
 +	(erc-save-buffer-in-logs): Do `save-excursion' and test whether
 +	erc-last-saved-position is a marker.
 +
 +	* erc-members.el: Avoid miscompiling macro `erc-log' and
 +	`with-erc-channel-buffer' by requiring 'erc at compile time.
 +
 +	* erc-sound.el: Use expand-file-name.
 +
 +	* erc.el (erc-debug-log-file): Ditto.
 +	(erc-find-file): Ditto.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-BANLIST): Added a missing "'"
 +	that was preventing /BANLIST from working.  In erc-backend.el,
 +	added server repsonse handler for 367 and 368 reponses to get
 +	/BANLIST working.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Removed an eval-when-compile that was preventing the
 +	byte-compiled version of this file from loading.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Undid part of my last change.  I suspect it was wrong.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el: Silenced several byte-compiler warnings.
 +
 +2004-05-26  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol): Fixed problem where this function
 +	misformatted IRC protocol text if multiple lines were received from
 +	the server at one time.
 +
 +2004-05-25  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Cosmetic changes to the
 +	informational text in the *erc-protocol* buffer.
 +
 +2004-05-24  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-log-irc-protocol, erc-process-filter): Now the lines
 +	inserted in the *erc-protocol* buffer are prefixed with the name
 +	of the network to/from which the data is going/coming.  This makes
 +	reading the *erc-protocol* buffer much easier when connected to
 +	multiple networks.
 +
 +2004-05-23  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-backend.el: Fixes server message parsing so that command
 +	arguments specified after the colon are not treated specially. All
 +	arguments are added to the `command-args' field, and the
 +	`contents' points to the last element in the `command-args' list.
 +	This allows ERC to connect to networks such as Undernet.  Although
 +	keeping `contents' allows many of the response handlers to
 +	continue to work as-is, many other are probably broken by this
 +	patch.
 +
 +2004-05-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Add comment that C-c C-a can be useful if you write
 +	ChangeLog entries using Emacs' standard functions.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Ignore errors when attempting to require dframe
 +	(there are a couple implementations of speedbar, one of which uses
 +	of dframe).
 +	(erc-speedbar-version): New.
 +	(erc-speedbar-goto-buffer): Use dframe functions if dframe is
 +	available.
 +
 +2004-05-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autojoin.el: Added local variables for this file.
 +	(erc-autojoin-add): The channel name is in `erc-response.contents'.
 +
 +2004-05-17  Mario Lang <mlang@delysid.org>
 +
 +	* erc-log.el: Dont autoload a define-key statement, erc-mode-map
 +	might not be known yet
 +
 +2004-05-16  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-parse-server-response): Revert to original
 +	`erc-parse-line-from-server' version, since new version breaks for
 +	a number of edge cases.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-handle-unknown-server-response): New
 +	function.  Added to `erc-default-server-functions'.  Display
 +	unknown responses to the user.
 +	(221): Don't show nickname in modes list.
 +	(254): Fixed to use 's254.
 +	(303): Added docstring.
 +	(315, 318, 323, 369): Ignored responses grouped together.
 +	(391): New.
 +	(406, 432): Use ?n, not ?c in `erc-display-message'.
 +	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
 +	502): All error responsess with no arguments grouped together.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-message-type-member): Use `erc-response.command'.
 +	`erc-track-exclude-types' should be respected again.
 +	(erc-cmd-TIME): Fixed to work with and without server given as
 +	argument.
 +	(erc-define-catalog): Added, s391, s431, s445, s446, s451, s462,
 +	s463, s464, s465, s483, s484, s485, s491, s501, s502.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Typo fix.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* Makefile (erc-auto.el): Pass -f flag to rm so that we don't fail
 +	if erc-auto.elc doesn't exist.
 +
 +2004-05-14  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el (erc-with-buffer): Autoload.
 +	(erc-parse-server-response): XEmacs' `replace-match' only replaces
 +	subexpressions when operating on buffers, not strings, work around
 +	it.
 +	(461): Command with invalid arguments is `second', not `third'.
 +
 +2004-05-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-notify.el (erc-notify-NICK): Use `erc-response.contents' to
 +	get nickname.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-track.el: Indentation fixes.
 +	(track-when-inactive): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-notify.el (notify): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-notify-timer, erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (services, erc-nickserv-identify-mode): Use
 +	`erc-server-FOO-functions', not `erc-server-FOO-hook.
 +	(erc-nickserv-identify-autodetect): Use new accessors for PARSED
 +	argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-netsplit.el (netsplit): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-netsplit-JOIN, erc-netsplit-MODE, erc-netsplit-QUIT): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-menu.el (erc-menu-definition): Only allow listing of
 +	channels if `erc-cmd-LIST' is fboundp.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-match.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-get-parsed-vector-nick, erc-get-parsed-vector-type): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-chanlist, erc-chanlist-322): Use new accessors
 +	for PARSED argument.  Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-ezbounce.el (erc-ezb-notice-autodetect): Use new accessors
 +	for PARSED argument.
 +	(erc-ezb-initialize): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el: Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-dcc-no-such-nick): Use new accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-bbdb.el (erc-bbdb-whois, erc-bbdb-JOIN, erc-bbdb-NICK): Use
 +	new accessors for PARSED argument.
 +	(BBDB): Use `erc-server-FOO-functions', not `erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autojoin.el (autojoin): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +	(erc-autojoin-add, erc-autojoin-remove): Use new accessors for
 +	PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-autoaway.el (autoaway): Use `erc-server-FOO-functions', not
 +	`erc-server-FOO-hook.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-backend): Require.
 +	(erc-disconnected-hook, erc-join-hook, erc-quit-hook)
 +	(erc-part-hook, erc-kick-hook): Docstring fix, we now use
 +	`erc-server-FOO-functions', rather than `erc-server-FOO-hook'.
 +	(erc-event-to-hook-name, erc-event-to-hook): Remove.
 +	(erc-once-with-server-event)
 +	(erc-once-with-server-event-global): Use `erc-get-hook'
 +	(erc-process-filter): Use `erc-parse-server-response'.
 +	(erc-cmd-IDLE, erc-cmd-BANLIST, erc-cmd-MASSUNBAN): New accessors
 +	for PARSED argument.  Rename all `erc-server-FOO-hook' to
 +	`erc-server-FOO-functions'.
 +	(erc-server-364-hook, erc-server-365-hook, erc-server-367-hook)
 +	(erc-server-368-hook, erc-server-KILL-hook)
 +	(erc-server-PONG-hook, erc-server-200-hook, erc-server-201-hook)
 +	(erc-server-202-hook, erc-server-203-hook, erc-server-204-hook)
 +	(erc-server-205-hook, erc-server-206-hook, erc-server-208-hook)
 +	(erc-server-209-hook, erc-server-211-hook, erc-server-212-hook)
 +	(erc-server-213-hook, erc-server-214-hook, erc-server-215-hook)
 +	(erc-server-216-hook, erc-server-217-hook, erc-server-218-hook)
 +	(erc-server-219-hook, erc-server-241-hook, erc-server-242-hook)
 +	(erc-server-243-hook, erc-server-244-hook, erc-server-249-hook)
 +	(erc-server-261-hook, erc-server-262-hook, erc-server-302-hook)
 +	(erc-server-323-hook, erc-server-342-hook, erc-server-351-hook)
 +	(erc-server-381-hook, erc-server-382-hook, erc-server-391-hook)
 +	(erc-server-392-hook, erc-server-393-hook, erc-server-394-hook)
 +	(erc-server-395-hook, erc-server-402-hook, erc-server-404-hook)
 +	(erc-server-407-hook, erc-server-409-hook, erc-server-411-hook)
 +	(erc-server-413-hook, erc-server-414-hook, erc-server-415-hook)
 +	(erc-server-422-hook, erc-server-423-hook, erc-server-424-hook)
 +	(erc-server-431-hook, erc-server-436-hook, erc-server-437-hook)
 +	(erc-server-441-hook, erc-server-443-hook, erc-server-444-hook)
 +	(erc-server-445-hook, erc-server-446-hook, erc-server-451-hook)
 +	(erc-server-462-hook, erc-server-463-hook, erc-server-464-hook)
 +	(erc-server-465-hook, erc-server-467-hook, erc-server-471-hook)
 +	(erc-server-472-hook, erc-server-473-hook, erc-server-483-hook)
 +	(erc-server-491-hook, erc-server-502-hook): Remove.
 +	(erc-call-hooks, erc-parse-line-from-server): Remove
 +	(erc-server-hook-list): Remove.  Remove top-level call too.
 +	(erc-server-ERROR, erc-server-INVITE, erc-server-JOIN)
 +	(erc-server-KICK, erc-server-MODE, erc-server-NICK)
 +	(erc-server-PART, erc-server-PING, erc-server-PONG)
 +	(erc-server-PRIVMSG-or-NOTICE, erc-server-QUIT)
 +	(erc-server-TOPIC, erc-server-WALLOPS, erc-server-001)
 +	(erc-server-004, erc-server-005, erc-server-221, erc-server-252)
 +	(erc-server-253, erc-server-254, erc-server-301, erc-server-303)
 +	(erc-server-305, erc-server-306, erc-server-311-or-314)
 +	(erc-server-312, erc-server-313, erc-server-317, erc-server-319)
 +	(erc-server-320, erc-server-321, erc-server-322, erc-server-324)
 +	(erc-server-329, erc-server-330, erc-server-331, erc-server-332)
 +	(erc-server-333, erc-server-341, erc-server-352, erc-server-353)
 +	(erc-server-366, erc-server-MOTD, erc-server-379)
 +	(erc-server-401, erc-server-403, erc-server-405, erc-server-406)
 +	(erc-server-412, erc-server-421, erc-server-432, erc-server-433)
 +	(erc-server-437, erc-server-442, erc-server-461, erc-server-474)
 +	(erc-server-475, erc-server-477, erc-server-481, erc-server-482)
 +	(erc-server-501): Move to erc-backend.el
 +	(erc-auto-query, erc-banlist-store, erc-banlist-finished)
 +	(erc-banlist-update, erc-connection-established)
 +	(erc-process-ctcp-query, erc-display-server-message): Use new
 +	accessors for PARSED argument.
 +
 +2004-05-13  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-backend.el: (erc-parse-server-response)
 +	(erc-handle-parsed-server-response, erc-get-hook)
 +	(define-erc-response-handler): New functions.
 +	(erc-response): New struct for server responses.
 +	(erc-server-responses): New variable.
 +	(erc-call-hooks): Move from erc.el and rework.
 +	(ERROR, INVITE, JOIN, KICK, MODE, NICK, PART, PING, PONG)
 +	(PRIVMSG, NOTICE, QUIT, TOPIC, WALLOPS, 001, MOTD, 376, 004)
 +	(252, 253, 254, 250, 301, 303, 305, 306, 311, 312, 313, 315)
 +	(317, 318, 319, 320, 321, 322, 324, 329, 330, 331, 332, 333)
 +	(341, 352, 353, 366, 369, 379, 401, 403, 405, 406, 412, 421)
 +	(432, 433, 437, 442, 461, 474, 477, 481, 482, 501, 323, 221)
 +	(002, 003, 371, 372, 374, 375, 422, 251, 255, 256, 257, 258)
 +	(259, 265, 266, 377, 378, 314, 475, 364, 365, 367, 368, 381)
 +	(382, 391, 392, 393, 394, 395, 200, 201, 202, 203, 204, 205)
 +	(206, 208, 209, 211, 212, 213, 214, 215, 216, 217, 218, 219)
 +	(241, 242, 243, 244, 249, 261, 262, 302, 342, 351, 402, 404)
 +	(407, 409, 411, 413, 414, 415, 423, 424, 431, 436, 441, 443)
 +	(444, 445, 446, 451, 462, 463, 464, 465, 467, 471, 472, 473)
 +	(483, 491, 502, 005, KILL): Move from erc.el and rework using
 +	`define-erc-response-handler' and erc-response struct.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: A few bug fixes to avoid errors after disconnect,
 +	including the "Selecting deleted buffer" bug.
 +	(erc-channel-user-op-p, erc-channel-user-voice-p): Make sure NICK
 +	is non-nil (`erc-current-nick' can return nil).
 +	(erc-server-buffer): Make sure the buffer isn't a #<killed
 +	buffer>.
 +	(erc-server-buffer-live-p): New function.
 +	(erc-display-line, erc-join-channel, erc-prepare-mode-line-format,
 +	erc-away-p): Use `erc-server-buffer-live-p' to make sure process
 +	buffer exists.
 +	(erc-send-current-line): If there is no server buffer, let the
 +	user know.
 +
 +2004-05-12  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-log.el: C-c C-l keybinding now defined in
 +	erc-log.el.
 +	(erc-log-version): New.
 +	(erc-cmd-JOIN): Fix applied for bug where /join -invite causes
 +	errors when there's no `invitation'.
 +
 +2004-05-11  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-JOIN): Make sure `chnl' is non-nil before trying
 +	to join anything (chnl is not set if /join -invite is used but
 +	there's no `invitation').
 +
 +2004-05-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Define C-c C-l keybinding outside of `erc-log-mode',
 +	making it available all the time; autoload definition.
 +	(erc-log-version): New.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, Makefile, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-chess.el, erc-dcc.el, erc-ezbounce.el,
 +	erc-fill.el, erc-ibuffer.el, erc-imenu.el, erc-lang.el,
 +	erc-list.el, erc-log.el, erc-macs.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-nets.el, erc-netsplit.el, erc-nickserv.el,
 +	erc-notify.el, erc-page.el, erc-ring.el, erc-speak.el,
 +	erc-speedbar.el, erc-stamp.el, erc-track.el, erc-truncate.el,
 +	erc-xdcc.el, erc.el: Applied all relevant bug fixes and code
 +	cleanup made between the time of the ERC_4_0_RELEASE tag until now.
 +
 +2004-05-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-info-buffer): Correct bug in sorting
 +	of channel users.  Tiny change from Andreas Schwab
 +	<schwab@suse.de>.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-fill.el (erc-fill-variable): Fix docstring.
 +
 +2004-05-09  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-button.el (erc-button-add-button): Use 'keymap
 +	text-property, rather than 'local-map, since it's cross-emacs
 +	compatible.  Pass :mouse-down-action into `widget-convert-button'
 +	as 'erc-button-click-button, to make XEmacs happy.  Replace bogus
 +	reference to erc-widget-press-button with erc-button-press-button.
 +	(erc-button-click-button): New (ignored) first argument, to make
 +	XEmacs behave when pressing buttons.
 +	(erc-button-press-button): New (ignored) &rest argument.
 +
 +2004-05-09  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-log.el (erc-conditional-save-buffer): Fix docstring
 +	reference to erc-save-queries-on-quit.
 +	(erc-conditional-save-queries): Ditto.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-speedbar.el: Updated copyright years.  Added local variables
 +	for this file; fixed indenting.
 +	(erc-speedbar): New group.
 +	(erc-speedbar-sort-users-type): New variable.
 +	(erc-speedbar-buttons): Handle query buffers (fixes a bug where an
 +	error would be thrown if the current buffer was a query).  Ignore
 +	unknown buffers.
 +	(erc-speedbar-expand-channel): Show limit and key with channel
 +	modes. Sort users according to `erc-speedbar-sort-users-type'.
 +	(erc-speedbar-insert-user): Fixed bug where only nicks with more
 +	info were being listed, and those were shown twice.
 +	(erc-speedbar-goto-buffer): Don't use dframe functions, as dframe
 +	isn't available with the default speedbar.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-sort-channel-users-alphabetically): New function.
 +	(erc-server-412, erc-server-432, erc-server-475): New functions.
 +	(erc-server-412-hook, erc-server-432-hook, erc-server-475-hook):
 +	Use them.
 +	(erc-server-401, erc-server-403, erc-server-405)
 +	(erc-server-421, erc-server-474, erc-server-481): Use catalog
 +	messages.
 +	(erc-define-catalog): Added s401, s403, s405, s412, s421, s432,
 +	s474, s475, and s481.
 +
 +2004-05-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Added documentation to Commentary, Usage.
 +	Removed `outline-mode' from file local variables.
 +	(erc-services-mode): Use `erc-nickserv-identify-mode' to add
 +	hooks.
 +	(erc-nickserv-identify-mode): New function.
 +	(erc-nickserv-identify-mode): New variable.
 +	(erc-prompt-for-nickserv-password, erc-nickserv-passwords):
 +	Changed docstring.
 +	(erc-nickserv-identify-autodetect): Use
 +	`erc-nickserv-call-identify-function'. Docstring change.
 +	(erc-nickserv-identify-on-connect,
 +	erc-nickserv-identify-on-nick-change,
 +	erc-nickserv-call-identify-function): New functions.
 +	(erc-nickserv-identify): PASSWORD is not optional.  Autoload
 +	function.
 +
 +2004-05-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-hook, erc-quit-hook, erc-part-hook,
 +	erc-kick-hook, erc-connect-pre-hook): Now customizable.
 +	(erc-nick-changed-functions): New hook.
 +	(erc-server-NICK): Run `erc-nick-changed-functions' with the
 +	arguments NEW-NICK and OLD-NICK.
 +	(erc-channel-user-voice-p, erc-channel-user-voice-p): Shortened
 +	docstring.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: New section on function/variable naming and coding
 +	conventions.
 +
 +2004-05-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-wash-quit-reason): Quote regexp special characters
 +	in NICK, LOGIN and HOST.
 +
 +2004-05-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-server-parameters): Typo fix in docstring.
 +	(erc-input-line-position): `:type' is now a choice between integer
 +	and nil.  (erc-mode-map): Bind `erc-get-channel-mode-from-keypress'
 +	to C-c C-o instead of C-c RET (C-c C-m).  (erc-cmd-GQUIT): Use
 +	REASON as argument when calling `erc-cmd-QUIT'.
 +
 +2004-05-03  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nicklist.el: Initial version.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Added local variables for file, fixed indenting.
 +	(erc-menu-version): New variable.
 +	(erc-menu-definition): "List channels": New.  "Join channel": Use
 +	`erc-connected' as test.  "Start a query": New.  "List channel
 +	operators": New.  "Input action": Moved up.  "Set topic": Fixed
 +	test so it's only active in channels.  "Leave this channel": Moved
 +	down.  "Track hidden channel buffers": Removed.  "Enable/Disable
 +	ERC Modules": New.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-mode-map): Removed binding for
 +	`erc-save-buffer-in-logs' (moved to erc-log.el).
 +	(erc-cmd-QUERY, erc-cmd-OPS): Now interactive.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-log.el: Added local variables for this file.
 +	(erc-log-channels-directory): Added directory as a choice in
 +	`:type'.
 +	(define-erc-module): Define and undefine key binding (C-c
 +	C-l) for `erc-save-buffer-in-logs' here.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added local variables for this file.
 +	(erc-networks-alist): Fixed `:type' to work better in
 +	customization.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added local variables for file.  (erc-keywords):
 +	Use `list' instead of `cons' in `:type'.  Fixes bug where mismatch
 +	was shown in customization.  (erc-current-nick-highlight-type):
 +	Escape parentheses in docstring.  Added keyword, nick-or-keyword as
 +	options in `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Added local variables for file.
 +	(erc-away-timestamp-format): Allow nil as a choice in `:type'.
 +	(erc-timestamp-intangible): Changed `:type' to boolean.
 +	(erc-timestamp-right-column): Added `:group' and `:type'.
 +
 +2004-04-28  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-modules): Added bbdb, log, match, sound, and stamp
 +	as `:type' options; changed documentation for autojoin, fill,
 +	pcomplete, track.  (erc-prompt-for-channel-key): New variable.
 +	(erc-join-channel): Only prompt for key if
 +	`erc-prompt-for-channel-key' is non-nil.  (erc-format-my-nick): New
 +	function.  (erc-send-message, erc-send-current-line): Use it.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-track.el: (erc-track-modified-channels): Fix indentation.
 +
 +2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-hide-fools): Docstring fix.
 +	(erc-log-matches-types-alist): Added `current-nick' to valid
 +	choices.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-page.el, erc-ezbounce.el, erc-speak.el, erc-match.el,
 +	erc-track.el (erc-ezbounce, erc-page, erc-speak): Groups defined.
 +	(erc-match, erc-track): `erc' is parent group.
 +	(erc-ezb-regexp, erc-ezb-login-alist): Added `:group'.
 +
 +2004-04-20  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-fill.el: Fixed erc-fill-static so it breaks the lines at the
 +	right column and respects timestamps. Patch by Simon Siegler
 +	<simon@trz-kril.de>
 +	(erc-fill-static): Major rewrite and split up into some functions.
 +	(erc-count-lines): Removed.
 +	(erc-fill-regarding-timestamp): New function.
 +	(erc-timestamp-offset): New function.
 +	(erc-restore-text-properties): New function.
 +	(erc-fill-variable): Respect leftbound timestamp.  This is still
 +	broken if someone has both erc-timestamp-only-if-changed-flag set
 +	and erc-insert-timestamp-function set to
 +	'erc-insert-timestamp-left, but otherwise it works now.
 +
 +2004-04-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-cmd-SV): Show features gtk, mac-carbon, multi-tty.
 +	Fixed so that arguments fit the format (build date was not being
 +	shown).
 +
 +2004-04-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-channel-topic); Error if `channel-topic' is
 +	unbound.  Remove %-sign substitution.
 +	(erc-update-mode-line-buffer): Escape %-signs in `channel-topic'
 +	here.
 +
 +2004-04-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-send-action, erc-ctcp-query-ACTION,
 +	erc-ctcp-reply-ECHO-hook): Let `erc-display-message-highlight'
 +	propertize the message.
 +	(erc-display-message-highlight): Allow for any erc-TYPE-face.
 +	(erc-cmd-JOIN): Display error message instead of throwing an error
 +	if there's no `invitation'.
 +	(erc-cmd-PART): Allow for no reason if channel is provided.  Fixes
 +	bug where user would part the current channel with the other
 +	channel's name as reason when no reason was given.
 +	(erc-server-vectors, erc-debug-missing-hooks): Added docstring.
 +	(erc-server-JOIN): Moved `erc-join-hook' to JOIN-you section.
 +	`erc-join-hook' called by `run-hook-with-args', sending the ARGS
 +	`chnl' and the channel's buffer.  Changed an instance of if
 +	without else to when.
 +	(erc-server-477): New function.
 +	(erc-server-477-hook): Use `erc-server-477'.
 +	(erc-define-catalog): Added `no-invitation'.
 +
 +2004-04-14  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Local variables for file added.
 +	(erc-nickserv-passwords): Customization: Network symbols updated
 +	to reflect `erc-nickserv-alist'.  Allow user to type in network
 +	symbol.
 +	(erc-nickserv-alist): Now customizable variable.
 +
 +2004-04-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Make sure `line'
 +	is a string to avoid errors upon startup.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-version): New variable.
 +	(erc-auto-discard-away): Updated docstring.
 +	(erc-autoaway-no-auto-back-regexp): New variable.
 +	(erc-autoaway-reset-idletime): Use it.	Hopefully a better solution
 +	which allows for aliases to "/away" and any other text that the
 +	user wants to ignore when `erc-auto-discard-away' is non-nil.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): Forgot /gaway in
 +	regexp.
 +
 +2004-04-06  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-autoaway.el (erc-autoaway-reset-idletime): If the user sends
 +	an "/away" command, don't call `erc-autoaway-set-back', fixes bug
 +	where ERC would send "/away" when user was already away and sent an
 +	"/away reason".  Changed `l' to `line' for better understanding.
 +	(erc-autoaway-set-back): Changed `l' to `line' for better
 +	understanding.
 +
 +2004-04-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-set-channel-key): Now able to remove key.
 +	(erc-set-channel-limit): Now able to remove limit.
 +	(erc-get-channel-mode-from-keypress): Fixed docstring.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-join-channel): Allow for optional channel key.
 +	(erc-set-modes): Need to set `channel-key' to nil in case of mode
 +	changes during split.
 +	(erc-show-channel-key-p): New variable.
 +	(erc-prepare-mode-line-format): Only show key if
 +	`erc-show-channel-key-p' is non-nil.
 +
 +2004-04-04  Diane Murray <disumu@x3y2z1.net>
 +
 + 	* erc.el (channel-key): New variable.
 +	(erc-update-channel-key): New function.
 +	(erc-set-modes, erc-parse-modes, erc-update-modes, erc,
 +	erc-update-channel-info-buffer): Deal with channel keys.
 +	(erc-prepare-mode-line-format): Show channel key in header-line.
 +	(erc-server-NICK): Show nick change in server buffer as well.
 +	(erc, erc-send-command, erc-banlist-store, erc-banlist-update,
 +	erc-load-irc-script-lines,
 +	erc-arrange-session-in-multiple-windows, erc-handle-login,
 +	erc-find-channel-info-buffer): Changed when not to unless.
 +	(erc-server-MODE): Changed if without else to when.
 +
 +2004-03-27  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc.el: (erc-cmd-BANLIST): Use `truncate-string-to-width'
 +	instead of `truncate-string' alias.
 +	(erc-nickname-in-use): Ditto.
 +
 +2004-03-27  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-list): Fixed error caused by erc-cmd-LIST
 +	passing a non-sequence to erc-chanlist.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Add new hook `erc-join-hook', which is run when we join a
 +	channel.
 +
 +2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Replaced existing notice user notification system and
 +	the configuration options, which consisted of
 +	`erc-echo-notices-in-minibuffer-flag' and
 +	`erc-echo-notices-in-current-buffer' with two new hooks,
 +	`erc-echo-notice-hook' and `erc-echo-notice-always-hook'.
 +
 +	When user notification is needed, `erc-echo-notice-always-hook' is
 +	first run using `run-hook-with-args', then `erc-echo-notice-hook'
 +	is run using `run-hook-with-args-until-success'.
 +
 +	In addition to these hooks, a large number of functions, which are
 +	described in the documentation strings of those hooks, were added
 +	which can be used to achieve a large variety of different
 +	behaviors.
 +
 +	The current default behavior, which is identical to the existing
 +	default behavior, is for `erc-echo-notice-always-hook' to be set to
 +	`(erc-echo-notice-in-default-buffer).
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: (erc-modified-channels-display): Added a space
 +	before opening bracket.
 +
 +2004-03-21  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: (erc-format-query-as-channel-p): New variable.
 +	(erc-server-PRIVMSG-or-NOTICE): If `erc-format-query-as-channel-p'
 +	is nil, messages in the query buffer are formatted like private
 +	messages.
 +
 +	(erc-server-252-hook, erc-server-253-hook, erc-server-254-hook,
 +	erc-server-256-hook, erc-server-257-hook, erc-server-258-hook,
 +	erc-server-259-hook, erc-server-371-hook, erc-server-372-hook,
 +	erc-server-374-hook, erc-server-374-hook, erc-server-442-hook,
 +	erc-server-477-hook): Removed, now defined in
 +	`erc-server-hook-list'.
 +	(erc-display-server-message): New function.
 +	(erc-server-252, erc-server-253, erc-server-254, erc-server-442):
 +	New functions.
 +	(erc-server-hook-list): Added 250, 256, 257, 258, 259, 265, 266,
 +	377, 378, 477 - using `erc-display-server-message'.  251, 255 now
 +	use `erc-display-server-message'.  Added 252, 253, 254, 442 -
 +	using respective erc-server-* functions.  371, 372, 374, 375 now
 +	defined here.
 +	(erc-define-catalog): Added s252, s253, s254, s442.
 +	(erc-server-001, erc-server-004, erc-server-005): Fixed
 +	documentation.
 +
 +2004-03-20  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: Commentary: Changed `erc-stamp-mode' to
 +	`erc-timestamp-mode'.
 +	(erc-insert-timestamp-left): Use `erc-timestamp-face' on filler
 +	spaces as well.
 +
 +2004-03-19  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-send-action): Use `erc-input-face'.
 +	(erc-display-message-highlight): If the requested highlighting
 +	type doesn't match, just display the string with no highlighting
 +	and warn about it with `erc-log'.. (erc-cmd-JOIN): If user is
 +	already on the requested channel, switch to that channel's buffer.
 +	(erc-ctcp-query-ACTION): Use `erc-action-face' for nick as well.
 +	(erc-header-line-use-help-echo-p): New variable.
 +	(erc-update-mode-line-buffer): Use `help-echo' for header-line if
 +	`erc-header-line-use-help-echo-p' is non-nil.
 +
 +2004-03-18  Adrian Aichner <adrian@xemacs.org>
 +
 +	* erc-nets.el: Use two arguments version of `make-obsolete', if
 +	third argument is not supported (for XEmacs).
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* CREDITS: added CREDITS entry for Adrian Aichner
 +
 +2004-03-18  Andreas Fuchs <asf@void.at>
 +
 +	* erc-xdcc.el, erc.el, erc-autoaway.el, erc-autojoin.el,
 +	erc-button.el, erc-dcc.el, erc-ezbounce.el, erc-imenu.el,
 +	erc-list.el, erc-log.el, erc-match.el, erc-members.el,
 +	erc-menu.el, erc-netsplit.el, erc-notify.el, erc-speedbar.el,
 +	erc-stamp.el, erc-track.el, erc-truncate.el:
 +	(erc-coding-sytem-for-target): Removed.
 +	(erc-coding-system-for-target): New.
 +	(erc-autoaway-use-emacs-idle): Typo fix.
 +	(erc-auto-set-away): Ditto.
 +	(erc-auto-discard-away): Ditto.
 +	(autojoin): Ditto.
 +	(erc-button-alist): Ditto.
 +	(erc-dcc-auto-masks): Ditto.
 +	(erc-dcc-chat-send-input-line): Ditto.
 +	(erc-ezb-get-login): Ditto.
 +	(erc-unfill-notice): Ditto.
 +	(erc-save-buffer-in-logs): Ditto.
 +	(match): Ditto.
 +	(erc-log-matches-types-alist): Ditto.
 +	(erc-match-directed-at-fool-p): Ditto.
 +	(erc-match-message): Ditto.
 +	(erc-update-member): Ditto.
 +	(erc-ignored-reply-p): Ditto.
 +	(erc-menu-definition): Ditto.
 +	(erc-netsplit-QUIT): Ditto.
 +	(erc-notify-list): Ditto.
 +	(erc-speedbar-update-channel): Ditto.
 +	(erc-speedbar-item-info): Ditto.
 +	(erc-stamp): Ditto.
 +	(erc-timestamp-intangible): Ditto.
 +	(erc-add-timestamp): Ditto.
 +	(erc-timestamp-only-if-changed-flag): Ditto.
 +	(erc-show-timestamps): Ditto.
 +	(erc-track-priority-faces-only): Ditto.
 +	(erc-modified-channels-alist): Ditto.
 +	(erc-unique-substrings): Ditto.
 +	(erc-find-parsed-property): Ditto.
 +	(erc-track-switch-direction): Ditto.
 +	(erc-truncate-buffer-to-size): Ditto.
 +	(erc-xdcc): Ditto.
 +	(erc-auto-reconnect): Ditto.
 +	(erc-startup-file-list): Ditto.
 +	(erc-once-with-server-event): Ditto.
 +	(erc-once-with-server-event-global): Ditto.
 +	(erc-mode): Ditto.
 +	(erc-generate-new-buffer-name): Ditto.
 +	(erc): Ditto.
 +	(erc-open-ssl-stream): Ditto.
 +	(erc-default-coding-system): Ditto.
 +	(erc-encode-string-for-target): Ditto.
 +	(erc-decode-string-from-target): Ditto.
 +	(erc-scroll-to-bottom): Ditto.
 +	(erc-decode-controls): Ditto.
 +	(erc-channel-members-changed-hook): Ditto.
 +	(erc-put-text-property): Ditto.
 +	(erc-add-default-channel): Ditto.
 +
 +2004-03-17  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-process-sentinel): Cancel ping timer upon
 +	disconnect.
 +	(erc-cmd-PART): Use same regexp as `erc-cmd-QUIT' when no #channel
 +	is provided.
 +	(erc-nick-uniquifier, erc-manual-set-nick-on-bad-nick-p): `:group'
 +	was missing, added.
 +	(erc-part-reason-zippy, erc-part-reason-zippy): Removed FIXME
 +	comments.  I see no problem allowing typed in reasons.
 +
 +2004-03-16  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-stamp.el: (erc-insert-timestamp-left): Added support for
 +	`erc-timestamp-only-if-changed-flag' and added docstring.
 +	(erc-timestamp-only-if-changed-flag): Updated documentation.
 +
 +2004-03-13  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-network-name): No longer marked as obsolete.
 +	Why was this function made obsolete?  There is no other function
 +	that performs this task.  Some of us use these functions in our
 +	personal ERC configs.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-buffer-filter): Use `with-current-buffer'.
 +	(erc-process-input-line): Append newline to documentation.  Fixes a
 +	bug whereby the prompt would be put on the same line as the output.
 +	(erc-cmd-GQUIT): Only try and send QUIT if the process is alive.
 +
 +2004-03-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-log.el: Only add top-level hooks if `erc-enable-logging' is
 +	non-nil.
 +
 +2004-03-10  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nets.el: From Adrian Aichner (adrian /at/ xemacs /dot/ org)
 +	* erc-nets.el: XEmacs make-obsolete only takes two arguments.
 +
 +2004-03-10  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el (erc-determine-network): Use `erc-session-server' if
 +	`erc-announced-server' is nil to avoid error if server does not
 +	send 004 (RPL_MYINFO) message.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-server-alistm erc-settings): Use lowercase
 +	"freenode", as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Use lowercase "freenode",
 +	as in `erc-networks-alist'.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-dcc.el (pcomplete/erc-mode/DCC): Append "send" as a list.
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-nets.el (erc-networks-alist): Changed "Freenode" to
 +	"freenode".
 +
 +2004-03-10  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Improved the docstring.	Made
 +	message to user more accurate	depending on whether a single
 +	channel is being listed or not.
 +
 +2004-03-10  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-nets.el (erc-determine-network): Make matching logic simpler
 +	(suggested by Damian Elmes).
 +	(erc-current-network, erc-network-name): Add `make-obsolete' form.
 +	(erc-set-network-name): Indentation fix.
 +	(erc-ports-list): Add docstring.  Rework function body to use
 +	`nconc'.
 +
 +2004-03-09  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el, erc-notify.el: (require 'erc-nets): added
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-network-name): Function definition moved to
 +	erc-nets.el.  The functions `erc-determine-network' and
 +	`erc-network' in erc-nets.el do what this did before.  Deprecated.
 +	Use (erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nickserv.el: Changed copyright notice.  Now require
 +	erc-nets.  erc-nets.el now takes care of network-related functions
 +	and variables.
 +	(erc-nickserv-alist): Changed network symbols to match those in
 +	`erc-networks-alist' in erc-nets.el.
 +	(erc-nickserv-identify-autodetect): Use `erc-network'.
 +	(erc-nickserv-identify): Use `erc-network'.  Changed wording for
 +	interactive use, now shows current nick.
 +	(erc-networks): Removed.  Use `erc-networks-alist' as defined in
 +	erc-nets.el.
 +	(erc-current-network): Function definition moved to erc-nets.el.
 +	The functions `erc-determine-network' and `erc-network' in
 +	erc-nets.el do what this did before.  Deprecated.  Use
 +	(erc-network) instead.
 +
 +2004-03-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-nets.el: Added commentary, `erc-nets-version'.
 +	(erc-server-alist): Changed Brasnet to BRASnet.
 +	(erc-networks-alist): All networks (except EFnet and IRCnet) now
 +	have a MATCHER.  (erc-network): New variable.
 +	(erc-determine-network): New function. Determine the network the
 +	user is on.  Use the server parameter NETWORK, if provided, else
 +	parse the server name and search for a match (regexp and loop by
 +	wencem) in `erc-networks-alist'.  Return the name of the network
 +	or "Unknown" as a symbol.
 +	(erc-network): New function.  Returns value of `erc-network'.  Use
 +	this when the current buffer is not the server process buffer.
 +	(erc-current-network): Returns the value of `erc-network' as
 +	expected by users who used the function as it was defined in
 +	erc-nickserv.el.  Deprecated.
 +	(erc-network-name): Returns the value of `erc-network' as expected
 +	by users who used the function as it was defined in erc.el.
 +	Deprecated.
 +	(erc-set-network-name): New function.  Added to
 +	`erc-server-375-hook' and `erc-server-422-hook'.
 +	(erc-unset-network-name): New function.  Added to
 +	`erc-disconnected-hook'.
 +	(erc-server-select): Small documentation word change.
 +
 +2004-03-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS: disumu info updated
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc-list.el (erc-cmd-LIST): Take &rest rather than &optional
 +	arguments.
 +	(erc-chanlist): Construct correct LIST command from list of
 +	channels.
 +
 +2004-03-06  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line-buffer): Add 'help-echo property to
 +	header-line text.  This allows header lines longer than the width
 +	of the current window to be seen.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-directed-at-fool-p): Also check for
 +	"FOOL, "
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el (erc-match-message): Only use nick-or-keyword if
 +	we're matching our nick.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-match.el: The highlight type for the current nickname can
 +	now also be 'nick-or-keyword, to highlight the nick of the sender
 +	if that is available, but fall back to highlighting your nickname
 +	in the whole message otherwise.
 +	(erc-current-nick-highlight-type): Adapted docstring accordingly.
 +	(erc-match-message): Added new condition. Also added some comments
 +	to this monster of a function.
 +
 +2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-is-valid-nick-p): Don't check for length less or
 +	equal to 9.
 +
 +2004-03-06  Damien Elmes <erc@repose.cx>
 +
 +	* erc-nickserv.el (erc-current-network): the last change resulted
 +	in this function failing when a network identifies itself as
 +	anything other than var.netname.com, so for instance
 +	'vic.au.austnet.org' fails. This version is only a marginal
 +	improvement over the original, but if we want to be more flexible
 +	we'll probably have to do the iteration ourselves instead of using
 +	assoc.
 +
 +2004-03-05  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el: Added erc-server-001 which runs when the server sends
 +	its welcome message.  It sets the current-nick to reflect the
 +	server's settings. This fixes a bug where nicks that were too long
 +	and got truncated by ther server were still set to the old value.
 +	(nickname-in-use): If user wants to try again manually, let user
 +	know that the nick is taken.  If not, go through erc-default-nicks
 +	until none are left, and then try one last time with
 +	erc-nick-uniquifier.  If it's still a bad-nick, make the user
 +	change nick manually.  When applying uniquifier, use NICKLEN if
 +	it's in the server parameters, otherwise use what RFC 2812 says is
 +	the max nick length (9 chars).  Added custom variable
 +	erc-manual-set-nick-on-bad-nick-p, which is set to nil and
 +	erc-nick-change-attempt-count.  Reset erc-default-nicks and
 +	erc-nick-change-attempt-count when the nick has been changed
 +	successfully.  This fixes the bug where ERC would get caught in a
 +	neverending loop of trying to set the same nick if the nick was
 +	too long and the uniquified nick was not available.
 +
 +	* added erc-cmd-WHOAMI
 +
 +	* added custom variable erc-mode-line-away-status-format, use this
 +	instead of   the previous hard-coded setting
 +
 +	* erc-server-315|318|369-hook defvar lines removed - they're
 +	already defined in erc-server-hook-list
 +
 +2004-03-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* HACKING: Initial commit.  Some thoughts on coding standards.
 +
 +2004-03-03  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-track.el: added the variable erc-track-priority-faces-only
 +	which adds the option to ignore changes in a channel unless there
 +	are faces from the erc-track-faces-priority-list in the message
 +	options are nil, 'all, or a list of channel name strings
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el: Changed erc-is-channel-op
 +	and erc-is-channel-voice to erc-channel-user-op-p and
 +	erc-channel-user-voice-p to better match erc-channel-user
 +	structure (and emacs lisp usage)
 +
 +2004-03-01  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-ibuffer.el, erc-menu.el:
 +	erc-track-modified-channels-mode is now erc-track-mode
 +
 +2004-02-29  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-match.el: Added 'keyword option to
 +	erc-current-nick-highlight-type highlights all instances of
 +	current-nick in the message ('nickname option in cvs revisions 1.9
 +	- 1.11 had same effect)
 +
 +2004-02-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-button.el: Add Lisp: prefix for the EmacsWiki Elisp area.
 +	(erc-button-alist): Added Lisp: prefix.
 +	(erc-emacswiki-lisp-url): New variable.
 +	(erc-browse-emacswiki-lisp): New function.
 +
 +2004-02-27  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-get-arglist): Use `substitute-command-keys', rather
 +	than hard-coding C-h f for `describe-function'.
 +
 +2004-02-26  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): bind `inhibit-read-only'
 +	to t around call to `erase-buffer'.
 +
 +2004-02-23  Edward O'Connor <ted@oconnor.cx>
 +
 +	* erc-chess.el, erc-dcc.el, erc-ezbounce.el, erc-list.el,
 +	erc-macs.el, erc-ring.el, erc-stamp.el, erc.el: Normalized buffer
 +	local variable creation.
 +
 +2004-02-17  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-scroll-to-bottom, erc-add-scroll-to-bottom): Mention
 +	`erc-input-line-position' in docstring.
 +
 +2004-02-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-kick-hook): Typo fix.
 +
 +2004-02-13  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc.el: Added `erc-kick-hook', which is called when the local
 +	user is kicked from a channel.  Fixed a bug in `erc-cmd-OPS', such
 +	that the command now works.  Added `erc-remove-channel-users', in
 +	order to fix a number of significant bugs relating to channel
 +	parting.
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove last change. This caused a
 +	lot of trouble :(
 +
 +2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Also set 'field property, so C-j
 +	works on an empty prompt.
 +
 +2004-02-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-channel-topic): Ensure that `channel-topic'
 +	does not contain any bare format controls.
 +
 +2004-02-10  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc-stamp.el (erc-timestamp-intangible): New variable (user
 +	feature request)
 +	(erc-format-timestamp): Use erc-timestamp-intangible.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* erc-button.el: Fixed bug related to nickname buttonizing and text
 +	fields due to erc-stamp.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* CREDITS: Added mention of my change of ERC to use hash tables.
 +
 +2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
 +
 +	* AUTHORS: Added myself to the list.
 +
 +2004-02-05  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Jeremy Maitin-Shepard <jbms@attbi.com>:
 +	(erc-remove-channel-user): Use `delq' not `delete'.
 +	(erc-get-buffer): Pass PROC through to `erc-buffer-filter'.
 +	(erc-process-sentinel): Use `erc' rather than `erc-reconnect' for
 +	auto-reconnection.
 +
 +2004-02-02  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-buffer-list-with-nick): Apply `erc-downcase' NICK.
 +
 +2004-01-30  Alex Schroeder <alex@gnu.org>
 +
 +	* erc.el: (erc-get-buffer): Use erc-buffer-filter.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: (erc-get-channel-nickname-list): New function.
 +	(erc-get-server-nickname-list): New function.
 +	(erc-get-server-nickname-alist): New function.
 +	(erc-get-channel-nickname-alist): New function.
 +
 +2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list,
 +	erc-remove-entry-from-list): Use `erc-member-ignore-case' to
 +	compare entries.
 +	(erc-add-pal, erc-add-fool): Fix type bug. Use
 +	`erc-get-server-nickname-alist'.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: From jbms: Adds xemacs compatibility to hash table
 +	channel-members patch.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc.el: (erc-update-undo-list): Rewritten. Update
 +	buffer-undo-list in place.  Deal with XEmacsesque
 +	entries (extents) in the list.
 +	(erc-channel-users): Fix unescaped open-paren in left column in
 +	docstring.
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-ring.el: (erc-replace-current-command): Exclude the prompt
 +	from the deleted region and don't redisplay the prompt (because
 +	`erc-display-prompt' flushes `buffer-undo-list').
 +
 +2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
 +
 +	* erc-match.el: (erc-add-entry-to-list): Use `symbol-value' instead
 +	of `eval'.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-kill-buffer-function): maphash was missing an
 +	argument.
 +
 +2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* Makefile, erc-autoaway.el, erc-button.el, erc-ibuffer.el,
 +	erc-lang.el, erc-list.el, erc-match.el, erc-menu.el, erc-page.el,
 +	erc-pcomplete.el, erc-speedbar.el, erc.el: HUGE change by jbms.
 +	This makes channel-members a hash, erc-channel-users.
 +
 +	Modified files: Makefile erc-autoaway.el erc-button.el
 +	erc-ibuffer.el erc-lang.el erc-list.el erc-match.el erc-menu.el
 +	erc-page.el erc-pcomplete.el erc-speedbar.el erc.el
 +
 +	The changes are too numerous to document properly. Have fun with
 +	the breakage.
 +
 +2004-01-27  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: (erc-send-input-line): Add a space to empty lines so the
 +	server likes them.
 +
 +2004-01-25  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: erc-send-whitespace-lines: New variable.
 +	(erc-send-current-line): Use erc-send-whitespace-lines. Also,
 +	removed superflous test for empty line in the mapc, since the
 +	blank line test should find all. I do like to be able to send an
 +	empty line when i want to!
 +	(erc-send-current-line): Check for point being in input line
 +	before checking for blank lines.
 +
 +2004-01-21  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-display-line-1): Move `erc-update-undo-list' outside
 +	`save-restriction'.  Removing need for temporary variable.
 +	(erc-send-current-line): Fix bug introduced by last change, remove
 +	complement in blank line regexp.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-update-undo-list): Add logic to catch the case when
 +	`buffer-undo-list' is t, indentation cleanup.
 +	(erc-send-current-line):  Reverse logic for matching blank lines.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-input-line-position): New variable.  If non-nil,
 +	specifies the argument to `recenter' in `erc-scroll-to-bottom'.
 +	(erc-scroll-to-bottom): Use it.
 +
 +2004-01-20  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Johan Bockgård <bojohan+news@dd.chalmers.se>:
 +	(erc-update-undo-list): New function.  Update `buffer-undo-list'
 +	so that calling `undo' in an ERC buffer doesn't mess up the
 +	existing text.
 +	(erc-display-line-1): Use it.
 +
 +2004-01-19  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-beg-of-input-line): Use `forward-line' rather than
 +	`beginning-of-line'.  Docstring fix.
 +	(erc-end-of-input-line): Docstring fix.
 +
 +2004-01-13  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-display-prompt): Remove the undo list after
 +	displaying the prompt, so the user can't undo ERC changes, which
 +	breaks some stuff anyways. This way the user can still undo his
 +	editing, but not ours.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-scroll-to-bottom): Should recenter on the bottom
 +	line, not the second-to-last one.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: (erc-bol): Fix bug introduced in revision 1.601.
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el: From Brian Palmer <bpalmer@gmail.com>
 +	(erc-cmd-JOIN): Use `erc-member-ignore-case', rather than
 +	`member-ignore-case'.
 +
 +2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
 +
 +	* erc.el: There was an inconsistency where the values of op and
 +	voice in channel-names could be 'on or 'off after an update, t and
 +	nil before.  The intended version was to have t or nil, so i fixed
 +	it to do so.
 +	(channel-names): Updated docstring.
 +	(erc-update-current-channel-member): Clarified docstring, fixed so
 +	it sets t or nil on an update as well, not only on an add.
 +	(erc-cmd-OPS): Updated not to check for 'on (the only function that
 +	did this!)
 +
 +2004-01-12  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-part-reason-various-alist,
 +	erc-update-mode-line-buffer): Fix docstring
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-update-mode-line): Fix typo.
 +
 +2004-01-11  Lawrence Mitchell <wence@gmx.li>
 +
 +	* erc.el (erc-prompt-interactive-input): Removed.
 +	(erc-display-prompt): Removed `erc-prompt-interactive-input'
 +	option.  (erc-interactive-input-map): Removed.
 +
 +	Major docstring fixes.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-OPS): Added this function.
 +	(erc-cmd-IDLE): Switched from using erc-display-message-highlight
 +	to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-cmd-LIST): Switched from using
 +	erc-display-message-highlight to erc-make-notice.
 +
 +2004-01-07  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event): Added a sentence to the
 +	docstring.  Now returns the uninterned symbol that is added to the
 +	server hook.
 +	(erc-cmd-IDLE): Changed to use erc-once-with-server-event instead
 +	of erc-once-with-server-event-global.
 +
 +2004-01-06  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el (erc-chanlist-hide-modeline): New variable.
 +	(erc-chanlist): Now displays message as a notice.  Also hides the
 +	modeline if erc-chanlist-hide-modeline is non-nil.
 +
 +2004-01-05  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-server-PRIVMSG-or-NOTICE): Now nicks appear as
 +	<nick> in query buffers, instead of as *nick*.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): Changed to return
 +	the uninterned symbol that it creates.
 +	(erc-cmd-LIST): Changed to clean up hooks that don't run.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/IDLE): Added to support new
 +	/IDLE command.
 +
 +2004-01-03  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc.el (erc-once-with-server-event-global): New function.  Like
 +	erc-once-with-server-event, except it modifies the global value of
 +	the event hook.
 +	(erc-cmd-IDLE): New function.  Implements the new /IDLE command.
 +	Usage: /IDLE NICK (erc-seconds-to-string): New function.  Converts
 +	a number of seconds to an Engligh phrase.
 +
 +2004-01-02  Francis Litterio <franl@users.sourceforge.net>
 +
 +	* erc-list.el: Added variable erc-chanlist-mode-hook.
 +
 +See ChangeLog.03 for earlier changes.
 +
 +    Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
diff --cc ChangeLog.05
index e73045c,0000000..0d2ff8a
mode 100644,000000..100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@@ -1,1228 -1,0 +1,1243 @@@
 +2005-11-23  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-cmd-SAY): Strip leading space in input line.
 +
 +2005-10-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: Add stuff that needs to be done before the 5.1
 +	release.  Longer-term items can be added to the 5.2 section.
 +
 +	* Makefile (SITEFLAG): New variable that indicates what variant of
 +	"--site-flag" to use.  XEmacs needs "-site-flag".
 +	(INSTALLINFO): New variable indicating how we should call
 +	install-info when installing documentation.
 +	(erc-auto.el, .elc.el): Use $(SITEFLAG).
 +
 +	* NEWS: Note that last release was 5.0.4.
 +
 +	* erc.texi: Initial and incomplete draft of ERC documentation.
 +	Commence collaborate-documentation-hack-mode :^) .
 +
 +2005-10-29  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-ring.el (erc-replace-current-command): Revert last change
 +	since it made the prompt disappear when using `erc-next-command'
 +	and `erc-previous-command'.
 +
 +2005-10-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-input-marker): New variable that indicates the
 +	position where text from the user begins, after the prompt.
 +	(erc-mode-map): Bind <HOME> to erc-bol, just like C-a.
 +	(erc): Initialize erc-input-marker.
 +	(erc-display-prompt): Even in case where no prompt is desired by
 +	the user, clear the undo buffer and set the input marker.
 +	(erc-bol, erc-user-input): Simplify by using erc-input-marker.
 +
 +	* erc-pcomplete.el (pcomplete-parse-erc-arguments): Use
 +	erc-insert-marker.
 +
 +	* erc-ring.el (erc-previous-command)
 +	(erc-replace-current-command): Use erc-insert-marker.
 +
 +	* erc-spelling.el (erc-spelling-init): Make sure that even Emacs21
 +	obeys erc-spelling-flyspell-verify.
 +	(erc-spelling-flyspell-verify): Use erc-input-marker.  This should
 +	make it considerably faster when switching to a buffer that has
 +	seen a lot of activity since last viewed.
 +
 +2005-10-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-server-version, 004): Re-added setting of
 +	`erc-server-version'.  It doesn't hurt to set, and it could be
 +	used in modules or users' settings.
 +
 +	* NEWS: Added descriptions of some new features.
 +
 +2005-10-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
 +	as default.
 +	(erc-beep-match-types): New variable.
 +	(erc-text-matched-hook): Doc fix.  Added `erc-beep-on-match' to
 +	customization options.
 +	(erc-beep-on-match): New function.  If the MATCH-TYPE is found in
 +	`erc-beep-match-types', beep.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	New functions to deal with the difference in the number of
 +	arguments accepted by `make-obsolete' and `make-obsolete-variable'
 +	in Emacs and XEmacs.
 +
 +	* erc.el, erc-nets.el: Use `erc-make-obsolete' and
 +	`erc-make-obsolete-variable'.
 +
 +	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
 +	Handle `wrong-number-of-arguments' error instead of checking for
 +	xemacs feature as future versions of XEmacs might accept three
 +	arguments.
 +
 +2005-10-18  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
 +	docstrings.
 +
 +2005-10-08  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
 +	Updated my email address.
 +
 +2005-10-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-send-input-line, erc-cmd-KICK, erc-cmd-PART)
 +	(erc-cmd-QUIT, erc-cmd-TOPIC, erc-kill-server, erc-kill-channel):
 +	Adapt to new TARGET parameter of erc-server-send.
 +
 +	* erc-backend.el (erc-server-connect): Don't specify encoding for
 +	erc-server-process, since we set this each time we send a line to
 +	the server.
 +	(erc-encode-string-for-target): Remove.
 +	(erc-server-send): Allow TARGET to be specified.  This was how it
 +	used to be before my more-backend work.  Set encoding of server
 +	process just before sending text to it.  Associate encoding with
 +	text if we are using the queue.
 +	(erc-server-send-queue): Pull encoding from queue.
 +	(erc-message, erc-send-ctcp-message, erc-send-ctcp-notice): Adapt
 +	to new TARGET parameter of erc-server-send.
 +
 +2005-10-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-toggle-debug-irc-protocol): Use erc-view-mode-enter
 +	rather than view-mode.
 +
 +	* erc-backend.el (erc-encode-string-for-target): If given a nil or
 +	empty string, return "".
 +	(erc-server-send-queue): XEmacs fix: Use erc-cancel-timer rather
 +	than cancel-timer.
 +
 +	* erc-compat.el (erc-view-mode-enter): New function that is
 +	aliased to the correct way of entering view-mode.
 +
 +	* erc-match.el (erc-log-matches-make-buffer): Use
 +	erc-view-mode-enter rather than view-mode-enter.
 +
 +2005-10-05  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-backend.el (erc-encode-string-for-target): If str is nil,
 +	pass the empty string to erc-encode-coding-string instead, which
 +	allows one to /part and /quit without providing a reason again.
 +
 +2005-10-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-message, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Encode string for target before sending.
 +
 +	* erc.el (erc-cmd-KICK, erc-cmd-PART, erc-cmd-QUIT, erc-cmd-TOPIC)
 +	(erc-kill-server, erc-kill-channel): Ditto.
 +
 +2005-09-05  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc-page.el (erc-ctcp-query-PAGE): (message text) -> (message
 +	"%s" text).
 +	(erc-cmd-PAGE): Simplify regexp. Put `do-not-parse-args' t.
 +
 +2005-09-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-flood-limit, erc-flood-limit2): Remove since they
 +	are no longer needed.
 +	(erc-send-input): Detect whether we want flood control to be
 +	active.  The previous behavior was to always force the message.
 +	(erc-toggle-flood-control): Adapt to new flood control method.  No
 +	more 'strict.
 +	(erc-cmd-SV): Use concat rather than
 +	format-time-string.
 +	(erc-format-target, erc-format-target-and/or-server): Shorten
 +	logic statements.
 +
 +	* erc-compat.el (erc-emacs-build-time): Use a string
 +	representation rather than trying to coerce a time out of a string
 +	on XEmacs.
 +
 +	* erc-identd.el (erc-identd-start): Use make-network-process
 +	instead of open-network-stream.  Error out if this is not defined.
 +
 +	* erc-backend.el (erc-send-line): New command that sends a line
 +	using flood control, using a callback for display.  It isn't used
 +	yet.
 +
 +2005-09-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias and make-obsolete-variable for
 +	erc-default-coding-system.
 +	(channel-topic, channel-modes, channel-user-limit, channel-key,
 +	invitation, away, channel-list, bad-nick): Rename globally to
 +	erc-{name-of-variable}.
 +
 +2005-09-03  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-message): Simplify regexp.
 +	(erc-cmd-DEOP, erc-cmd-OP): Simplify.
 +
 +2005-08-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Alias erc-send-command to erc-server-send.  ErBot needs
 +	this to work without modification.  Add defvaralias for
 +	erc-process.  Make this and the other backwards-compatibility
 +	functions and variables be marked obsolete as of ERC 5.1.
 +
 +	* erc-backend.el: Add autoload for erc-log macro.
 +	(erc-server-connect): Set some variables before defining process
 +	handlers.  It probably doesn't make any difference.
 +
 +2005-08-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Add defvaralias for erc-announced-server-name, since
 +	this seems to be widely used.
 +
 +2005-08-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc): Remove unnecessary boundp check.
 +
 +	* erc-autoaway.el: Fix compiler warning.
 +
 +	* erc-backend.el (erc-server-version): Since this isn't used by
 +	any code, and isn't generally useful, remove it.
 +	(erc-server-send-queue): Use erc-current-time rather than
 +	float-time.
 +	(004): Don't set erc-server-version.
 +
 +	* erc-dcc.el (erc-dcc-chat-request, erc-dcc-get-parent): Move to
 +	fix a compiler warning.
 +
 +	* erc-ibuffer.el (erc-server): Remove unnecessary boundp check.
 +
 +	* erc-identd.el (erc-identd-start): Use read-string instead of
 +	read-input.
 +
 +	* erc-imenu.el (erc-unfill-notice): Use a while loop instead of
 +	replace-regexp.
 +
 +	* erc-nicklist.el: Add conditional dependency on erc-bbdb.
 +	(erc-nicklist-insert-contents): Tighten some regexps.
 +
 +	* erc-notify.el (erc-notify-list): Docfix.
 +
 +	* erc-spelling.el (erc-spelling-dictionaries): Add :type and
 +	:group to silence a compiler warning.
 +
 +2005-08-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-session-server, erc-session-port)
 +	(erc-announced-server-name, erc-server-version)
 +	(erc-server-parameters): Moved here from erc.el.
 +	(erc-server-last-peers): Moved, renamed from last-peers.
 +	(erc-server-lag): Moved, renamed from erc-lag.
 +	(erc-server-duplicates): Moved, renamed from erc-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server): New customization group hosting all options from
 +	this file.
 +	(erc-server-prevent-duplicates): Moved, renamed from
 +	erc-prevent-duplicates.
 +	(erc-server-duplicate-timeout): Moved, renamed from
 +	erc-duplicate-timeout.
 +	(erc-server-auto-reconnect, erc-split-line-length)
 +	(erc-server-coding-system, erc-encoding-coding-alist)
 +	(erc-server-connect-function, erc-server-flood-margin)
 +	(erc-server-flood-penalty): Change group to 'erc-server.
 +	(erc-server-send-ping-interval): Moved, renamed from
 +	erc-ping-interval.
 +	(erc-server-ping-handler): Moved, renamed from erc-ping-handler.
 +	(erc-server-setup-periodical-server-ping): Moved, renamed from
 +	erc-setup-periodical-server-ping.
 +	(erc-server-connect): Add to docstring.  Move more initialization
 +	here.
 +	(erc-server-processing-p): Docfix.
 +	(erc-server-connect): Use 'raw-text like in the original version.
 +	(erc-server-filter-function): Don't reset process coding system.
 +
 +	* erc-stamp.el (erc-add-timestamp): If the text at point is
 +	invisible, don't insert a timestamp.  Thanks to Pascal
 +	J. Bourguignon for the suggestion.
 +
 +	* erc-match.el (erc-text-matched-hook): Don't hide fools by
 +	default, but include it in the available options.
 +
 +2005-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-*.el: s/erc-send-command/erc-server-send/g.
 +	s/erc-process/erc-server-process/g (sort of).  Occasional
 +	whitespace and indentation fixes.
 +
 +	* erc-backend.el: Specify a few local variables for indentation.
 +	Take one item off of the TODO list.
 +	(erc-server-filter-data): Renamed from erc-previous-read.  From
 +	circe.
 +	(erc-server-processing-p): New variable that indicates when we're
 +	currently processing a message.  From circe.
 +	(erc-split-line-length): New option that gives the maximum line
 +	length of a single message.  From circe.
 +	(erc-default-coding-system): Moved here from erc.el.
 +	(erc-split-line): Renamed from erc-split-command and taken from
 +	circe.
 +	(erc-connect-function, erc-connect, erc-process-sentinel-1)
 +	(erc-process-sentinel, erc-flood-exceeded-p, erc-send-command)
 +	(erc-message, erc-upcase-first-word, erc-send-ctcp-message)
 +	(erc-send-ctcp-notice): Moved here from erc.el.
 +	(erc-server-filter-function): Renamed from erc-process-filter.
 +	From circe.
 +	(erc-server-process): Renamed from `erc-process' and moved here
 +	from erc.el.
 +	(erc-server-coding-system): Renamed from
 +	`erc-default-coding-system'.
 +	(erc-encoding-coding-alist): Moved here from erc.el.
 +	(erc-server-flood-margin, erc-server-flood-penalty):
 +	(erc-server-flood-last-message, erc-server-flood-queue):
 +	(erc-server-flood-timer): New options from circe that allow
 +	tweaking of flood control.
 +	(erc-server-connect-function): Renamed from erc-connect-function.
 +	(erc-flood-exceeded-p): Removed.
 +	(erc-coding-system-for-target)
 +	(erc-encode-string-for-target, erc-decode-string-from-target):
 +	Moved here from erc.el
 +	(erc-server-send): Renamed from erc-send-command.  Adapted from
 +	the circe function by the same name.
 +	(erc-server-send-queue): New function from circe that implements
 +	handling of a flood queue.
 +	(erc-server-current-nick): Renamed from current-nick.
 +	(erc-server-quitting): Renamed from `quitting'.
 +	(erc-server-last-sent-time): Renamed from `last-sent-time'.
 +	(erc-server-last-ping-time): Renamed from `last-ping-time'.
 +	(erc-server-lines-sent): Renamed from `lines-sent'.
 +	(erc-server-auto-reconnect): Renamed from `erc-auto-reconnect'.
 +	(erc-server-coding-system): Docfix.
 +	(erc-server-connect): Renamed from `erc-connect'.  Require SERVER
 +	and PORT parameters.  Initialize several variables here.  Don't
 +	set `erc-insert-marker'.  Use a per-server coding system via
 +	erc-server-default-encoding.
 +
 +	* erc.el (erc-version-string): Changed to indicate we are running
 +	the `more-backend' branch.
 +	(erc-send-single-line): Implement flood control using
 +	erc-split-line.
 +	(erc-send-input): Move functionality of erc-send-single-line in
 +	here.
 +	(erc-send-single-line): Assimilated!
 +	(erc-display-command, erc-display-msg): Handle display hooks.
 +	(erc-auto-reconnect, current-nick, last-sent-time)
 +	(last-ping-time, last-ctcp-time, erc-lines-sent, erc-bytes-sent)
 +	(quitting): Moved to erc-backend.el.
 +	(erc): Docfix.  Don't initialize quite so many things here.
 +
 +2005-08-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/copyright (Copyright): Remove notices for 4 people, since
 +	they didn't contribute legally-significant changes, or have had
 +	these changes overwritten.
 +
 +	* erc-log.el: Remove copyright notice.
 +
 +	* erc.el: Remove 3 copyright notices.
 +
 +2005-08-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-3 package.  This doesn't serve
 +	any purpose other than to thank Romain Francoise for some advice.
 +
 +	* Makefile (debrelease): Allow last upload and extra build options
 +	to be specified.
 +
 +2005-08-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Create 5.0.4-2 package.
 +
 +	* debian/control (Uploaders): Add Romain Francoise.
 +	(Standards-Version): Update to 3.6.2.
 +	(Depends): Add `emacsen'.
 +
 +	* debian/scripts/startup.erc (load-path): Minor whitespace fixup.
 +
 +	* Makefile (clean): Split target from realclean and make it remove
 +	files that aren't packaged in releases.
 +	(clean, release): Minor cleanups.
 +	(debrelease): Use debuild rather than dpkg-buildpackage since the
 +	former calls lintian.  Minor cleanups.
 +	(debrelease-mwolson): New target that removes old Debian packages,
 +	calls debrelease, and copies the resulting package to my dist dir.
 +	(upload): New target that automates the process of uploading an
 +	ERC release to sourceforge.
 +
 +	* erc.el (erc-mode): Use `make-local-variable' instead of
 +	`make-variable-buffer-local'.
 +
 +2005-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Build 5.0.4-1.
 +
 +	* Makefile (release): Prepare zip file in addition to tarball.
 +
 +	* NEWS: Add item for the undo fix.
 +
 +2005-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Check
 +	erc-announced-name before erc-session-server.  Make sure that we
 +	can never get a stringp (nil) error.
 +	(erc-nicklist-call-erc-command): If given no command, do nothing.
 +	This fixes an error that used to occur when a stray mouse click
 +	was made outside of the popup window, but on the erc-nicklist
 +	menu.
 +
 +	* erc-bbdb.el (erc-bbdb-search-name-and-create): Get rid of the
 +	infinite input loop when you want to create a new record.  Replace
 +	most of that with a completing read of existing nicks.  If no nick
 +	is chosen, create a new John Doe record.  The net effect of this
 +	is that the old behavior is re-instated, with the addition of one
 +	completing read that happens when you do a /whois.
 +
 +2005-07-09  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-process-input-line): Docfix.
 +	(erc-update-mode-line-buffer): Use `erc-propertize' instead of
 +	`propertize'.
 +	(erc-propertize): Move to erc-compat.el.
 +
 +	* erc-compat.el (erc-propertize): Move here from erc.el. Always
 +	return a copy of the string (like `propertize' in GNU Emacs).
 +
 +	* erc-nicklist.el (erc-nicklist-icons-directory)
 +	(erc-nicklist-voiced-position)
 +	(erc-nicklist-insert-medium-name-or-icon): Docfix.
 +	(erc-nicklist-insert-contents): Simplify.
 +	(erc-nicklist-mode-map): Bind RET instead of `return'. Bind
 +	`down-mouse-3' instead of `mouse-3'.
 +	(erc-nicklist-kbd-cmd-QUERY): Cleanup regexp.
 +	(erc-nicklist-channel-users-info): Docfix. Simplify.
 +
 +2005-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* images: New directory containing the images that are used by
 +	erc-nicklist.el.  These are from Gaim, and are thought to be
 +	available under the terms of the GPL.
 +
 +	* erc-bbdb.el: Add local variables section to preserve tabs, since
 +	that is the style used throughout this file.  Apply patch from
 +	Edgar Gonçalves as follows.
 +	(erc-bbdb-bitlbee-name-field): New variable that indicates the
 +	field name to use for annotating the "displayed name" of a bitlbee
 +	contact.
 +	(erc-bbdb-irc-highlight-field): Docfix.
 +	(erc-bbdb-search-name-and-create): Prompt the user for the name of
 +	a contact if none was found.  Merge the new entries into the
 +	specified contact.  If new arg SILENT is non-nil, do not prompt
 +	the user for a name or offer to merge the new entry.
 +	(erc-bbdb-insinuate-and-show-entry): New arg SILENT is accepted,
 +	which is passed on to erc-bbdb-search-name-and-create.
 +	(erc-bbdb-whois): Tell erc-bbdb-search-name-and-create to prompt
 +	for name if necessary.
 +	(erc-bbdb-JOIN, erb-bbdb-NICK): Forbid
 +	erc-bbdb-search-name-and-create from prompting for a name.
 +
 +	* erc-nicklist.el: Add local variables section to preserve tabs,
 +	since that is the style used throughout this file.  Apply patch
 +	from Edgar Gonçalves as follows.
 +	(erc-nicklist-use-icons): New option; if non-nil, display an icon
 +	instead of the name of the chat medium.
 +	(erc-nicklist-icons-directory): New option indicating the path to
 +	the PNG files that are used for chat icons.
 +	(erc-nicklist-use-icons): New option indicating whether to put
 +	voiced nicks on top, bottom, or not to differentiate them.  The
 +	default is to put them on the bottom.
 +	(erc-nicklist-bitlbee-connected-p): New variable that indicates
 +	whether or not we are currently using bitlbee.  An attempt will be
 +	made to auto-detect the proper value.  This is bound in the
 +	`erc-nicklist-insert-contents' function.
 +	(erc-nicklist-nicklist-images-alist): New variable that maps a
 +	host type to its icon.  This is set by `erc-nicklist'.
 +	(erc-nicklist-insert-medium-name-or-icon): New function that
 +	inserts an icon or string that identifies the current host type.
 +	(erc-nicklist-search-for-nick): New function that attempts to find
 +	a BBDB record that corresponds with this contact given its
 +	finger-host.  If found, return its bitlbee-nick field.
 +	(erc-nicklist-insert-contents): New function that inserts the
 +	contents of the nick list, including text properties and images.
 +	(erc-nicklist): Populate `erc-nicklist-images-alist'.  Move
 +	nicklist content generation code to
 +	`erc-nicklist-insert-contents'.
 +	(erc-nicklist-mode-map): Map C-j to erc-nicklist-kbd-menu and RET
 +	to erc-nicklist-kbd-cmd-QUERY.
 +	(erc-nicklist-call-erc-command): Make use of
 +	`switch-to-buffer-other-window'.
 +	(erc-nicklist-cmd-QUERY): New function that opens a query buffer
 +	for the given contact.
 +	(erc-nicklist-kbd-cmd-QUERY): Ditto; contains most of the code.
 +	(erc-nicklist-kbd-menu): New function that shows the nicklist
 +	action menu.
 +	(erc-nicklist-channel-users-info): Renamed from
 +	`erc-nicklist-channel-nicks'.  Implement sorting voiced users.
 +
 +2005-06-29  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Fix regexp for Azzurra.
 +
 +2005-06-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autojoin.el (erc-autojoin-add, erc-autojoin-remove): Use
 +	`erc-session-server' if `erc-announced-server-name' is nil.  This
 +	happens when servers don't send a 004 message.
 +
 +	* erc.el (erc-quit-server): Ditto.
 +
 +	* erc-ibuffer.el (erc-server, erc-server-name): Ditto.
 +
 +	* erc-notify.el (erc-notify-JOIN, erc-notify-NICK)
 +	(erc-notify-QUIT): Ditto.
 +
 +2005-06-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-default-coding-system)
 +	(erc-handle-user-status-change): Docstring fix.
 +	(with-erc-channel-buffer): Removed.
 +	(erc-ignored-reply-p): Replace `with-erc-channel-buffer' with
 +	`erc-with-buffer'.
 +	(erc-display-line-1): Revision 1.730 broke undo. Fix it.
 +
 +2005-06-23  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add entries for Luigi Panzeri and Andreas Schwab.
 +
 +	* erc-nickserv.el (erc-nickserv-alist): Add entries for Azzurra
 +	and OFTC.  Thanks to Luigi Panzeri and Andreas Schwab for
 +	providing these.
 +
 +2005-06-16  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add John Paul Wallington.
 +
 +	* erc.el: Thanks to John Paul Wallington for the following.
 +	(erc-nickname-in-use): Use `string-to-number' instead of
 +	`string-to-int'.
 +
 +	* erc-dcc.el (erc-dcc-handle-ctcp-send)
 +	(erc-dcc-handle-ctcp-chat, erc-dcc-get-file)
 +	(erc-dcc-chat-accept): Ditto.
 +
 +	* erc-identd.el (erc-identd-start): Ditto.
 +
 +2005-06-16  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-mode-map): Suppress `font-lock-fontify-block' key
 +	binding since it destroys face properties.
 +
 +2005-06-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-UNIGNORE): Use `erc-member-ignore-case' instead
 +	of `member-ignore-case'.  Thanks to bpalmer for the heads up.
 +
 +2005-06-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Fix a mistake I made when editing this a
 +	few days ago.  Modes should now be disabled properly.
 +	(erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Remove unnecessary call to
 +	`format'.  Thanks to Andreas Schwab for reporting this.
 +
 +	* debian/changelog: Close "README file missing" bug.
 +
 +	* debian/rules (binary-erc): Install README file.
 +
 +2005-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-with-buffer): Set `lisp-indent-function' so Emacs
 +	Lisp mode knows how to indent erc-with-buffer blocks.
 +	(with-erc-channel-buffer): Ditto.
 +	(erc-with-all-buffers-of-server): Ditto.
 +	(erc-modules): Use pcomplete by default, not completion, since
 +	erc-complete.el is deprecated.  Use `fboundp' instead of
 +	`symbol-value' to check for existence of a function before calling
 +	it.  This was causing an error when untoggling the `completion'
 +	option and trying to save via the customize interface.
 +
 +	* erc-track.el (erc-modified-channels-update): If a buffer is not
 +	currently connected, remove it from the modified channels list.
 +	This should fix the problem where residue was left on the mode
 +	line after quitting ERC.
 +
 +	* erc-list.el (erc-prettify-channel-list): Docfix; thanks to John
 +	Paul Wallington for reporting this.
 +
 +2005-05-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: First draft of entries for the 5.0.3 release.
 +
 +	* debian/README.Debian: Note that ERC will now install correctly
 +	on versions of Emacs or XEmacs that do not have the `format-spec'
 +	library.  Correct some grammar and prune the content a bit.
 +
 +	* debian/scripts/install (emacs20): Remove line since we no longer
 +	need to deal with format-spec.el.
 +
 +	* NEWS: Add entries for the upcoming 5.0.3 release.
 +
 +	* erc.el: Don't require format-spec since this is provided in
 +	erc-compat.el now.
 +	(erc-process-sentinel, erc-setup-periodical-server-ping): Use
 +	`erc-cancel-timer' instead of `cancel-timer'.
 +	(erc-version-string): Update to 5.0.3.
 +
 +	* erc-autoaway.el (autoaway, erc-autoaway-reestablish-idletimer):
 +	Use `erc-cancel-timer' instead of `cancel-timer'.
 +
 +	* erc-compat.el (format-spec, format-spec-make): If we cannot load
 +	the `format-spec' library, provide versions of these functions.
 +	This should keep problems from surfacing with Emacs21 Debian
 +	builds.
 +	(erc-cancel-timer): New function created to take the place of
 +	`cancel-timer' since XEmacs calls it something else.
 +
 +	* erc-track.el (erc-modified-channels-update): Accept any number
 +	of arguments, which are ignored.  This allows it to be run from
 +	`erc-disconnected-hook' without extra bother.
 +	(track): Add `erc-modified-channels-update' to
 +	`erc-disconnected-hook' so that the indicators are removed
 +	correctly in some edge cases.
 +	(erc-modified-channels-display): Make sure that we never pass nil
 +	to the function in `erc-track-shorten-function'.  This happens
 +	when we have deleted buffers in `erc-modified-channels-alist'.
 +	Also, make sure that the buffer has a non-nil short-name before
 +	adding it to the string list.  This should fix some XEmacs
 +	warnings when running /quit with unchecked buffers, as well as get
 +	rid of a stray buffer problem (or so it is hoped).
 +
 +2005-05-31  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-replace.el, erc-speak.el: Clean up comment formatting.
 +
 +	* erc-ring.el (ring, erc-input-ring-index, erc-clear-input-ring):
 +	Clean up docstring formatting.
 +
 +2005-05-30  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Delete superfluous
 +	arg to `format'.
 +	(erc-load-irc-script): Use `insert-file-contents' instead of
 +	`insert-file'. Simplify.
 +
 +2005-05-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Move this up so that it is
 +	evaluated before the `require' statements.  Not a major change.
 +
 +2005-04-27  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-complete-word): Simplify.
 +
 +2005-04-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Use a slightly different approach when
 +	removing CVS and Arch cruft.
 +
 +	* debian/changelog: Update for 5.0.2-1 package.
 +
 +2005-04-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move code
 +	block higher in file to fix a load failure when using Emacs21.
 +	Thanks to Daniel Brockman for the report and fix.
 +
 +2005-04-24  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-backend.el (JOIN): save-excursion so that
 +	`erc-current-logfile' inserts into the correct channel buffers
 +	when using erc-log-insert-log-on-open in combination with autojoin
 +	to multiple channels.
 +
 +2005-04-17  Adrian Aichner  <adrian@xemacs.org>
 +
 +	* erc-log.el: Remove stray whitespace.
 +	* erc.el: Ditto.
 +
 +2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
 +
 +	* erc.el: autoload erc-select-read-args, which, because it parses
 +	erc-select's args, can be called before erc.el is loaded. 
 +
 +2005-04-07  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Remove final newlines from previously-existing ERC
 +	buffers. (Minor bug fix.)
 +
 +2005-04-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Ignore errors from deleting Arch and CVS
 +	metadata.
 +
 +2005-04-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, CREDITS, AUTHORS: Correct name and email address of
 +	Marcelo Toledo.
 +
 +2005-04-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Add entry for spelling module.
 +
 +	* erc-spelling.el: Add autoload line.
 +
 +	* erc-backend.el: Apply latest non-ascii patch from Kai Fan.
 +	(erc-decode-parsed-server-response): Search
 +	erc-response.command-args for channel name.  Decode the
 +	erc-response struct using this channel name as key according to
 +	the `erc-encoding-coding-alist'.
 +
 +	* erc-track.el: Apply patch from Henrik Enberg.
 +	(erc-modified-channels-object): Use optimal amount of whitespace
 +	around modified channels indicator.
 +
 +2005-04-02  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (define-erc-module, erc-with-buffer)
 +	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
 +	edebug-form-spec.
 +
 +	* erc-compat (erc-define-minor-mode): Ditto.
 +
 +2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
 +
 +	* erc-spelling.el: New file.
 +
 +2005-03-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (define-erc-response-handler): Add
 +	`definition-name' property to constructed symbols so that
 +	find-function and find-variable will find them.
 +
 +2005-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el, erc-goodies.el, erc-list.el, erc-notify.el,
 +	erc-ring.el, erc.el: Copyright assignment occurred.
 +
 +	* debian/scripts/install: Make a shell wrapper around the original
 +	Makefile and inline the Makefile.  The problem is that Debian
 +	passes all the Emacs variants at once, rotating them at every
 +	invocation of the install script, which happens once per variant.
 +	This caused each installation to happen N-1 times more often than
 +	it should have.  As a result, we need to only deal with the first
 +	argument.
 +	(ELFILES): Only add format-spec.el if we are compiling for
 +	emacs21.  Don't filter out erc-compat.el.
 +	(SITEFLAG): New variable that indicates that the "nosite" option
 +	should look like.
 +	(.DEFAULT): Use $(FLAVOUR) instead of $@ for clarity.
 +
 +	* debian/rules: Install NEWS file and compress it.
 +
 +	* debian/maint/postinst: Be more cautious about configuration
 +	step.
 +
 +	* debian/copyright (Copyright): Another assignment came in.
 +
 +	* debian/control (Standards-Version): Update to a newer version as
 +	recommended by lintian.
 +
 +	* debian/changelog: Changes made for the Debian package.
 +
 +	* debian/README.Debian: Keep only the General Notes section.
 +
 +	* NEWS: Move old history items here from debian/README.Debian.
 +
 +	* Makefile (SNAPSHOTDATE): Deprecate this option since we hope to
 +	release more often.
 +
 +2005-03-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-define-catalog, `ctcp-request-to'): Fix typo (%: ->
 +	%t:).
 +
 +2005-03-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Replace tabs with spaces
 +	in code indentation.
 +
 +2005-02-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply corrected patch from Henrik
 +	Enberg.
 +
 +2005-02-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-display-message): Apply patch from Henrik Enberg.
 +	Check here to see if a message should be hidden, rather than
 +	relying on code in each individual command.
 +	(erc-version-string): Add "(CVS)" to the version string for
 +	clarity.
 +
 +	* erc-backend.el (JOIN, KICK, MODE, NICK, PART, QUIT, TOPIC):
 +	Don't check `erc-hide-list' here.
 +
 +	* erc-list.el, erc-match.el, erc.el, debian/copyright: Update
 +	copyright information as a few more people have assignments
 +	registered.
 +
 +2005-02-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el: Apply patch from Kai Fan for non-ASCII character
 +	support.
 +	(erc-parse-server-response): Add call to
 +	`erc-decode-parsed-server-response'.
 +	(erc-decode-parsed-server-response): New function that decodes a
 +	pre-parsed server response before it can be handled.
 +	(PRIVMSG): Comment out call to `erc-decode-string-from-target'.
 +	(TOPIC): Ditto.
 +
 +2005-02-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
 +
 +	* erc.el (erc-process-sentinel-1): Don't reconnect on connection
 +	refused. This error is reported differently when using
 +	open-network-stream-nowait.
 +
 +2005-01-26  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-APPENDTOPIC, erc-set-topic): The control
 +	character in `channel-topic' was changed to \C-o - replaced \C-c
 +	with \C-o so that these functions work as expected again.
 +	(erc-get-channel-mode-from-keypress): Doc fix.
 +
 +2005-01-25  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-button.el, erc-compat.el, erc-goodies.el,
 +	erc-match.el, erc-nets.el, ChangeLog, NEWS: Merged bug fixes made
 +	on release_5_0_branch since 5.0.1 release.
 +
 +2005-01-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc.el (erc-input-action): Quote `erc-action-history-list' so
 +	that input history actually works.
 +	(erc-process-ctcp-query): Fix and simplify logic.
 +	(erc-get-channel-mode-from-keypress): Use `C-' string syntax.
 +	(erc-load-irc-script-lines): Use `erc-command-indicator' instead
 +	of `erc-prompt'.
 +
 +2005-01-23  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc-viper.el: Ensure that `viper-comint-mode-hook' runs in
 +	buffers whose `erc-mode-hook' has already run when this file is
 +	loaded.
 +	Explicitly `require' erc.el.
 +
 +2005-01-22  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Remove frobbing of `require-final-newline'.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Remove frobbing of
 +	`require-final-newline'.
 +
 +	* erc-viper.el: New file. This is where all ERC/Viper
 +	compatiibilty code should live. When and if ERC is bundled with
 +	Emacs, some of the hacks in this file should be merged into Viper
 +	itself.
 +
 +2005-01-21  Edward O'Connor  <ted@oconnor.cx>
 +	
 +	* erc.el (erc-mode): Set `require-final-newline' to nil in ERC
 +	buffers. This prevents a Viper misfeature whereby extraneous
 +	newlines are inserted into the ERC buffer when switching between
 +	viper states.
 +
 +	* erc-log.el (erc-save-buffer-in-logs): Bind `require-final-newline'
 +	to t when calling `write-region' to ensure that further log
 +	entries start on fresh lines.
 +	
 +2005-01-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-face): Reverted my change to the
 +	order faces since it had the unwanted effect of putting the button
 +	face after all others.
 +	(erc-button-face-has-priority): Removed this variable as it is not
 +	necessary anymore - it was used to compensate for the above
 +	mentioned change.
 +
 +	* NEWS: Added the latest fixes.
 +
 +2005-01-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el, erc-match.el:
 +	(erc-button-syntax-table, erc-match-syntax-table): Added \ as a
 +	legal character for nicknames.
 +
 +	* erc-nets.el (erc-server-select): Fixed so that only networks
 +	with servers found in `erc-server-alist' are available as choices.
 +
 +	* erc.el, erc-compat.el, erc-goodies.el:
 +	(erc-replace-match-subexpression-in-string): New function.  Needed
 +	because `replace-match' in XEmacs doesn't replace regular
 +	expression subexpressions in strings, only in buffers.
 +	(erc-seconds-to-string, erc-controls-interpret): Use the new
 +	function.
 +
 +	* erc-button.el (erc-button-add-button): Use the `:button-face'
 +	key combined with an `erc-mode' local `widget-button-face' set to
 +	nil to get the widget overlay face suppressed in XEmacs.
 +
 +2005-01-19  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-face): The face added by this
 +	function is more important than the existing text's face, so we
 +	now prepend erc-button-face to the list of existing faces when
 +	adding a button.  To instead append erc-button-face to existing
 +	faces, set variable `erc-button-face-has-priority' to nil.
 +	(erc-button-face-has-priority): New variable to control how
 +	erc-button-add-face adds erc-button-face to existing faces.
 +	(erc-button-press-button): Silenced a byte-compiler warning about
 +	too few arguments in a call to `error'.
 +
 +2005-01-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* NEWS: Added list of 5.0.1 fixes.
 +
 +2005-01-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Move to format that cscvs can understand.  As an added
 +	perk, entries line up nicer.
 +
 +	* erc.el, erc-fill.el, erc-pcomplete.el, debian/copyright: Merge a
 +	few more copyright lines thanks to Alex Schroeder's BBDB file.
 +
 +	* Makefile: Change version to correspond with our new scheme.
 +
 +2005-01-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el (erc-chanlist-channel-line-regexp): Now matches
 +	private channels, the channels `#' and `&', and channels with
 +	names including non-ascii characters.
 +	(erc-chanlist-join-channel): Don't attempt to join private
 +	channels since the channel name is unknown.
 +
 +	* erc-goodies.el (erc-make-read-only): Add `rear-nonsticky'
 +	property to avoid `Text is read-only' errors during connection.
 +	`front-nonsticky' does not exist, changed to `front-sticky'.
 +	(erc-controls-interpret, erc-controls-strip): Just work on the
 +	string, don't open a temporary buffer.
 +	(erc-controls-propertize): Now accepts optional argument STR.
 +
 +2005-01-17  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile: Version is 5.01, but only in the Makefile.  It has not
 +	been released yet.
 +
 +	* erc-auto.in, erc-autojoin.el, erc-bbdb.el, erc-button.el,
 +	erc-chess.el, erc-complete.el, erc-dcc.el, erc-fill.el,
 +	erc-goodies.el, erc-ibuffer.el, erc-identd.el, erc-imenu.el,
 +	erc-list.el, erc-match.el, erc-menu.el, erc-nets.el,
 +	erc-netsplit.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el,
 +	erc-ring.el, erc-speak.el, erc-speedbar.el, erc-stamp.el,
 +	erc-track.el, erc-xdcc.el, erc.el, debian/copyright: Update
 +	copyright notices.  If anyone has signed papers for Emacs in
 +	general, merge them with the FSF's entry.
 +
 +2005-01-16  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc): `erc-set-active-buffer' was being called before
 +	`erc-process' was set, so that channels weren't being marked
 +	active correctly upon join; fixed.
 +
 +2005-01-15  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
 +
 +	* erc-backend.el (def-edebug-spec): This macro caused problems (in
 +	XEmacs). Use its expansion directly.
 +
 +2005-01-15  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-add-button): Reverted previous change
 +	since `:suppress-face' doesn't seem to be checked for a certain
 +	face.
 +	(erc-button-add-face): FACE is now appended to the `old' face.
 +	This should fix the problem of faces being "covered" by
 +	`erc-button-face'.
 +
 +2005-01-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el (erc-cmd-OPS, erc-cmd-COUNTRY,
 +	erc-cmd-NICK, erc-process-ctcp-query, ERROR, PONG, 311, 312, 313,
 +	314, 317, 319, 320, 321, 322, 330, 352): Use catalog entries
 +	instead of hard-coded text messages.
 +	(english): Added new catalog entries `country', `country-unknown',
 +	`ctcp-empty', `ctcp-request-to', `ctcp-too-many', `nick-too-long',
 +	`ops', `ops-none', `ERROR', `PONG', `s311', `s312', `s313',
 +	`s314', `s317', `s317-on-since', `s319', `s320', `s321', `s322',
 +	`s330', and `s352'.
 +	(erc-send-current-line): Use `erc-set-active-buffer' (change was
 +	lost in previous bug fix).
 +
 +2005-01-14  Francis Litterio  <franl@world.std.com>
 +
 +	* erc-button.el (erc-button-add-button): Fixed a bug where the
 +	overlay created by widget-convert-button has a `face' property
 +	that hides the `face' property set on the underlying button text.
 +
 +	* erc-goodies.el: Docstring fix.
 +
 +	* erc-button.el: Improved docstring for variable erc-button-face.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el (erc-menu-definition): "Topic set by channel
 +	operator": Small word change.  "Identify to NickServ...": Check
 +	that we're connected to the server.  Added "Save buffer in log"
 +	and "Truncate buffer".
 +
 +2005-01-13  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* erc.el (erc-display-line-1): Widen before we try to insert
 +	anything, this makes sure input isn't broken when the buffer is
 +	narrowed by the user.
 +	(erc-beg-of-input-line): Simplify, just return the position of
 +	`erc-insert-marker' or error if does not exist.
 +	(erc-send-current-line): Widen before trying to send anything.
 +
 +2005-01-13  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el, erc-backend.el, erc-list.el:
 +	(erc-update-mode-line-buffer): Strip controls characters from
 +	`channel-topic' since we add our own control character to it.
 +	(TOPIC, 332): Use \C-o instead of \C-c to force an end of IRC
 +	control characters as it also ends bold, underline, and inverse -
 +	\C-c only ends colors.
 +	(erc-chanlist-322): Strip control characters from channel and
 +	topic.  No need to interpret controls when we're applying overlays
 +	to the lines.
 +
 +	* erc.el, erc-backend.el, erc-button.el, erc-netsplit.el,
 +	erc-nicklist.el: Fixed so that each server has an active buffer.
 +	(erc-active-buffer): Now a buffer-local variable.
 +	(erc-active-buffer, erc-set-active-buffer): New functions.
 +	(erc-display-line, erc-echo-notice-in-active-non-server-buffer,
 +	erc-process-away, MODE): Call `erc-active-buffer' to get the
 +	active buffer for the current server.
 +	(erc, erc-process-sentinel-1, erc-grab-region, erc-input-action,
 +	erc-send-current-line, erc-invite-only-mode,
 +	erc-toggle-channel-mode, erc-channel-names, MODE, erc-nick-popup,
 +	erc-nicklist-call-erc-command): Use `erc-set-active-buffer' to set
 +	the active buffer for the current server.
 +	(erc-cmd-WHOLEFT): Use 'active as BUFFER in `erc-display-message'.
 +
 +	* erc-track.el (erc-track-modified-channels): Server buffers are
 +	now treated the same as channels and queries.  This means that
 +	`erc-track-priority-faces-only', `erc-track-exclude', and
 +	`erc-track-exclude-types' now work with server buffers.
 +
 +2005-01-12  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (475): Prompt for the channel's key if
 +	`erc-prompt-for-channel-key' is non-nil.  Send a new JOIN message
 +	with the key if a key is provided.
 +
 +	* erc.el (erc-command-indicator): Fixed customization choices so
 +	that there's no `mismatch' message when nil is the value.
 +
 +2005-01-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-bbdb.el (bbdb): Lowercase the name of the module.  This
 +	fixes a bug which caused an error to occur when trying to enable
 +	the module using the customization interface.
 +
 +2005-01-08  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-track.el: Support using faces to indicate channel activity
 +	in the modeline under XEmacs.
 +	(erc-modified-channels-object): New function.
 +	(erc-modified-channels-display): Use it.
 +	`erc-modified-channels-string' renamed to
 +	`erc-modified-channels-object' (because it's no longer a string on
 +	XEmacs). The new function `erc-modified-channels-object' is used
 +	to generate updated values for the same-named variable.
 +
 +2005-01-08  Diane Murray <disumu@x3y2z1.net>
 +
 +	* ChangeLog.2002: Changed instances of my sourceforge username and
 +	email address to real name and email.
 +
 +	* erc.el (erc-modules): Changed customization tag descriptions, so
 +	that they all start with a verb; added new modules to choices.
 +
 +2005-01-08  Mario Lang  <mlang@delysid.org>
 +
 +	* debian/rules: Introduce new variable DOCDIR to simplify stuff a
 +	bit.
 +
 +2005-01-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS, ChangeLog.2004: Change bpalmer's email address as
 +	requested.
 +
 +	* CREDITS: Add everyone who is mentioned in the ChangeLogs.
 +
 +	* debian/copyright (Copyright): Add last few people.  This can now
 +	be considered a complete list, as far as CVS entries are
 +	concerned.  If people have assigned copyright to the FSF, merge
 +	them with the entry for the FSF.
 +
 +	* debian/README.Debian: Add entry for XEmacs-related change in
 +	`erc-track.el'.
 +
 +	* erc.el (erc-cmd-MODE): New command that changes or displays the
 +	mode for a channel or user.  The functionality was present before
 +	this change, but there was no documentation for it.
 +
 +	* erc-auto.in, erc-*.el: Fully investigate copyright headers and
 +	change them appropriately.  If a file has been pulled off of
 +	erc.el at one time, keep track of copyright from the time of
 +	separation, but not before.  If a file has been derived from a
 +	work outside of erc, keep copyright statements in place.
 +
 +	* Makefile (VERSION): Change to 5.0! :^) Congrats on all the great
 +	work.  I'll wait until hober commits his XEmacs compatibility
 +	patch to erc-track.el, and then release.
 +	(distclean): Alias for `realclean' target.
 +
 +2005-01-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* AUTHORS: Add Marcelo Toledo, who has CVS access to this project.
 +
 +	* ChangeLog.2004: Add my name to my one contribution to erc last
 +	year.
 +
 +	* CREDITS: Add people that were discovered while scouring
 +	ChangeLogs.
 +
 +	* debian/copyright: Add everyone from `AUTHORS' to Upstream
 +	Authors.  Anyone who has contributed 15 or more lines of
 +	code (according to ChangeLogs) is listed in Copyright section.
 +	Accurate years are included.
 +
 +	* debian/README.Debian: Paste content of NEWS and reformat
 +	slightly.
 +
 +	* debian/rules: Concatenate the ChangeLogs during the Debian
 +	install process and then gzip them.
 +
 +	* Makefile (MISC): Add ChangeLog.yyyy files to list.
 +	(ChangeLog): Remove rule since we do not dynamically generate the
 +	ChangeLog anymore.
 +
 +	* MkChangeLog: Removed since we do not use it to generate the
 +	ChangeLog anymore.  cvs2cl does a much better job anyway.
 +
 +	* NEWS: Use 3rd level heading instead of bullets for lists that
 +	contain descriptions.
 +
 +2005-01-07  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Require 'sort.
 +	(erc-chanlist): Disable undo in the channel list buffer.
 +
 +	* erc.el, erc-menu.el: The `IRC' menu is now automatically added
 +	to the menu-bar.  Add the call to `easy-menu-add' to
 +	`erc-mode-hook' when running in XEmacs (without this the menu
 +	doesn't appear).
 +
 +	* NEWS: Added the information from
 +	http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer
 +	changes which weren't yet documented on that page.
 +
 +2005-01-06  Hoan Ton-That  <hoan@ton-that.org>
 +
 +	* erc-log.el (erc-current-logfile): Only downcase the logfile
 +	name, not the whole filename.  Also expand relative to
 +	`erc-log-channels-directory'.
 +	(erc-generate-log-file-name-with-date)
 +	(erc-generate-log-file-name-short)
 +	(erc-generate-log-file-name-long): Don't expand filename, done in
 +	`erc-current-logfile'.
 +
 +2005-01-06  Lawrence Mitchell  <wence@gmx.li>
 +
 +	* NEWS: New file, details user visible changes from version to
 +	version.
 +
 +	* HACKING (NEWS entries): Mention NEWS file, and what its purpose
 +	is.
 +
 +2005-01-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: New file containing the list of release-critical
 +	tasks.  Feel free to add to it.
 +
 +	* debian/rules (binary-erc): Add ChangeLog files.
 +
 +2005-01-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.2001, ChangeLog.2002, ChangeLog.2003, ChangeLog.2004:
 +	ChangeLog entries from previous years.
 +
 +	* ChangeLog: New file containing ChangeLog entries for the current
 +	year.  Please update this file manually whenever a change is
 +	committed.  This is a new policy.
 +
 +	* AUTHORS: Add myself to list.  Some entries were space-delimited
 +	instead of TAB-delimited, and since the latter seemed to be the
 +	default, make the other entries conform.
 +
 +	* HACKING (ChangeLog Entries): Update section to reflect new
 +	policy toward ChangeLog entries, which is that they should be
 +	manually updated whenever a change is committed.
 +
 +2005-01-04  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-connection-established, erc-login): Update the
 +	mode-line.
 +	(erc-update-mode-line-buffer): If `erc-current-nick' returns nil,
 +	use an empty string for ?n character in format spec.  Set
 +	`mode-line-process' to ":connecting" while the connection is being
 +	established.
 +
 +2005-01-04  Lawrence Mitchell <wence@gmx.li>
 +
 +	* AUTHORS: Update list of authors.
 +
 +2005-01-02  Diane Murray <disumu@x3y2z1.net>
 +
 +	* erc-goodies.el (erc-control-characters): New customization
 +	group.
 +	(erc-interpret-controls-p): Small fix, addition to
 +	documentation. Updated customization to allow 'remove as a value.
 +	Use 'erc-control-characters as `:group'.
 +	(erc-interpret-mirc-color): Use 'erc-control-characters as
 +	`:group'.
 +	(erc-beep-p): Updated documentation.  Use 'erc-control-characters
 +	as `:group'.
 +	(define-erc-module irccontrols): Add `erc-controls-highlight' to
 +	`erc-insert-modify-hook' and `erc-send-modify-hook' since it
 +	changes the text's appearance.
 +	(erc-controls-remove-regexp, erc-controls-interpret-regexp): New
 +	variables.
 +	(erc-controls-highlight): Fixed so that highlighting works even if
 +	there is no following control character.  Fixed mirc color
 +	highlighting; now respecting `erc-interpret-mirc-color'.  Fixed a
 +	bug where emacs would get stuck in a loop when \C-g was in a
 +	message and `erc-beep-p' was set to nil (default setting).
 +
 +See ChangeLog.04 for earlier changes.
 +
 +    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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
 +;; End:
 +
 +;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
diff --cc ChangeLog.06
index cb949c9,0000000..f5fc5d0
mode 100644,000000..100644
--- a/ChangeLog.06
+++ b/ChangeLog.06
@@@ -1,1508 -1,0 +1,1523 @@@
 +2006-12-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-list.el: Change header to mention that this is part of ERC,
 +	rather than GNU Emacs.
 +
 +	* erc-networks.el (erc-server-alist): Add Ars OpenIRC and
 +	LinuxChix networks.  Thanks to Angelina Carlton for mentioning
 +	them.  Properly escape periods in Konfido.Net and Kewl.Org.
 +	(erc-networks-alist): Add entries for Ars and LinuxChix, though
 +	the latter does not actually provide an announced network name.
 +
 +	* erc-services.el (erc-nickserv-identify-mode): Add 'both method,
 +	which waits for a NickServ message if the network supports it,
 +	otherwise sends the password after connecting.
 +	(erc-nickserv-identify-mode): Default to 'both.
 +	(erc-nickserv-passwords): Add OFTC and Azzurra to custom options.
 +	(erc-nickserv-alist): Indentation fix.
 +	(erc-nickserv-identify-on-connect)
 +	(erc-nickserv-identify-on-nick-change): Handle 'both method.
 +
 +2006-12-28  Leo  <sdl.web@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-iswitchb): Wrap body in unwind-protect so that
 +	hitting C-g does not leave iswitchb-mode on.
 +
 +2006-12-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-RECONNECT): New command that calls
 +	erc-server-reconnect.
 +
 +	* erc-backend.el (erc-server-reconnect-count): New server variable
 +	that keeps track of reconnection attempts.
 +	(erc-server-reconnect-attempts): New option that determines the
 +	number of reconnection attempts that ERC will make per server.
 +	(erc-server-reconnect-timeout): New option that determines the
 +	amount of time, in seconds, that ERC will wait between successive
 +	reconnect attempts.
 +	(erc-server-reconnect): New function that reestablishes the
 +	current IRC connection.  Move some commands from
 +	erc-process-sentinel-1 here.
 +	(erc-process-sentinel-1): If we have been disconnected, loop until
 +	we either reconnect or run out of attempts.
 +	(erc-server-reconnect-p): Move higher and make this a defsubst,
 +	since I'm worried about the current buffer changing from
 +	underneath us.  Implement limit of number of reconnect attempts..
 +
 +	* erc.texi (Getting Started): Update for /RECONNECT command.
 +
 +2006-12-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-open): Restore old point correctly, or at least get
 +	closer to doing so than before.
 +
 +2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
 +	isn't active already, instead of leaving it on.
 +
 +2006-12-10  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc-ezbounce.el (erc-ezb-init-session-list): Doc fix.
 +
 +2006-12-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Juanma Barranquero.
 +
 +	* erc.el: Re-evaluate contributions from a contributor, and found
 +	them under 15 lines of non-obvious code, so it is safe to remove
 +	the copyright notice.
 +
 +2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
 +	(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook)
 +	(erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer)
 +	(erc-modules, erc-display-message-highlight, erc-process-input-line)
 +	(erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers)
 +	(erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers)
 +	(erc-echo-notice-in-first-user-buffer, erc-connection-established)
 +	(erc-update-user-nick, erc-update-channel-member, erc-highlight-notice)
 +	(erc-command-symbol, erc-add-query, erc-process-script-line)
 +	(erc-determine-parameters, erc-client-info, erc-popup-input-buffer):
 +	(erc-script-echo): Fix typos in docstrings.
 +	(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list)
 +	(define-erc-module, erc-once-with-server-event)
 +	(erc-once-with-server-event-global, erc-debug-irc-protocol)
 +	(erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user)
 +	(erc-update-current-channel-member, erc-load-script):
 +	(erc-mode-line-away-status-format): Doc fixes.
 +
 +2006-11-20  Andrea Russo  <rastandy@inventati.org>  (tiny change)
 +
 +	* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
 +	before calling `erc-display-prompt'.
 +
 +2006-11-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Display better error message when
 +	module not found.
 +
 +2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc.el (erc-after-connect, erc-open-ssl-stream)
 +	(erc-display-line-1, erc-display-line):
 +	* erc-backend.el (005): Fix space/tab mixup in docstrings.
 +
 +2006-11-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el: Save all log buffers when Emacs exits, in case
 +	someone ignores the warning about open processes.  Remove the
 +	advice code in the commentary.
 +	(erc-save-query-buffers): Docfix.
 +	(erc-log-save-all-buffers): New function that saves all ERC
 +	buffers to logs.
 +	(erc-current-logfile): Fix bug in filename selection, where the
 +	current buffer was erroneously being preferred over the given
 +	buffer.
 +
 +2006-11-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-string-to-port): Avoid error when a numerical port
 +	is passed.  Thanks to Zekeriya KOÇ for the report.
 +
 +2006-11-08  Łukasz Demianiuk  <ldemianiuk@gmail.com>  (tiny change)
 +
 +	* erc.el (erc-header-line): Fix typo.
 +
 +2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* erc-dcc.el (erc-dcc-send-file): Fix typo in error message.
 +
 +	* erc.el (read-passwd):
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer):
 +	* erc-truncate.el (truncate): Fix typo in docstring.
 +
 +2006-10-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
 +	first loading iswitchb.  Thanks to Leo for the report.
 +
 +2006-10-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-default-port): Make the default be 6667 instead of
 +	ircd. since Mac OS X apparently has problems with looking up that
 +	port name.
 +
 +	* erc-backend.el (353): Receive names after displaying the initial
 +	message, instead of before.
 +
 +2006-10-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-my-nick-face): New face.
 +	(erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
 +	fixes a bug where the :full-name argument passed to the function
 +	was not respected.
 +	(erc-format-my-nick): Use `erc-my-nick-face'.  This should help
 +	make it easier to find messages you sent in conversations when
 +	`erc-show-my-nick' is non-nil.
 +	(erc-compute-server): Doc fix.
 +
 +2006-10-01  John J Foerch  <jjfoerch@earthlink.net>  (tiny change)
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
 +	from the erc-timestamp field.
 +
 +2006-09-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
 +	parenthesis.  Thanks to Stephan Stahl for the report.
 +
 +2006-09-10  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
 +
 +	* erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
 +	instead of a single user.
 +
 +2006-09-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-generate-new-buffer-name): If this is a server
 +	buffer and a process exists already, create a new buffer.
 +	(erc-open): If the IRC session was continued, restore the old
 +	point.  Thanks to Stephan Stahl for the report.
 +	(erc-member-ignore-case): Coding style tweak.
 +	(erc-cmd-UNIGNORE): Quote the user before comparison.  If we don't
 +	find the user listed verbatim, try to match them against the list
 +	using string-match.  In this case, prompt as to whether the regexp
 +	should be removed.
 +	(erc-ignored-user-p): Remove CL-ism.
 +
 +	* erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see
 +	whether we are already away.
 +
 +	* erc-menu.el: Fix potential compiler warning.
 +
 +2006-09-07  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: Updated Commentary and URL.
 +	(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
 +	(erc-arrange-session-in-multiple-windows): No need to check if
 +	`erc-server-process' is bound.
 +	(erc-server-buffer-live-p): Doc fix.
 +	(erc-part-from-channel): Don't use any initial contents at prompt.
 +	(erc-format-nick, erc-format-@nick): Doc fix.  Use `when'.
 +	(s367): Fixed to support only banmask and channel which is the
 +	standard.  Also, there's no reason to add a message to each banned
 +	user entry trying to persuade the user to use /banlist instead of
 +	/mode #channel +b.  That part of the message was a little
 +	confusing, anyways.
 +	(s367-set-by): New catalog entry.  The user who set the ban and
 +	the time of ban seem to be specific to only certain servers such
 +	as freenode.
 +
 +	* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
 +
 +	* erc-backend.el (erc-server-process-alive): No need to check if
 +	`erc-server-process' is bound.
 +	(367): Use s367 or s367-set-by where appropriate.
 +
 +	* erc-compat.el: Fixed URL.
 +
 +	* erc-dcc.el: Updated copyright years.  Added Usage section.
 +	Changed supported Emacs version number from 21.3.50 to 22 in
 +	Commentary.
 +
 +	* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
 +	to check if `erc-server-process' is bound.
 +
 +	* erc-nicklist.el: Added to the Commentary section an explanation
 +	that `erc-nicklist-quit' should be called from within the nicklist
 +	buffer.  Set file coding to utf-8 so a contributor's name is
 +	displayed correctly.
 +	(erc-nicklist-icons-directory): Use customize type directory
 +	instead of string.
 +	(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
 +	if it wasn't found.  This fixes a bug where an error would occur
 +	when using `string=' on bbdb-nick if it was nil.
 +
 +	* erc-replace.el: Removed URL from file information since it
 +	doesn't exist.
 +
 +	* erc-sound.el: Updated copyright years.  Fixed Commentary and
 +	added Usage section.
 +	(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
 +	`erc-ctcp-query-SOUND-hook' here.  Removed the keybinding
 +	definitions.
 +	(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
 +	(erc-ctcp-query-SOUND): Doc fix.
 +	(erc-play-command): Removed, not necessary anymore.
 +	(erc-ctcp-query-SOUND-hook): Set to nil as default.  Moved up
 +	higher in code, added docstring.
 +	(erc-play-sound): Use `play-sound-file'.  It exists in GNU Emacs
 +	as well since version 21 or earlier.  Removed commented-out older
 +	version of function.
 +
 +	* NEWS: Fixed formatting, added channel tracking change.
 +
 +	* README: Fixed typo.  Added more information to Installation
 +	section.  Updated URL.
 +
 +2006-09-03  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el: M-x erc RET can now be used to start ERC.
 +	(erc-open): Renamed from `erc'.
 +	(erc-before-connect): Change erc-select to erc.
 +	(erc): Renamed from `erc-select'.  Use `erc-open'.
 +	(erc-select): Defined as alias of `erc'.
 +	(erc-ssl): Renamed from `erc-select-ssl'.  Use `erc'.
 +	(erc-select-ssl): Defined as alias of `erc-ssl'.
 +	(erc-cmd-SERVER): Use `erc'.
 +	(erc-query, erc-handle-irc-url): Use `erc-open'.
 +
 +	* erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc'.
 +
 +	* erc-networks.el: Updated copyright years.
 +	(erc-server-select): Use keyword arguments when calling `erc'.
 +
 +	* erc.texi (Getting Started, Connecting): Changed erc-select to
 +	erc.
 +
 +	* README: Changed erc-select to erc.
 +
 +	* NEWS: Added note about these changes.
 +
 +	* FOR-RELEASE: Marked this item as done.
 +
 +2006-08-21  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-track.el (erc-track-mode-line-mouse-face): New variable.
 +	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
 +	properties to channel name.
 +
 +2006-08-20  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd): New customization group.
 +	(erc-identd-port): New option that specifies the port to use if
 +	none is given as an argument to erc-identd-start.
 +	(identd): Place erc-identd-quickstart in erc-connect-pre-hook
 +	instead of erc-identd-start so that we deal with the different
 +	meaning of the first argument.
 +	(erc-identd-start): Use erc-identd-port.
 +	(erc-identd-quickstart): New function that ignores any arguments
 +	and calls erc-identd-start.
 +
 +	* erc.el (erc-with-server-buffer): New macro that switches to the
 +	current ERC server buffer and runs some code.  If no server buffer
 +	is available, return nil.  This is a useful way to access
 +	variables in the server buffer.
 +	(erc-get-server-user, erc-add-server-user)
 +	(erc-remove-server-user, erc-change-user-nickname)
 +	(erc-get-server-nickname-list, erc-get-server-nickname-alist)
 +	(erc-ison-p, erc-active-buffer, erc-cmd-IGNORE)
 +	(erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST)
 +	(erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p)
 +	(erc-format-channel-modes): Use it.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol
 +	instead of gensym.
 +	(erc-open-server-buffer-p): New function that returns non-nil if
 +	the given buffer is an ERC server buffer that has an open IRC
 +	process.
 +	(erc-with-buffer): Use buffer-live-p here to set a good example,
 +	though it isn't really needed here.
 +	(erc-away): Mention erc-away-time.
 +	(erc): Don't propagate the erc-away setting, since it makes more
 +	sense to access it from the server buffer.  Set up the prompt
 +	before connecting rather than after.  Run erc-connect-pre-hook
 +	with the buffer as an argument, instead of no arguments.
 +	(erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of
 +	erc-server-buffer-p so that only open connections are set away.
 +	(erc-cmd-GQUIT): Use erc-open-server-buffer-p.
 +	(erc-process-away): Docfix.  Don't set erc-away in channel
 +	buffers.
 +	(erc-set-current-nick): Make this uniform with the style used in
 +	erc-current-nick.
 +	(erc-away-time): Rename from erc-away-p, since this is no longer a
 +	boolean-style predicate.
 +	(erc-format-away-status): Use it.
 +	(erc-initialize-log-marker): Accept a `buffer' argument.
 +	(erc-connect-pre-hook): Docfix.
 +	(erc-connection-established): Make sure this runs in the correct
 +	buffer.
 +	(erc-set-initial-user-mode): Accept a `buffer' argument.
 +
 +	* erc-stamp.el (erc-add-timestamp): Use erc-away-time.
 +
 +	* erc-spelling.el (erc-spelling-init): Use
 +	erc-with-server-buffer.  Accept `buffer' argument.
 +	(spelling): Call erc-spelling-init with the `buffer' argument.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p.
 +
 +	* erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE)
 +	(pcomplete-erc-all-nicks): Use erc-with-server-buffer.
 +
 +	* erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use
 +	erc-with-server-buffer.
 +
 +	* erc-networks.el (erc-network, erc-current-network)
 +	(erc-network-name): Use erc-with-server-buffer.
 +
 +	* erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer.
 +
 +	* erc-match.el (erc-log-matches, erc-log-matches-come-back): Use
 +	erc-away-time.
 +
 +	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
 +	Pass `buffer' argument to erc-log-setup-logging instead of setting
 +	the current buffer.  Ditto for erc-log-disable-logging.
 +	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
 +	argument.
 +
 +	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
 +
 +	* erc-ibuffer.el (erc-away): Use erc-away-time.
 +
 +	* erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer
 +	read only instead of permanently doing so.
 +
 +	* erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since
 +	Emacs Lisp has make-symbol, which is better.
 +
 +	* erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use
 +	erc-with-server-buffer.
 +
 +	* erc-capab.el (capab-identify): Only deal with server buffers
 +	that have an open IRC process.
 +	(erc-capab-identify-add-prefix): Use erc-with-server-buffer.
 +
 +	* erc-backend.el (erc-server-connected): Docfix.  Recommend the
 +	`erc-server-process-alive' function.
 +	(erc-coding-system-for-target): Supply a default target if one is
 +	not given.
 +	(erc-server-send): Simplify slightly.
 +	(erc-call-hooks): Use erc-with-server-buffer.
 +	(erc-server-connect, erc-server-setup-periodical-ping): Accept
 +	`buffer' argument.
 +
 +	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move
 +	higher to avoid an automatic load snafu.
 +	(erc-autoaway-some-server-buffer): New function that returns an
 +	ERC server buffer with a live connection, or nil otherwise.
 +	(erc-autoaway-insinuate-maybe): New function that adds the
 +	autoaway reset function to post-command-hook if at least one ERC
 +	process is alive.
 +	(erc-autoaway-remove-maybe): New function that removes the
 +	autoaway reset function from post-command-hook if no ERC process
 +	is alive.
 +	(autoaway): Don't touch post-command-hook unless an IRC process is
 +	already open.  Remove our addition to post-command-hook as soon as
 +	there are no more IRC processes open.  Reset the indicators before
 +	connecting to an IRC server, which fixes a bug when re-connecting.
 +	(erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if
 +	there are no more IRC processes open.
 +	(erc-autoaway-set-back): Pick an open IRC process.  Accept an
 +	argument which is a function call if we can't find one.
 +	(erc-autoaway-some-open-server-buffer): New function which returns
 +	an ERC server buffer with an open connection and a user that is
 +	not away.
 +	(erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it.
 +	(erc-autoaway-set-away): Accept a `notest' argument which is used
 +	to avoid testing the same thing twice.
 +	(erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move
 +	higher in file to fix byte-compile warning.
 +
 +2006-08-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Doc fix.  Let
 +	`erc-server-reconnect-p' check all condition cases.
 +	(erc-server-reconnect-p): Moved rest of checks from
 +	`erc-process-sentinel-1' to here.  Now takes an argument, EVENT.
 +
 +2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
 +	(erc-menu-definition): Name the menu "ERC" instead of "IRC" to
 +	avoid confusion with rcirc and other clients.
 +
 +	* erc-backend.el (erc-server-banned): New variable.
 +	(erc-server-connect): Set `erc-server-banned' to nil.
 +	(erc-process-sentinel-1): Use `erc-server-reconnect-p'.
 +	(erc-server-reconnect-p): New function.  Return non-nil if the
 +	user wants automatic reconnects and if the user has not been
 +	banned from the server.  This should fix a bug where ERC gets into
 +	a loop trying to reconnect with no way to stop it when the user is
 +	denied access to the server due to a server ban.  It might also
 +	help when Tor users are blocked from freenode if freenode servers
 +	send the 465 message before disconnecting.
 +	(465): Handle "banned from server" error notices.
 +
 +2006-08-13  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p'
 +	prompt with a space.
 +
 +2006-08-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-timed-out): New variable that
 +	indicates whether the current connection has timed out due to
 +	failure to respond to a ping.
 +	(erc-server-send-ping): Set erc-server-timed-out to t.
 +	(erc-server-connect): Initialize erc-server-timed-out to nil.
 +	(erc-process-sentinel-1): Consult erc-server-timed-out.
 +
 +2006-08-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-fill.el (erc-fill): Skip any initial empty lines so that we
 +	avoid errors when inserting disconnect messages and other messages
 +	that begin with newlines.
 +
 +2006-08-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Use erc-display-message
 +	in several places instead of inserting text.
 +	(erc-process-sentinel): Move to the input-marker before removing
 +	the prompt.
 +
 +	* erc.el (erc-port): Fix customization options.
 +	(erc-display-message): Handle null type explicitly.  Previously,
 +	this was relying on a chance side-effect.  Cosmetic indentation
 +	tweak.
 +	(english): Add 'finished and 'terminated entries to the catalog.
 +	Add initial and terminal newlines to 'disconnected and
 +	'disconnected-noreconnect entries.  Avoid long lines.
 +	(erc-cmd-QUIT): Bind the current erc-server-process to
 +	server-proc.  If the IRC server responds quickly, it is possible
 +	for the connection to close, and hence server buffer to be killed,
 +	if erc-kill-server-buffer-on-quit is non-nil.  This avoids that
 +	problem.
 +
 +2006-08-06  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-send-queue): Update from Circe
 +	version of this function.
 +	(erc-server-ping-timer-alist): New variable that keeps track of
 +	ping timers according to their associated server.
 +	(erc-server-last-received-time): New variable that specifies the
 +	time of the last message we received from the server.  This is
 +	used to detect hung processes.
 +	(erc-server-send-ping): New function that sends a ping to the IRC
 +	process corresponding with the given buffer.  Split from
 +	erc-server-setup-periodical-ping.  If the server buffer no longer
 +	exists, cancel the timer.  If the server process has not given us
 +	a message, including PING responses, since the last PING, kill it.
 +	This is necessary to deal with some aberrant freenode behavior.
 +	Idea taken from rcirc.
 +	(erc-server-setup-periodical-ping): Rename from
 +	erc-server-setup-periodical-server-ping.
 +	(erc-server-filter-function): Use erc-current-time instead of
 +	current-time.
 +
 +	* erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
 +	multi-tty Emacs.
 +	(erc-select-startup-file): Fix bug introduced by recent change.
 +	(erc-cmd-QUIT): If the IRC process has not terminated itself
 +	within 4 seconds of completing our quit-hook, kill it manually.
 +	Freenode in particular needs this.
 +	(erc-connection-established): Use erc-server-setup-periodical-ping
 +	instead of erc-server-setup-periodical-server-ping.
 +
 +2006-08-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-standardize-name): New function that returns
 +	a filename that is safe for use for a log file.
 +	(erc-current-logfile): Use it.
 +
 +	* erc.el (erc-startup-file-list): Search in ~/.emacs.d first,
 +	since that is a fairly standard directory.
 +	(erc-select-startup-file): Re-write to use
 +	convert-standard-filename, which will ensure that MS-DOS systems
 +	look for the _ercrc.el file.
 +
 +2006-08-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.4.
 +
 +	* Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
 +
 +	* erc.el (erc-active-buffer): Fix bug that caused messages to go
 +	to the wrong buffer.  Thanks to offby1 for the report.
 +
 +	* erc-backend.el (erc-coding-system-for-target): Handle case where
 +	target is nil.  Thanks to Kai Fan for the patch.
 +
 +2006-07-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-setup-logging): Don't offer to save the
 +	buffer.  It will be saved automatically killed.  Thanks to Johan
 +	Bockgård and Tassilo Horn for pointing this out.
 +
 +2006-07-27  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (define-erc-module): Make find-function and find-variable
 +	find the names constructed by `define-erc-module' in Emacs 22.
 +
 +2006-07-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (log): Make sure that we enable logging on
 +	already-opened buffers as well, in case the user toggles this
 +	module after loading ERC.  Also be sure to remove logging ability
 +	from all ERC buffers when the module is disabled.
 +	(erc-log-setup-logging): Set buffer-file-name to nil rather than
 +	the empty string.  This should fix some errors that occur when
 +	quitting Emacs without first killing all ERC buffers.
 +	(erc-log-disable-logging): New function that removes the logging
 +	ability from the current buffer.
 +
 +	* erc-spelling.el (spelling): Use dolist and buffer-live-p.
 +
 +2006-07-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-match.el (erc-log-matches): Bind inhibit-read-only rather
 +	than call toggle-read-only.
 +
 +	* Makefile (debrelease-mwolson): Remove and consolidate with the
 +	`debrelease' target.
 +	(debrevision): Rename from `debrevision-mwolson'.
 +
 +	* erc.el (erc-handle-irc-url): Move here from erc-goodies.el and
 +	add autoload cookie.
 +
 +2006-07-09  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.3.
 +
 +	* erc.texi, Makefile, NEWS: Update for the 5.1.3 release.
 +
 +	* servers.pl: Add copyright notice.
 +
 +	* erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning
 +	from being set automatically away and current buffer is not an ERC
 +	buffer.
 +
 +	* erc-identd.el: Fix compiler error.
 +
 +	* erc.texi (Development): Use @subheading instead of @subsection.
 +	(Advanced Usage): Add menu.
 +	(Connecting): Fully document how to connect to an IRC server.
 +	(Options, Tips and Tricks, Sample Configuration): New unwritten
 +	sections.
 +
 +	* erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier)
 +	(erc-user-full-name, erc-password): Docfixes and customization
 +	interface tweaks.
 +	(erc-try-new-nick-p): Rename from
 +	`erc-manual-set-nick-on-bad-nick-p' and invert meaning.
 +	(erc-nickname-in-use): Use `erc-try-new-nick-p'.  Check the length
 +	of `erc-nick-uniquifier', in case someone wants multiple
 +	characters.
 +	(erc-compute-server, erc-compute-nick, erc-compute-full-name)
 +	(erc-compute-port): Docfixes.
 +
 +	* FOR-RELEASE: Put in future-first order.
 +
 +	* erc-log.el (log): Move all add-hook calls here, rather than
 +	executing them immediately, and also cause them to be un-hooked
 +	when the module is removed.
 +	(erc-save-buffer-on-part): Move next to
 +	`erc-save-queries-on-quit'.
 +	(erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t.
 +	(erc-log-write-after-send, erc-log-write-after-insert): Default to
 +	nil.  This makes things fast, but reasonably failsafe, by default.
 +
 +2006-07-08  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-log.el (erc-log-insert-log-on-open): Make this nil by
 +	default, since most IRC clients don't do this.
 +	(erc-log-write-after-send): New option that determines whether the
 +	log file will be written to after every sent message.
 +	(erc-log-write-after-insert): New option that determines whether
 +	the log file will be written to when new text is added to a logged
 +	ERC buffer.
 +	(log): Use the aforementioned options.
 +
 +	* erc.texi (Modules): Document the "completion" module.
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't
 +	have a nil element in the list when ignore-self is non-nil.
 +
 +2006-07-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-modules): Use `set' instead of `set-default', since
 +	this setting should never be buffer-local.  Add the `list' and
 +	`page' modules to the list.
 +
 +	* erc.texi (Modules): Add entries for `list' and `page' modules.
 +	Change "spell" to "spelling".
 +	(History): Use past tense throughout.
 +
 +2006-07-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-call-hooks): Fix (stringp nil) error that
 +	can happen when doing /PART.
 +
 +	* erc.el (erc-quit-reason-various-alist)
 +	(erc-part-reason-various-alist): In the example, use "^$" as an
 +	example, since "" matches anything.
 +	(erc-quit-reason-various, erc-part-reason-various): If no argument
 +	is given, and no matches are found, use our default reason instead
 +	of "nil".
 +
 +2006-07-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-identd.el (erc-identd-start): XEmacs defines neither
 +	`make-network-process' nor `open-network-stream-server', so just
 +	fail silently.
 +
 +2006-06-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* HISTORY: Update.
 +
 +	* erc.texi (Modules): Mention identd.
 +	(Releases): Update mailing list address and download location.
 +	(Development): Refactor.  Provide updated directions for Arch.
 +	Make URLs clickable.
 +	(Keystroke Summary): Typo fix.  Use more Texinfo syntax.
 +	(Getting Started): Give simpler example.  We do not need to
 +	explicitly load every module.
 +	(History): Update.
 +
 +	* erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el:
 +	erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el:
 +	erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el:
 +	erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el:
 +	erc-networks.el, erc-netsplit.el, erc-nicklist.el:
 +	erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el:
 +	erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el:
 +	erc.el: Remove version strings.
 +
 +	* erc.el (erc-cmd-SMV): Remove, since we do not have meaningful
 +	module versions anymore.
 +	(erc-version-modules): Remove, since we do not use this function
 +	anymore.
 +	(erc-latest-version, erc-ediff-latest-version): Remove, since this
 +	was only useful back when ERC consisted of one file.
 +	(erc-modules): Add line for identd.
 +	(erc-get-channel-mode-from-keypress): Typo fix.
 +
 +	* erc-imenu.el: Remove unnecessary lines in header.
 +
 +	* erc-goodies.el (erc-handle-irc-url): Docfix.
 +
 +	* erc-identd.el: Define an ERC module for this.
 +	(erc-identd-start): Don't create a process buffer if possible.
 +	Otherwise, use conventional hidden names for process buffers.
 +
 +2006-06-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-coding-system-for-target): Match
 +	case-insensitively.  Use a pattern match instead of `assoc', as
 +	per the documentation for `erc-encoding-coding-alist'.
 +
 +	* erc-track.el (erc-track-shorten-aggressively): Fix typo.
 +
 +2006-06-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el: Update maintainer information and URLs.
 +
 +2006-06-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (upload): Make this work with the GNU upload system.
 +
 +2006-06-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-active-buffer): If the active buffer has been
 +	deleted, default to the server buffer.
 +	(erc-toggle-flood-control): When the user hits C-c C-f, make flood
 +	control really toggle, not unconditionally turn off.
 +
 +2006-06-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add items since the 5.1.2 release.
 +
 +	* erc-autoaway.el (erc-autoaway-caused-away): New variable that
 +	indicates whether the current away status was caused by this
 +	module.
 +	(erc-autoaway-set-back): Only set back if this module set the user
 +	away.
 +	(erc-autoaway-set-away): Update `erc-autoaway-caused-away'.
 +	(erc-autoaway-reset-indicators): New function that resets some
 +	indicators when the user is no longer away.
 +	(autoaway): Add the above function to the 305 hook.
 +
 +2006-06-05  Romain Francoise  <romain@orebokech.com>
 +
 +	* erc.texi (History): Fix various typos.
 +
 +2006-06-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el (erc-autoaway-idle-method): Move after the
 +	definition of the autoaway module.
 +	(autoaway): Don't do anything if erc-autoaway-idle-method is
 +	unbound.  This prevents an error on startup.
 +
 +2006-06-03  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch.
 +	(erc-autoaway-idle-method): Renamed from
 +	`erc-autoaway-use-emacs-idle'.  We have more than two choices for
 +	how to do this, so it's best to make this take symbol values.
 +	Improve documentation.  Remove warning against Emacs idle-time;
 +	the point is moot now that we get user idle time via a different
 +	method.  Make sure we disable and re-enable the module when
 +	changing this value.
 +	(autoaway): Conditionalize on the above option.  If using the idle
 +	timer or user idle methods, don't add anything to the
 +	send-completed or server-001 hooks, since it is unnecessary.
 +	(erc-autoaway-reestablish-idletimer, erc-autoaway-message):
 +	Docfix.
 +	(erc-autoaway-idle-seconds): Use erc-autoaway-idle-method.
 +	(erc-autoaway-reset-idle-irc): Renamed from
 +	`erc-autoaway-reset-idle'.  Don't pass line to
 +	`erc-autoaway-set-away', since it is not used.
 +	(erc-autoaway-reset-idle-user): New function that resets the idle
 +	state for user idle time.
 +	(erc-autoaway-set-back): Remove line argument, since it is not
 +	used.
 +
 +	* Makefile (upload): Make this work for Savannah uploads.
 +
 +	* AUTHORS: Update for Savannah move.  No old entries have been
 +	removed, in case people have not registered yet on Savannah.
 +
 +2006-06-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-buffer-filter): Make sure all buffers returned from
 +	this are live.
 +
 +2006-05-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* README: Add License information.  Permit images to be used,
 +	distributed, and modified without restriction.
 +
 +2006-05-01  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-goodies.el (erc-handle-irc-url): New function, suitable as
 +	a value for `url-irc-function'.
 +
 +2006-04-18  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-pcomplete.el (pcomplete-erc-nicks): Added new optional
 +	argument IGNORE-SELF.  If this is non-nil, don't return the user's
 +	current nickname.  Doc fix.
 +	(pcomplete/erc-mode/complete-command): Don't complete the current
 +	nickname.
 +
 +2006-04-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
 +	build date as it's shown in `emacs-version'.
 +
 +	* erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
 +	with the same face property as the previous character.
 +
 +2006-04-02  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el,
 +	erc.el: Make sure to include a newline inside of negated classes,
 +	so that a newline is not matched.
 +
 +2006-04-01  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-server-connect-function): Don't try to
 +	detect the existence of the `open-network-stream-nowait' function,
 +	since I can't find it in Emacs21, XEmacs21, or Emacs22.
 +
 +2006-03-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.texi: Update direntry.  Remove unneeded local variables.
 +
 +2006-03-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-header-line): New face that will be used to colorize
 +	the text of the header-line, provided that
 +	`erc-header-line-face-method' is non-nil.
 +	(erc-prompt-face): Fix formatting.
 +	(erc-header-line-face-method): New option that determines the
 +	method used for colorizing header-line text.  This may be a
 +	function, nil, or non-nil.
 +	(erc-update-mode-line-buffer): Use the aforementioned option and
 +	face to colorize the header-line text, if that is what the user
 +	wants.
 +	(erc-send-input): If flood control is not activated, don't split
 +	the input line.
 +
 +2006-03-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
 +	that fixes the case where there is no leading whitespace.  Only
 +	remove the first space character, though.
 +
 +	* erc-identd.el (erc-identd-start): Fix a bug by making sure that
 +	erc-identd-process is set properly.
 +	(erc-identd-start, erc-identd-stop): Add autoload cookies.
 +	(erc-identd-start): Pass :host parameter so this works with Emacs
 +	22.
 +
 +2006-03-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* CREDITS: Add Nelson Ferreira.  Change contact address.
 +
 +	* erc-bbdb.el: Install patch from Nelson Ferreira.
 +	(erc-bbdb-electric-p): New option that indicates whether to make
 +	the BBDB buffer electric.  Defaults to "not electric".
 +	(erc-bbdb-show-entry): Use `erc-bbdb-electric-p'.
 +
 +2006-03-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Use <backtab> rather than
 +	<C-tab> for `erc-button-previous' as it is a more standard key
 +	binding for this type of function.
 +
 +2006-02-28  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Removed things that were accidentally committed on
 +	2006-02-20.  Removed Todo section.
 +	(erc-capab-unidentified): Removed.
 +
 +2006-02-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el: Use (eval-when-compile (require 'cl)).
 +	(erc-capab-unidentified): Fix compiler warning by specifying
 +	group.
 +
 +2006-02-20  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
 +	to explain thoughts better.  `erc-server-parameters' is an
 +	associated list when it's set, not a string.
 +
 +2006-02-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +	parameters are strings before using them.  Thanks to Alejandro
 +	Benitez for the report.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.2.
 +
 +2006-02-19  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +	<C-tab>.
 +	(erc-button-previous): New function.
 +
 +2006-02-15  Michael Olson  <mwolson@gnu.org>
 +
 +	* NEWS: Add category for ERC 5.2.
 +
 +	* erc.el (erc): Move to the end of the buffer when a continued
 +	session is detected.  Thanks to e1f and indio for the report and
 +	testing a potential fix.
 +
 +2006-02-14  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Prepare a new Debian package.
 +
 +	* Makefile (debprepare): New rule that creates an ERC snapshot
 +	directory for use in both new Debian releases and revisions for
 +	Debian packages.
 +	(debrelease, debrevision-mwolson): Use debprepare.
 +
 +	* NEWS: Bring up-to-date.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): For now, put
 +	timestamps before rather than after erc-fill-column when
 +	erc-timestamp-right-column is nil.  This way we won't surprise
 +	anyone unpleasantly, or so it is hoped.
 +
 +2006-02-13  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 +
 +2006-02-12  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el
 +	* erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el
 +	* erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el
 +	* erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el
 +	* erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el
 +	* erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el
 +	* erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el:
 +	Add 2006 to copyright years, to comply with the changed guidelines.
 +
 +2006-02-11  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Handle erc-capab-identify
 +	correctly.  Make some requirements shorter, so that it's easier to
 +	see why they are needed.
 +
 +	* erc-capab.el: Add autoload cookie for capab-identify.
 +	(erc-capab-send-identify-messages, erc-capab-identify-activate):
 +	Minor whitespace fix in code.
 +
 +	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 +	`erc-timestamp-right-align-by-pixel'.  Set the default based on
 +	whether we are in Emacs 22, and using X.  Improve documentation.
 +	(erc-insert-aligned): Remove calculation of offset, since
 +	:align-to pos works after all.  Unlike the previous solution, this
 +	one works when erc-stamp.el is compiled.
 +	(erc-insert-timestamp-right): Don't add length of string, and then
 +	later remove its displayed width.  This puts timestamps after
 +	erc-fill-column when erc-timestamp-right-column is nil, rather
 +	than before it.  It also fixes a subtle bug.  Remove use of
 +	`current-window', since there is no variable by that name in
 +	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
 +	`erc-fill-column' is non-nil before using it.
 +
 +2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-list.el: Define `list' module which sets the alias
 +	`erc-cmd-LIST' to `erc-list-channels' when enabled and
 +	`erc-list-channels-simple' when disabled.
 +	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 +	(erc-list-channels-simple): New function.
 +
 +	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
 +	`capab-identify' description.  Moved customization options left in
 +	source code.
 +
 +	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 +
 +	* erc-capab.el: Put a little more detail into Usage section.
 +	(define-erc-module): Run `erc-capab-identify-setup' in all open
 +	server buffers when enabling.
 +	(erc-capab-identify-setup): Make PROC and PARSED optional
 +	arguments.
 +	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
 +	should now also match nicknames that are formatted differently
 +	than the default.
 +
 +	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 +	before calling `with-current-buffer'.
 +
 +2006-02-10  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debbuild): Split from debrelease.
 +	(debrevision-mwolson): New rule that causes a Debian revision to
 +	be built.
 +
 +	* erc.el (erc-migrate-modules): Use a better algorithm.  Thanks to
 +	Johan Bockgård.
 +	(erc-modules): Change use of 'pcomplete to 'completion.
 +
 +2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-capab.el: Require erc.
 +	(erc-capab-send-identify-messages): Use `erc-server-send'.
 +	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
 +	the flags so we can also check whether the `erc-identified' text
 +	property is there at all.
 +	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
 +	This fixes a bug where the prefix wasn't inserted when timestamps
 +	are inserted on the right.  Tweaked nickname regexp.
 +	(erc-capab-find-parsed): New function.
 +	(erc-capab-get-unidentified-nickname): Updated to check for 0
 +	flag.  Only get nickname if there's a nickuserhost associated with
 +	this message.
 +
 +	* erc-capab.el: New file.  Adds the new module
 +	`erc-capab-identify', which allows flagging of unidentified users
 +	on servers running an ircd based on dancer - irc.freenode.net, for
 +	example.
 +
 +	* erc.el (erc-modules): Added `capab-identify' to options.
 +	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 +	(erc-version-string): Remove "(CVS)".
 +	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
 +	connections work as expected.  Connecting with `open-tls-stream'
 +	only seems to work (if at all?) when using the tls.el located in
 +	lisp/net/ in Emacs22.
 +
 +	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 +	(erc-get-parsed-vector-type): Moved these functions to erc.el
 +	since they can be useful outside of the text matching module.
 +
 +	* CREDITS: Added erc-capab.el.  List both erc-nickserv.el and
 +	erc-services.el since the file name has changed.
 +
 +	* NEWS: Added erc-capab.el.  Added tls.el -> ssl.el change.
 +
 +	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 +	to "ERC".
 +
 +2006-02-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
 +	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
 +	the filenames in DOS.
 +
 +	* erc-goodies.el: Comment fix.
 +
 +	* erc-hecomplete.el: Rename from erc-complete.el.  Update
 +	commentary.  Use define-erc-module so that it's possible to
 +	actually use this.
 +	(erc-hecomplete): Rename function from `erc-complete'.
 +	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
 +
 +	* erc-join.el: Rename from erc-autojoin.el.
 +
 +	* erc-networks.el: Rename from erc-nets.el.
 +
 +	* erc-services.el: Rename from erc-nickserv.el.
 +
 +	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
 +	the simpler `indent-to' function when
 +	`erc-timestamp-right-align-by-pixel' is nil.
 +	(erc-insert-timestamp-right): If the timestamp goes on the
 +	following line, don't add timestamp properties to the spaces in
 +	front of it.
 +
 +	* erc.el (erc-migrate-modules): New function that eases migration
 +	of module names.
 +	(erc-modules): Call erc-migrate-modules in the :get accessor.
 +	(erc-modules, erc-update-modules): Update for new modules names.
 +
 +2006-02-05  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* FOR-RELEASE: Added two things to do before the next release of
 +	Emacs:  1. using M-x erc instead of M-x erc-select and 2. changing
 +	the `C-c C-SPC' and `C-c C-@' global keybindings.
 +
 +2006-02-05  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
 +	directory correctly.
 +
 +	* debian/changelog: Update for 5.1.1 release.
 +
 +	* debian/control (Suggests): Suggest emacs-chess instead of
 +	Recommending it.  Thanks to Era Eriksson for the report.
 +
 +	* debian/maint/postinst: Install the Info documentation.
 +
 +	* debian/maint/prerm: Handle removing of Info documentation.
 +
 +	* debian/rules (configure, configure-stamp, build, build-stamp):
 +	Generate HTML and Info documentation.
 +	(binary-erc): Install HTML and Info documentation.
 +
 +	* erc-spelling.el (erc-spelling-init): If
 +	`erc-spelling-dictionaries' is nil, do not set
 +	ispell-local-dictionary.  Before, it was being set to nil, which
 +	was causing a long delay while the ispell process restarted.
 +	(erc-spelling-unhighlight-word): New function that removes
 +	flyspell properties from a spell-checked word.
 +	(erc-spelling-flyspell-verify): Don't spell-check nicks or words
 +	that have '/' before them.
 +
 +2006-02-04  Michael Olson  <mwolson@gnu.org>
 +
 +	* Makefile (VERSION): Update to 5.1.1.
 +
 +	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
 +	that Emacs does in its NEWS file.
 +
 +	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 +
 +	* erc-complete.el (erc-nick-completion-exclude-myself)
 +	(erc-try-complete-nick): Use better function for getting list of
 +	channel users.
 +
 +	* erc-goodies.el: Docfix.
 +
 +	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 +	being treated properly.
 +
 +	* erc.texi (History): Note that ERC is now included with Emacs.
 +
 +	* erc.el (erc-version-string): Release ERC 5.1.1.
 +
 +2006-01-31  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el: Update copyright years.
 +
 +2006-01-30  Simon Josefsson  <jas@extundo.com>
 +
 +	* erc.el (erc-open-ssl-stream): Use tls.el.
 +
 +2006-01-30  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
 +	that determines whether to use pixel values to align right
 +	timestamps.  The default is not to do so, since it only works with
 +	Emacs22 on X, and even then some people have trouble.
 +	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 +
 +2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc-viper.el: Ensure we only alter Viper's configuration when
 +	necessary, as Viper may already take ERC into account.
 +
 +2006-01-29  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
 +	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
 +	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 +
 +	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
 +	variable.
 +	(erc-speedbar-goto-buffer): Fix compiler warning.
 +
 +	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
 +	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
 +	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 +	work without compiler warnings.
 +
 +	* man/erc.texi (Obtaining ERC, Installation): Note that these
 +	sections may be skipped if using the version of ERC that comes
 +	with Emacs.
 +
 +2006-01-28  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
 +	guidelines.
 +
 +	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
 +	the Emacs copyright statement.  Refer to ourselves as ERC rather
 +	than "Emacs IRC Client", since there are now several IRC clients
 +	for Emacs.
 +
 +	* erc-compat.el (erc-emacs-build-time): Define as a variable.
 +
 +	* erc-ibuffer.el: Require 'erc.
 +
 +	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
 +	it exists.
 +
 +	* erc-stamp.el (erc-insert-aligned): Only use the special text
 +	property when window-system is X.
 +
 +	* erc.texi (History): Note that ERC 5.1 is released.
 +
 +2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc.el (erc-format-message): More `cl' breakage; don't use
 +	`oddp'.
 +
 +2006-01-27  Michael Olson  <mwolson@gnu.org>
 +
 +	* debian/changelog: Update for new release.
 +
 +	* debian/control (Description): Update.
 +
 +	* debian/rules: Concatenate ChangeLog for 2005.
 +
 +	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
 +	(debrelease, release): Copy images directory.
 +
 +	* NEWS: Spelling fixes.  Add items for recent changes.
 +
 +	* erc.el (erc): Move call to erc-update-modules before the call to
 +	erc-mode.  This should fix a timestamp display issue.
 +	(erc-version-string): Release ERC 5.1.
 +
 +2006-01-26  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-stamp.el (erc-insert-aligned): New function that inserts
 +	text in an perfectly-aligned way relative to the right margin.  It
 +	only works well with Emacs22.  A sane fallback is provided for
 +	other versions of Emacs.
 +	(erc-insert-timestamp-right): Use the new function.
 +
 +2006-01-25  Edward O'Connor  <ted@oconnor.cx>
 +
 +	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
 +	before `erc-match-mode'.
 +
 +	* erc-match.el (match): Append `erc-match-message' to
 +	`erc-insert-modify-hook'.
 +
 +2006-01-25  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE: Mark last release requirement as done.
 +
 +	* Makefile (realclean, distclean): Remove docs.
 +
 +	* erc.texi: Take care of all pre-5.1 items.
 +
 +	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
 +	`process-send-string' in `condition-case' to avoid an error when
 +	quitting ERC.
 +
 +	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
 +	variable-width characters in the timestamp and on the same line.
 +	The latter is a kludge, but it seems to work with most of the
 +	input I've thrown at it so far.  It's certainly better than going
 +	past the end of line consistently when we have variable-width
 +	characters on the same line.  When `erc-timestamp-intangible' is
 +	non-nil, add intangible properties to the whitespace as well, so
 +	that hitting <end> does what you'd expect.
 +
 +	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
 +	this to only use boolean values for `erc-flood-protect'.  Update
 +	documentation.
 +	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
 +	that any QUIT-related messages go there.
 +	(erc): Try to be more clever about re-using channel buffers when
 +	automatically re-connecting.  Thanks to e1f for noticing.
 +
 +2006-01-23  Michael Olson  <mwolson@gnu.org>
 +
 +	* ChangeLog.2005: Remove erroneous line.
 +
 +	* FOR-RELEASE: Make that the Makefile tweaking is complete.
 +	(NEWS): Mark as done.
 +
 +	* Makefile (MANUAL): New option indicating the name of the manual.
 +	(PREFIX, ELISPDIR, INFODIR): New options that specify the
 +	directories to install lisp code and info manuals to.  PREFIX is
 +	used only by ELISPDIR and INFODIR.
 +	(all): Call `lisp' and create the manual.
 +	(lisp): Compile lisp code.
 +	(%.info, %.html): New rules that make Info files and HTML files,
 +	respectively, from a TexInfo source.
 +	(doc): Create both the Info and HTML versions of the manual.  This
 +	is for the user -- we never call it automatically.
 +	(install-info): Install Info files.
 +	(install-bin): Install compiled and source Lisp files.
 +	(todo): Remove, since it seems pointless.
 +
 +	* NEWS: Update.
 +
 +	* README: Add Installation instructions.  Tweak layout.
 +
 +	* erc.texi: Work on some pre-5.1 items.
 +
 +	* erc-stamp.el, erc-track.el: Move some functions and options in
 +	order to get rid of a few compiler warnings.
 +
 +	* erc.el (erc-modules): Enable readonly by default.  This will
 +	prevent new users from accidentally removing old messages, which
 +	could be disconcerting.  Also enable stamp by default, since
 +	timestamps are a fairly standard feature among IRC clients.
 +
 +	* erc-button.el: Munge whitespace.
 +
 +	* erc-identd.el (erc-identd-start): Instead of throwing an error,
 +	just try to use the obsolete function.
 +
 +2006-01-22  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-decode-string-from-target): Make sure that
 +	we have a string as an argument.  If not, coerce it to the empty
 +	string.  Hopefully, this will work painlessly around an edge case
 +	related to quitting ERC around the same time a message comes in.
 +
 +2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
 +
 +	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
 +	`case').  Doc fixes.
 +	(erc-find-parsed-property): Simplify.
 +	(erc-track-get-active-buffer): Fix logic.  Simplify.
 +	(erc-track-switch-buffer): Remove unused variable `dir'.  Simplify.
 +
 +	* erc-speak.el: Doc fixes.
 +	(erc-speak-region): `propertize' --> `erc-propertize'.
 +
 +	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
 +	`erc-propertize'.
 +
 +	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
 +	account when wrapping URLs.
 +
 +	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
 +
 +	* erc-backend.el (define-erc-response-handler): Doc fix.
 +
 +2006-01-22  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc.el (erc-update-modules): Use `require' instead of `load',
 +	but prevent it from causing errors, in order to preserve the
 +	previous behavior.
 +
 +2006-01-21  Michael Olson  <mwolson@gnu.org>
 +
 +	* FOR-RELEASE (Source): Mark cl task as done.
 +
 +	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
 +	generate-autoloads.
 +	(erc-auto.el, %.elc): Don't show command, just its output.
 +
 +	* NEWS: Add items from 2005-01-01 to 2005-08-13.
 +
 +	* debian/copyright (Copyright): Update.
 +
 +	* erc-auto.in (erc-generate-autoloads): Rename from
 +	generate-autoloads.
 +
 +	* erc.el, erc-autoaway.el, erc-backend.el: Use
 +	erc-server-process-alive instead of erc-process-alive.
 +
 +	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
 +	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
 +	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
 +	Use (eval-when-compile (require 'cl)), so that compilation doesn't
 +	fail.
 +
 +	* erc-fill.el, erc-truncate.el: Whitespace munging.
 +
 +	* erc.el: Update copyright notice.  Remove eval-after-load code.
 +	(erc-with-buffer): Docfix.
 +	(erc-once-with-server-event, erc-once-with-server-event-global)
 +	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
 +	instead of gensym.
 +	(erc-banlist-update): Use erc-delete-if instead of delete-if.
 +	(erc): Call `erc-update-modules' here.
 +
 +	* erc-backend.el: Require 'erc-compat to minimize compiler
 +	warnings.
 +	(erc-decode-parsed-server-response): Docfix.
 +	(erc-server-process-alive): Move here from erc.el and rename from
 +	`erc-process-alive'.
 +	(erc-server-send, erc-remove-channel-users): Make sure process is
 +	alive before sending data to it.
 +
 +	* erc-bbdb.el: Update copyright years.
 +	(erc-bbdb-whois): Remove overexuberant comment.
 +
 +	* erc-button.el: Require erc-fill, since we make liberal use of
 +	`erc-fill-column'.
 +
 +	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
 +	functions, the latter of which provides an `assert' equivalent.
 +	(erc-remove-if-not): New function that provides a simple
 +	implementation of `remove-if-not'.
 +	(erc-gensym): New function that provides a simple implementation
 +	of `gensym'.
 +	(erc-delete-if): New function that provides a simple
 +	implementation of `delete-if'.
 +	(erc-member-if): New function that provides a simple
 +	implementation of `member-if'.
 +	(field-end): Remove this, since it is unused, and later versions
 +	of XEmacs have this function already.
 +	(erc-function-arglist): Moved here from erc.el.
 +	(erc-delete-dups): New compatibility function for dealing with
 +	XEmacs.
 +	(erc-subseq): New function copied from cl-extra.el.
 +
 +	* erc-dcc.el: Require pcomplete during compilation to avoid
 +	compiler warnings.
 +	(erc-unpack-int, erc-dcc-send-filter)
 +	(erc-dcc-get-filter): Use erc-assert instead of assert.
 +	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
 +	remove-if-not.
 +
 +	* erc-match.el (erc-log-matches): Fix compiler warning.
 +
 +	* erc-nicklist.el: Update copyright notice.
 +	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
 +	(erc-nicklist-bitlbee-connected-p): Remove.
 +	(erc-nicklist-insert-medium-name-or-icon): Accept channel
 +	argument.  Use it to determine whether we are on bitlbee.  Now
 +	that bitlbee names its channel "&bitlbee", this is trivial.
 +	(erc-nicklist-insert-contents): Pass channel as specified above.
 +	Don't try to determine whether we are on bitlbee here.
 +	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
 +	of remove-if-not.
 +	(erc-nicklist-search-for-nick): Use erc-member-if instead of
 +	member-if.
 +
 +	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
 +	partially-evaluated lambda expression instead of `delete' and
 +	`find'.
 +
 +	* erc-track.el: Use erc-assert.
 +	(erc-track-modified-channels): Remove use of `return'.
 +	(erc-track-modified-channels): Use `cadr' instead of `second',
 +	since otherwise we would need yet another eval-when-compile line.
 +
 +2006-01-19  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
 +	detect SIGPIPE, since it doesn't work.
 +
 +2006-01-10  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-spelling.el: Updated copyright years.
 +	(define-erc-module): Enable/disable `flyspell-mode' for all open
 +	ERC buffers as well.
 +	(erc-spelling-dictionaries): Reworded customize description.
 +
 +	* erc.el (erc-command-symbol): New function.
 +	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
 +	fixes a bug where "Symbol's function definition is void:
 +	erc-cmd-LIST" would be shown after typing /list at the prompt (the
 +	command was interned because erc-menu.el uses it and is enabled by
 +	default whereas erc-list.el is not).
 +
 +	* NEWS: Started a list of renamed variables.
 +
 +	* erc.el: Reworded the message sent when defining variable
 +	aliases.
 +	(erc-command-indicator-face): Doc fix.
 +	(erc-modules): Enable the match module by default which makes
 +	current nickname highlighting on as the default.
 +
 +	* erc-button.el: Updated copyright years.
 +	(erc-button): New face.
 +	(erc-button-face): Use `erc-button'.
 +	(erc-button-nickname-face): New customizable variable.
 +	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
 +	new argument to `erc-button-add-button'.
 +	(erc-button-add-button): Doc fix.  Added new argument to function
 +	definition, NICK-P.  If it's a nickname, use
 +	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
 +	makes channel tracking and buttons work better together when
 +	`erc-button-buttonize-nicks' is enabled, since there is a nickname
 +	on just about every line.
 +
 +	* erc-track.el (erc-track-use-faces): Doc fix.
 +	(erc-track-faces-priority-list): Added `erc-button' to list.
 +	(erc-track-priority-faces-only): Doc fix.
 +
 +2006-01-09  Diane Murray  <disumu@x3y2z1.net>
 +
 +	* erc-button.el (erc-button-url-regexp): Use `concat' so the
 +	regexp is not one long line.
 +	(erc-button-alist): Fixed so that customizing works correctly.
 +	Reorganized.  Removed lambda functions with more than two lines.
 +	Doc fix.
 +	(erc-button-describe-symbol, erc-button-beats-to-time): New
 +	functions.  Moved from `erc-button-alist'.
 +
 +2006-01-07  Michael Olson  <mwolson@gnu.org>
 +
 +	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
 +	process if a SIGPIPE occurs.  This happens when a new message
 +	comes in at the same time a /quit is requested.
 +	(erc-process-sentinel): Use string-match rather than string= to do
 +	these comparisons.  Matching literal newlines makes me nervous.
 +
 +	* erc-track.el (erc-track-remove-from-mode-line): Handle case
 +	where global-mode-string is not a list.  Emacs22 permits this.
 +
 +
 +See ChangeLog.05 for earlier changes.
 +
 +    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-   Copying and distribution of this file, with or without modification,
-   are permitted provided the copyright notice and this notice are preserved.
++
++  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 2, 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: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --cc NEWS
index 9c97183,0000000..68afde5
mode 100644,000000..100644
--- a/NEWS
+++ b/NEWS
@@@ -1,1084 -1,0 +1,1105 @@@
 +ERC NEWS                                                       -*- outline -*-
 +
++Copyright (C) 2006, 2007  Free Software Foundation, Inc.
++See the end of the file for license conditions.
++
 +* Changes in ERC 5.2
 +
 +** M-x erc RET now starts ERC.
 +`erc-select' has been changed to `erc'.  `erc-select' still remains as
 +an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
 +`erc-ssl' with `erc-select-ssl' as its alias.  The function that was
 +known as `erc' is now `erc-open'.
 +
 +** Open query buffers by default when private messages are received.
 +The default value of `erc-auto-query' has been changed to 'bury.
 +
 +** New command: /RECONNECT
 +This command tries to reconnect to the current IRC server exactly
 +once.  It does not work in server buffers (throws an error before the
 +command is run), but works in query and channel buffers.
 +
 +** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
 +
 +** Fix buggy interaction with multi-tty Emacs.
 +
 +** After running /QUIT, make sure that the IRC process is killed within
 +4 seconds.  Freenode, in particular, needs this at times.
 +
 +** If the IRC process has not responded to our PINGs within a certain
 +time, kill it and restart the connection.  See
 +`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
 +`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
 +`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
 +
 +** Avoid getting into an infinite connection loop.
 +Previously, this could happen if your nick was banned, you were using
 +Tor, incorrect information was entered, or the connection was bad.
 +
 +** Make ban messages less confusing.
 +
 +** Restore the point correctly when reconnecting to an IRC server.
 +
 +** Make /IGNORE and /UNIGNORE prompt to determine whether their
 +argument is a user or a regexp.  This results in less-confusing
 +behavior when trying to ignore someone who has a bracket in their
 +nick.
 +
 +** Make the default port "6667" rather than "ircd", because some
 +operating systems don't know what port "ircd" maps to.
 +
 +** Fix several bugs in erc-iswitchb (C-c C-b).
 +
 +** Clean up internal documentation.
 +Special thanks go to Juanma Barranquero for the thorough vetting of
 +ERC's internal documentation.
 +
 +** Display a more informative message when a module is not found.
 +
 +** Fix a bug where paths were being colored like IRC commands.
 +
 +** In the customize interface for `erc-modules', add the name of the module.
 +This makes it easier to find modules by name.
 +
 +** erc-server-send-ping-interval: Change to use a default of 30 seconds.
 +
 +** Some files which are included with the release of ERC 5.2 will not
 +appear in the version of ERC that is bundled with Emacs 22.  These
 +extras files may be found at:
 +
 + o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
 + o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
 +
 +** Renamed files
 +
 +Several files were renamed so as to make them distinct to users of the
 +MS-DOS operating system.
 +
 + o erc-autojoin.el -> erc-join.el
 + o erc-complete.el -> erc-hecomplete.el
 + o erc-nickserv.el -> erc-services.el
 + o ChangeLog.NNNN -> ChangeLog.NN
 +
 +** Header line changes
 +
 +*** Remove "[IRC]" from the header line.
 +
 +*** Add the %l format character to `erc-header-line-format',
 +
 +*** Document how to remove the header line.
 +Namely: (setq erc-header-line-format nil).
 +
 +** New options
 +
 +*** erc-server-reconnect-attempts: Determines the number of
 +reconnection attempts that ERC will make per server.
 +
 +*** erc-server-reconnect-timeout: Determines the amount of time,
 +in seconds, that ERC will wait between successive reconnect attempts.
 +
 +*** erc-server-send-ping-timeout: Determines when to consider a connection
 +stalled and restart it.  The default is	after 120 seconds.
 +
 +*** erc-system-name: Determines the system name to use when logging in.
 +The default is to figure this out by calling `system-name'.
 +
 +** New face: `erc-my-nick-face'
 +This helps make it easier to distinguish messages sent by yourself
 +from messages sent by other users when the value of the variable
 +`erc-show-my-nick' is non-nil.
 +
 +** Namespace changes
 +
 +*** New macro: `erc-with-server-buffer'
 +Switches to the current ERC server buffer and runs some code.  If no
 +server buffer is available, return nil.  This is a useful way to
 +access variables in the server buffer.
 +
 +*** New function: `erc-open-server-buffer-p'
 +Returns non-nil if the given buffer is an ERC server buffer that has
 +an open IRC process.
 +
 +*** New function: `erc-format-lag-time'
 +Returns the estimated lag time to server, `erc-server-lag'.
 +
 +*** Renamed items
 +
 + o `erc-server-setup-periodical-server-ping' is now
 +   `erc-server-setup-periodical-ping'
 +
 + o `erc-away-p' is now `erc-away-time'
 +
 +** Changes to the ERC manual
 +
 +*** New section: Sample Session.
 +Describes a sample ERC session for connecting to the #emacs channel on
 +Freenode.  Also mention the #erc channel.
 +
 +*** New section: Special Features.
 +Describes some of the special features of ERC.
 +
 +*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
 +interface.
 +
 +*** Development: Mention ErcDevelopment page on emacswiki.org.
 +
 +*** Tips and Tricks: Remove empty section for now.
 +
 +*** Options: Mention how to see available ERC options.
 +
 +*** Sample Configuration: Add an example of how to configure ERC.
 +
 +** New modules
 +
 +*** Autoaway (erc-autoaway.el)
 +
 +**** Make this much more reliable.
 +
 +**** Avoid duplicate messages when coming back from being away.
 +
 +**** Fix bug where autoaway was enabled just by loading the file.
 +
 +*** BBDB (erc-bbdb.el)
 +
 +**** Display information on how to cancel merging of info or how to
 +create a new John Doe record.
 +
 +**** Make it so that information from /whois continues to come in, even
 +while prompting for a record to merge.
 +
 +**** Make hitting C-g correctly abort merging the record.
 +
 +*** Capab identify (erc-capab.el)
 +Mark users who haven't identified to NickServ on servers supporting
 +CAPAB IDENTIFY-MSG.
 +
 +** Changes and additions to modules
 +
 +*** Button (erc-button.el)
 +
 +**** Make <backtab> go to the previous button.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Use mouse-face and help-echo for channel names in the mode-line.
 +This helps people using a mouse know that they are buttons and can be
 +clicked on.
 +
 +**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
 +This is accomplished by moving these bindings to their own global
 +minor mode.  Now the default is to check whether the user has bound
 +something to C-c C-SPC or C-c C-@.  If they have, prompt them about
 +whether to really override that binding.  This also has the effect of
 +preventing ERC from clobbering rcirc's keybinding, unless this is
 +desired.  See `erc-track-enable-keybindings' for more details.
 +
 +**** New option: erc-track-enable-keybindings.
 +Determine whether or not to enable the C-c C-SPC and C-c C-@
 +keybindings.  The default is to ask whether to do this if a binding to
 +these keys already exists.  It can also be set to t or nil to always
 +bind or never bind, respectively.
 +
 +**** Remove `track-when-inactive' module.
 +See `erc-track-when-inactive' for further details.
 +
 +**** New option: erc-track-when-inactive.
 +This option replaces the track-when-inactive module.  Set it to
 +non-nil to track activity even in visible buffers when inactive.  The
 +default is nil.
 +
 +**** Remove the `track-modified-channels' alias for the `track' module.
 +
 +*** DCC support (erc-dcc.el)
 +
 +**** Add Usage section to Commentary.
 +
 +**** Fix a bug in the server message output.
 +
 +*** Filling (erc-fill.el)
 +
 +**** Fix bug involving messages that start with one or more blank lines.
 +
 +*** Identd (erc-identd.el)
 +
 +**** New option `erc-identd-port'
 +Specifies the port to use if none is given as an argument to
 +`erc-identd-start'.  This is placed in the new customization group
 +`erc-identd'.
 +
 +**** New function: `erc-identd-quickstart'
 +Ignores any arguments and calls `erc-identd-start'.
 +
 +*** Channel lists (erc-list.el)
 +
 +**** Enable by default, except in the version of ERC bundled with Emacs 22.
 +
 +*** Logging (erc-log.el)
 +
 +**** Make sure filenames are safe to use before writing to them.
 +
 +**** Save all log buffers when exiting Emacs.
 +
 +**** erc-generate-log-file-name-function: Add option for
 +`erc-generate-log-file-name-network', which is a new function that
 +uses the network name rather than the server name when possible.
 +
 +*** Menu (erc-menu.el)
 +
 +**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
 +and other clients.
 +
 +**** Make this into a proper module and load it by default.
 +
 +**** Add "Current channel" submenu.
 +
 +*** Networks (erc-networks.el)
 +
 +**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
 +
 +**** Escape periods in Konfido.Net and Kewl.Org.
 +
 +*** Internet services / Nickserv (erc-nickserv.el)
 +
 +**** Add new 'both method for the `erc-nickserv-identify-mode' option
 +and make it the default.  This tries to do the right thing both when a
 +known nickserv message exists for an IRC network, and when it does
 +not.
 +
 +**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
 +
 +**** Support authentication on BitlBee.
 +
 +**** Make source code easier to understand by using accessor functions.
 +
 +*** Sound support (erc-sound.el)
 +
 +**** Make this work with both Emacs 21 and Emacs 22.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** Exclude the newline from the erc-timestamp field.
 +
 +**** New function: `erc-toggle-timestamps'.
 +Toggles display of timestamps.
 +
 +* Changes in ERC 5.1.4
 +
 +** Make find-function and find-variable work in Emacs 22 for
 +names that are constructed by `define-erc-module'.
 +
 +** Fix bug introduced in ERC 5.1.3 that caused messages to go the
 +wrong buffer.
 +
 +** Changes and additions to modules
 +
 +*** Highlighting (erc-match.el)
 +
 +**** Don't activate view-mode.
 +
 +*** Logging (erc-log.el)
 +
 +**** When this module is activated, make sure logging is enabled on
 +already-opened buffers.  Ditto for disabling logging when the module
 +is deactivated.
 +
 +**** Fix some errors that occur when exiting Emacs without first
 +quitting open IRC servers.
 +
 +* Changes in ERC 5.1.3
 +
 +** Fix use of /quote command with no initial whitespace.
 +
 +** Make it possible to customize the colorization of the header line.
 +The `erc-header-line' face is used to color the header line.
 +The `erc-header-line-face-method' determines the method to use when
 +colorizing the header line.
 +
 +** Add the new function `erc-handle-irc-url', which is a suitable
 +candidate to use for `url-irc-function'.  This permits some
 +integration of url.el and ERC.
 +
 +** Fix several errors that occur when server or channel buffers are killed
 +prematurely.
 +
 +** Fix toggling of flood control.
 +
 +** Match the patterns in `erc-encoding-coding-alist' as regexps,
 +instead of verbatim text.  Also, match case-insensitively.
 +
 +** The /SMV command has been removed, since we no longer have
 +meaningful module-specific version information.
 +
 +** Fix a "(stringp nil)" error that can happen when doing /PART.
 +
 +** Use a better example in the `erc-part-reason-various-alist'
 +documentation.
 +
 +** When using `erc-quit-reason-various' and `erc-part-reason-various'
 +and no matches are found, default to using the ERC version string
 +rather than "nil".
 +
 +** Add the `list' and `page' modules to the `erc-modules' customize
 +interface.
 +
 +** Changes to the ERC manual
 +
 +*** Update the list of available modules.
 +
 +*** Revise information about releases and development.
 +
 +*** Provide a simpler example in the "Getting Started" chapter.
 +
 +*** Fully document how to connect to an IRC server in the new
 +"Connecting" chapter.
 +
 +** Changes and additions to modules
 +
 +*** Autoaway (erc-autoaway.el)
 +
 +**** Rename the `erc-autoaway-use-emacs-idle' option to
 +`erc-autoaway-idle-method'.
 +
 +**** Add support for autoaway based on user idle time.
 +This is now the default.
 +
 +**** If you set the AWAY status yourself, erc-autoaway will not
 +interfere by un-setting AWAY prematurely.
 +
 +**** If you are set away while visiting a non-ERC buffer,
 +erc-autoaway used to fail in bringing the user back.  This is now
 +fixed.
 +
 +*** BBDB (erc-bbdb.el)
 +
 +**** Add new option `erc-bbdb-electric-p', which determines whether
 +to make the BBDB buffer electric.  This defaults to not electric.
 +
 +*** Button (erc-button.el)
 +
 +**** Use <backtab> instead of <C-tab> for `erc-button-previous'.
 +
 +*** Identd (erc-identd.el)
 +
 +**** Fix a bug that involves starting the identd server.
 +
 +**** Make this work with Emacs 22.
 +
 +**** Provide a real ERC module named `identd'.
 +
 +**** Don't create an extra buffer for the identd process.
 +
 +*** Logging (erc-log.el)
 +
 +**** By default, don't insert old logs when opening an ERC buffer.
 +This may be changed by customizing `erc-log-insert-log-on-open'.
 +
 +**** New option `erc-log-write-after-send' determines whether the
 +log file will be written to after every sent message.  The default is
 +not to do this.
 +
 +**** New option `erc-log-write-after-insert' determines whether the
 +log file will be written to when new text is added to a logged ERC
 +buffer.  The default is not to do this.  With this option and the
 +previous option, logging should no longer slow down ERC as much.
 +
 +**** Default to saving buffers and queries on quit.
 +This may be changed by customizing the `erc-save-buffer-on-quit' and
 +`erc-save-queries-on-quit' options, respectively.
 +
 +**** Only perform logging when the `logging' module is added to
 +`erc-modules'.  This prevents logging from being activated just by
 +loading the erc-log.el file, and makes logging act like other ERC
 +modules.
 +
 +*** Programmable completion (erc-pcomplete.el)
 +
 +**** Don't complete the user's current nickname.
 +
 +* Changes in ERC 5.1.2
 +
 +** Go back to using ssl.el so that SSL connections work as expected.
 +Connecting with `open-tls-stream' only seems to work (if at all?) when
 +using the tls.el located in lisp/net/ in Emacs22.
 +
 +** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
 +
 +** Move to end of prompt when ERC reconnects to a server.
 +
 +** Changes and additions to modules
 +
 +*** Spell-checking (erc-spelling.el)
 +
 +**** Don't spell-check nicks or words that are prefixed with '/'.
 +
 +**** Remove flyspell properties from words we shouldn't spell-check.
 +
 +**** Fix an issue that caused the ispell process to reload every time
 +we switch to an ERC buffer.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** Fix an inconsistency in calculating width of right timestamps.
 +
 +**** Rename option `erc-timestamp-right-align-by-pixel' to
 +`erc-timestamp-use-align-to'.  This controls whether to use the more
 +fail-proof method of aligning right timestamps, as mentioned below.
 +
 +**** Fix a right timestamp spacing problem that used to occur when
 +erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
 +use the method that aligns right timestamps perfectly in Emacs22 with
 +X.  If the current version of Emacs doesn't support this method, use
 +the simpler method, which is prone to alignment issues for math
 +symbols and other variable-width text.
 +
 +A side effect of using this new method is that there will only be one
 +space before a right timestamp in any saved logs.  If this is
 +unacceptable, set `erc-timestamp-use-align-to' to nil.
 +
 +* Changes in ERC 5.1.1
 +
 +** Fix a requirement on cl.el.
 +
 +** Use tls.el for SSL connections, rather than ssl.el.
 +
 +** Changes and additions to modules
 +
 +*** ibuffer integration (erc-ibuffer.el)
 +
 +**** Update this to work with the version of ibuffer.el that comes with
 +recent Emacs variants.
 +
 +*** Old completion (erc-complete.el)
 +
 +**** Fix a few errors.
 +
 +*** Speedbar (erc-speedbar.el)
 +
 +**** Make this work with the version of speedbar.el that comes with
 +recent Emacs variants.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** By default, use a more failsafe method of displaying right timestamps.
 +To get right timestamps to align perfectly in Emacs22 using X, set the
 +new `erc-timestamp-right-align-by-pixel' option to non-nil.
 +
 +*** Viper compatibility (erc-viper.el)
 +
 +**** Since most of these changes are now merged into Emacs22, detect
 +whether we need these changes and install them only if necessary.
 +
 +* Changes in ERC 5.1
 +
 +** Improve XEmacs compatibility.
 +
 +** Namespace changes
 +
 +*** Now ERC doesn't use global variable space.
 +Renamed all variables that didn't start with "erc-".
 +
 +  o `away' is now `erc-away'
 +
 +  o `current-nick' is now `erc-server-current-nick'
 +
 +  o `last-peers' is now `erc-server-last-peers'
 +
 +  o `last-ping-time' is now `erc-server-last-ping-time'
 +
 +  o `last-sent-time' is now `erc-server-last-sent-time'
 +
 +  o `lines-sent' is now `erc-server-lines-sent'
 +
 +  o `quitting' is now `erc-server-quitting'
 +
 +*** Remove the `with-erc-channel-buffer' function.
 +
 +** Bugfixes
 +
 +*** Don't inadvertently destroy face properties.
 +
 +*** Load erc scripts in a safer way.
 +
 +*** Don't insert a timestamp if text at point is invisible.
 +
 +*** Don't hide messages from those in `erc-fools' by default.
 +Color their nicks instead.
 +
 +*** Use a more foolproof method of encoding and decoding strings
 +before sending to a channel.
 +
 +** Backend changes
 +
 +*** Renamed some server-specific variables
 +
 +  o `erc-announced-server-name' is now `erc-server-announced-name'
 +
 +  o `erc-auto-reconnect' is now `erc-server-auto-reconnect'
 +
 +  o `erc-connect-function' is now `erc-server-connect-function'
 +
 +  o `erc-default-coding-system' is now `erc-server-coding-system'
 +
 +  o `erc-duplicate-timeout' is now `erc-server-duplicate-timeout'
 +
 +  o `erc-duplicates' is now `erc-server-duplicates'
 +
 +  o `erc-lag' is now `erc-server-lag'
 +
 +  o `erc-prevent-duplicates' is now `erc-server-prevent-duplicates'
 +
 +  o `erc-previous-read' is now `erc-server-filter-data'
 +
 +  o `erc-process' is now `erc-server-process'
 +
 +  o `erc-ping-handler' is now `erc-server-send-ping-handler'
 +
 +  o `erc-ping-interval' is now `erc-server-send-ping-interval'
 +
 +*** Renamed some functions
 +
 +  o `erc-connect' is now `erc-server-connect'
 +
 +  o `erc-process-filter' is now `erc-server-filter-function'
 +
 +  o `erc-send-command' is now `erc-server-send'
 +
 +  o `erc-send-single-line' is now `erc-send-input'
 +
 +  o `erc-setup-periodical-server-ping' is now
 +    `erc-server-setup-periodical-server-ping'
 +
 +  o `erc-split-command is now `erc-split-line'
 +
 +*** New options
 +
 +  o erc-server-flood-margin, erc-server-flood-penalty: New options
 +    that allow tweaking of flood control.
 +
 +  o erc-split-line-length: The maximum line length of a single
 +    message.
 +
 +*** New variables
 +
 +  o erc-server-flood-last-message, erc-server-flood-queue,
 +    erc-server-flood-timer: Flood control.
 +
 +  o erc-server-processing-p: Indicate when we're currently processing
 +    a message.
 +
 +*** Remove some options
 +
 +  o `erc-flood-limit'
 +  o `erc-flood-limit2'
 +
 +** New customization group `erc-server' for dealing with IRC servers.
 +
 +** ERC can now be installed by doing `make install' from the command line.
 +
 +** ERC now has a manual in erc.texi.
 +Type `make doc' to generate HTML and Info versions of it.
 +
 +** ERC no longer depends on cl.el.
 +Only the macros in cl-macs.el are used.
 +
 +** Fix an edge case when quitting as new messages come in.
 +
 +** Make flood protection toggle-able as on/off, removing the 'strict option.
 +
 +** If possible, re-use channel buffers when reconnecting to a server.
 +
 +** Text in ERC buffers is now read-only by default.
 +To get the previous behavior, 
 +
 +** Changes and additions to modules
 +
 +*** Auto-join (erc-autojoin.el)
 +
 +**** Recognize the Azzurra server.
 +
 +*** BBDB (erc-bbdb.el)
 +
 +**** When the user types /WHOIS, ask for a record to merge to.
 +
 +**** Store the displayed name of a BitlBee contact.
 +The new `erc-bbdb-bitlbee-name-field' option specifies the field to use
 +to store this information.
 +
 +**** Don't prompt for a name on /JOIN or /NICK.
 +
 +*** Button (erc-button.el)
 +
 +**** Fix customization of `erc-button-alist'
 +
 +**** New option `erc-button-nickname-face' determines the face to use
 +when coloring ERC nicknames.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Remove channels from the modified channels list if not currently
 +connected.  This should remove residue from the mode line after
 +quitting ERC.
 +
 +**** Recognize buttonized text
 +
 +*** Highlighting (erc-match.el)
 +
 +**** Highlight current nickname by default.
 +
 +**** Added the option of beeping when certain matches occur.
 +Add `erc-beep-on-match' to `erc-text-matched-hook' to enable
 +beeping.  Set the new variable `erc-beep-match-types' which match
 +types that make beeps.
 +
 +*** Nicklist (erc-nicklist.el)
 +
 +**** Fix a couple of errors.
 +
 +**** Make sure a stray mouse click doesn't trigger an error.
 +
 +**** Insert icons from the /images directory next to nicks.
 +This indicates their away status.  The location is customizable via
 +the new `erc-nicklist-icons-directory' option.
 +
 +If you do not want these icons, set `erc-nicklist-use-icons' to nil.
 +
 +*** Nickserv identification (erc-nickserv.el)
 +
 +**** Recognize Azzurra and OFTC networks.
 +
 +*** Old completion (erc-complete.el)
 +
 +**** Disable by default.
 +
 +*** Programmable completion (erc-pcomplete.el)
 +
 +**** Enable by default.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** On Emacs22, align right timestamps perfectly, even if variable-width
 +characters are used.  If we aren't using Emacs22, move text farther
 +away from the right margin when variable-width characters are used.
 +It is considered better to misalign the stamp by a bit than to go past
 +the right margin.
 +
 +**** Enable by default
 +
 +** New modules
 +
 +*** Spell-checking (erc-spelling.el)
 +
 +**** Use flyspell in ERC.
 +
 +*** Viper compatibility (erc-viper.el)
 +
 +**** Helps ERC work correctly in viper-mode.
 +
 +* Changes in ERC 5.0.4
 +
 +** Fix a problem with undo in channels.
 +
 +* Changes in ERC 5.0.3
 +
 +** Fix typo in the `ctcp-request-to' entry of the English catalog.
 +
 +** Debugging with edegug has been made easier in all of the
 +erc-with-* and with-erc* macros.
 +
 +** Non-ASCII character sets should be better supported when sending
 +and processing messages.
 +
 +** A load failure with erc-autoaway.el and Emacs21 has been fixed.
 +
 +** A few XEmacs warnings were fixed.
 +
 +** Changes and additions to modules
 +
 +*** Backend (erc-backend.el)
 +
 +**** Move the check for hidden messages into `erc-display-message'
 +so there isn't so much replicated code.
 +
 +**** Add `definition-name' property to constructed symbols so that
 +`find-function' and `find-variable' will be able to locate them.
 +
 +**** Make sure logs are inserted info the correct channel buffers.
 +There was previously an error when using `erc-insert-log-on-open' in
 +combination with autojoin to multiple channels.
 +
 +*** Button (erc-button.el)
 +
 +**** The layering of `erc-button-face' on other faces in ERC buffers
 +has been improved.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Use optimal amount of whitespace around modified channels
 +indicator.  Previously, there was an additional unnecessary space.
 +
 +**** Fix an error that occurred when unchecked buffers existed when
 +invoking /QUIT.
 +
 +* Changes in ERC 5.0.2
 +
 +** If a channel key is required for a certain channel, ERC will prompt
 +for one if `erc-prompt-for-channel-key' is non-nil.
 +
 +** ERC doesn't try to reconnect if the network connection is refused
 +when using `open-network-stream-nowait' as the `erc-connect-function'.
 +
 +** Messages from multiple servers will not go to the currently active
 +buffer.  The messages from each server will be contained in the most
 +recently active channel/server buffer that corresponds with the
 +server.
 +
 +** Some text messages were cleaned up slightly.
 +
 +** Button faces should no longer "cover" other faces.
 +
 +** Made some XEmacs compatibility fixes.
 +
 +** Nicknames containing a backslash are now correctly highlighted as
 +current-nick and buttonized as nicks.
 +
 +** `erc-server-select' doesn't offer networks without servers as a
 +choice anymore.
 +
 +** Non-ASCII character support has been improved.
 +
 +** Changes and additions to modules
 +
 +*** Menu (erc-menu.el)
 +
 +**** You can now save logs and truncate buffers from the menu-bar.
 +
 +* Changes in ERC 5.0.1
 +
 +** Narrowing in ERC buffers no longer causes formatting errors.
 +
 +** The BBDB module now loads correctly when customizing `erc-modules'.
 +
 +** The value of `erc-button-face' is now respected.
 +
 +** Fixed a bug which caused a read-only error during connection.
 +
 +** Server buffers are now tracked correctly.
 +This means that `erc-track-priority-faces-only', `erc-track-exclude',
 +and `erc-track-exclude-types' now work with server buffers.
 +
 +* Changes in ERC 5.0
 +
 +** Channel members are now stored as a hash-table.
 +`erc-server-users' and `erc-channel-users' are now hash-tables, rather
 +than alists.  This significantly increases performance, especially in
 +large channels.  Each channel member is stored as an `erc-server-user'
 +struct, with additional information about the channels they are on
 +stored in an `erc-channel-user' struct.  Code using old alist-style
 +channel members needs to be updated to work with hash-tables.
 +This new code also removes the need for erc-members.el, which has been
 +removed.
 +
 +** The way ERC deals with input from the server has changed.
 +All server response code is now in a new file, erc-backend.el.  There
 +should be no real user visible changes.  There are, however, a few
 +major changes for implementers, and module writers:
 +
 +*** The PARSED response that all handlers get called with is
 +    no longer a vector, but an `erc-response' struct.
 +
 +    This means LESS MAGIC NUMBERS in the ERC source code, but a few
 +    changes in how you get at parsed responses.
 +
 +    The sender is accessed via `erc-response.sender'.
 +
 +    The command is accessed via `erc-response.command'.
 +
 +    The arguments to the command (everything after the command and
 +    before the colon) are accessed via `erc-response.command-args'.
 +    This is a /list/ of arguments in the order they appear in the
 +    unparsed response.
 +
 +    The contents of the response is accessed via
 +    `erc-response.contents'.
 +
 +    Should, for some reason, you want to do something with the
 +    /unparsed/ response, you can get it via `erc-response.unparsed'.
 +
 +*** The `erc-server-hook-list' mechanism is gone.
 +
 +    All server response handlers should be defined with
 +    `define-erc-response-handler'.  This defines functions and
 +    corresponding hook variables.
 +
 +    The mapping of server commands to hook variables is no longer
 +    done via `erc-event-to-hook', but through an #'equal hashtable,
 +    `erc-server-responses'.  In order to find a hook you do:
 +
 +    (erc-get-hook command)
 +
 +    See the docstring of `define-erc-response-handler' for more
 +    information.
 +
 +*** ALL hook variables have been renamed.
 +
 +    In accordance with recommendations in the Emacs Lisp manual,
 +    the hook variables are no longer called `erc-server-FOO-hook',
 +    but rather `erc-server-FOO-functions'.  This is to indicate
 +    that the functions they call take arguments.
 +
 +    All the modules in ERC have been updated to reflect this change,
 +    but external module authors should beware.
 +
 +** The values of `erc-mode-line-format' and `erc-header-line-format'
 +are now defined as strings to be formatted using `format-spec'.
 +`erc-mode-line-format' does not replace the whole mode-line anymore,
 +only `mode-line-buffer-identification' is set.  This way, personal
 +mode-line configurations are not modified and all key bindings work as
 +expected.  The process status (connecting, closed) is now shown in
 +`mode-line-process'.
 +
 +** Customization of ERC variables has been made easier.  Variables
 +have been split into more groups for better organization.
 +
 +** New variables
 +
 +  o `erc-send-whitespace-lines' - Set this to send lines even if they
 +    are empty.
 +
 +  o `erc-manual-set-nick-on-bad-nick-p' - If the nickname you chose is
 +    already taken or not allowed, your nick is not changed and you can
 +    try again manually if this is non-nil.
 +
 +  o `erc-mode-line-away-status-format' - You can now set what is shown
 +    in the mode-line when you are away.
 +
 +  o `erc-header-line-uses-help-echo-p' - The header-line now uses the
 +    help-echo property. You can set this to nil to disable it.
 +
 +  o `erc-format-query-as-channel-p' - Set this to nil to have messages
 +    in the query buffer formatted like private messages.
 +
 +  o `erc-show-channel-key-p' - The channel key is now shown with the
 +    other channel modes in the header line. Set this to nil if you
 +    want it hidden.
 +
 +  o `erc-prompt-for-channel-key' - Set this if you want to be prompted
 +    for the channel key (channel's mode is +k) when you call
 +    `erc-join-channel' interactively.
 +
 +  o `erc-kill-server-buffer-on-quit' - If non-nil, kill the server
 +    buffer automatically when you quit.
 +
 +** New hooks
 +
 +  o `erc-join-hook' - Called when you join a channel.
 +
 +  o `erc-kick-hook' - Called when you are kicked from a channel. The
 +    channel's buffer is sent as an argument to functions called from
 +    this hook.
 +
 +  o `erc-nick-changed-functions' - Whenever your nickname changes
 +    successfully, the functions in this hook are run with the
 +    arguments NEW-NICK and OLD-NICK.
 +
 +** New command /WHOAMI - Do a /WHOIS on your current nickname.
 +
 +** The key binding for changing channel modes is now C-c C-o.
 +
 +** Removed variables
 +
 +  o `erc-echo-notices-in-minibuffer-flag' and
 +    `erc-echo-notices-in-current-buffer' - You should use
 +    `erc-echo-notice-hook' and `erc-echo-notice-always-hook' instead.
 +
 +  o `erc-prompt-interactive-input' has been removed (commented out)
 +    because nickname completion does not work with it.
 +
 +  o All INFO buffer-related variables and functions have been removed.
 +
 +** You can now disable modules by setting `erc-modules' with the
 +customization interface.
 +
 +** Changes and additions to modules
 +
 +*** Autoaway (erc-autoaway.el)
 +
 +**** New variable `erc-autoaway-no-auto-back-regexp' - Add text which,
 +when you type anything matching it, will not automatically discard
 +your away status when `erc-auto-discard-away' is non-nil.
 +
 +*** Filling (erc-fill.el)
 +
 +**** New variable `erc-fill-variable-maximum-indentation' - Don't
 +indent more than this many characters when indenting a message from a
 +user with a long nickname.
 +
 +*** Goodies (erc-goodies.el)
 +
 +**** Miscellaneous small modules have been moved from erc.el.
 +The functions erc-add-scroll-to-bottom, erc-make-read-only,
 +erc-send-distinguish-noncommands, erc-interpret-controls, erc-unmorse,
 +erc-smiley, and erc-occur, which were defined in the main erc.el file
 +have been moved to erc-goodies.el and have mostly been translated to
 +the modules scrolltobottom, readonly, noncommands, irccontrols, smiley
 +and unmorse.
 +
 +**** New variables
 +
 +  o `erc-input-line-position' - The line number to use with
 +    `erc-scroll-to-bottom'.
 +
 +  o `erc-beep-p' - Beep if there is a \C-g control character in a
 +    message.
 +
 +*** Channel lists (erc-list.el)
 +
 +**** New variable `erc-chanlist-highlight-face' - A face used for
 +highlighting the current line.
 +
 +*** Highlighting (erc-match.el)
 +
 +**** `erc-current-nick-highlight-type' has new options: 'keyword and
 +'nick-or-keyword.
 +
 +*** Menu (erc-menu.el)
 +
 +**** The `IRC' menu is now automatically added to `erc-mode' buffers.
 +
 +*** Networks (erc-nets.el)
 +
 +**** The functions for determining current network are in this file.
 +There were a couple of functions spread about in different files which
 +each had a different way of determining the current network.  The
 +methods have been combined, and the big list of known networks
 +(`erc-networks-alist') is being put to use.  You can access the
 +network's name by calling the new function `erc-network'.  This
 +returns the name of the current network as a symbol or 'Unknown if it
 +could not determine which network it is.
 +
 +*** Nicklist (erc-nicklist.el)
 +
 +**** ERC has a new way of displaying nicknames in a channel.
 +The new file erc-nicklist.el defines a new command `erc-nicklist'
 +which pops up a small Emacs window showing the nicknames of all
 +members of the current channel.  The implementation is not complete
 +and is rather proof-of-concept for now.  The result is something a bit
 +like erc-speedbar, but not quite as invasive, and doesn't require use
 +of a new frame.
 +
 +*** Internet services / Nickserv (erc-nickserv.el)
 +
 +**** Network detection is now taken care of by erc-nets.el.
 +The function `erc-current-network' is deprecated, use `erc-network'
 +instead.  The variable `erc-networks' has been removed, use
 +`erc-networks-alist'.  The network symbols used in
 +`erc-nickserv-alist' now match those in `erc-networks-alist'.
 +
 +**** New variable `erc-nickserv-identify-mode' - Choose which method
 +to use for automatic identification: you can wait for Nickserv to ask
 +you to identify (the default), or send an identify message
 +automatically after you change your nickname.
 +
 +*** Speedbar (erc-speedbar.el)
 +
 +**** New variable `erc-speedbar-sort-users-type' - Sort users in a
 +channel by activity, alphabetically, or not at all.
 +
 +*** Timestamps (erc-stamp.el)
 +
 +**** `erc-timestamp-only-if-changed-flag' now works when
 +`erc-insert-timestamp-function' is set to 'erc-insert-timestamp-left.
 +
 +**** New variable `erc-timestamp-intangible' - Set this to nil if
 +timestamps should not have the 'intangible property.
 +
 +*** Channel tracking (erc-track.el)
 +
 +**** Using faces to indicate channel activity in the modeline now works
 +in XEmacs.
 +
 +**** New variables
 +
 +  o `erc-track-priority-faces-only' - Ignore changes in a channel
 +    unless there is a face from the `erc-track-faces-priority-list' in
 +    the message.
 +
 +  o `erc-track-exclude-server-buffer' - Ignore changes in the server
 +    buffer.
 +
 +  o `erc-track-position-in-mode-line' - Set the position in the
 +    mode-line where modified channels are shown (only works in GNU
 +    Emacs versions above 21.3).
 +
 +* Changes in ERC 4.0
 +
 +** The module system has again changed a lot.  You can now customize
 +  the variable `erc-modules' and define once and for all which
 +  extension modules you want to use.  This unfortunately may require
 +  you to change your current erc initialisation code a bit, if you
 +  have some existing customsations.  On the other hand, this change
 +  makes the configuration of extension modules a lot easier for new
 +  users.  In theory, you should be able to configure all aspects of
 +  ERC by using the customize interface, you should no longer really
 +  need to write Lisp code for trivial customizations.
 +
 +  By default, the following modules are now loaded: (pcomplete
 +  netsplit fill track ring button autojoin)
 +
 +  Please use M-x customize-variable RET erc-modules RET to change the
 +  default if it does not suite your needs.
 +
 +** THe symbol used in `erc-nickserv-passwords' for debian.org IRC servers
 +  (formerly called OpenProjects, now FreeNode) has changed from
 +  openprojects to freenode.  You may need to update your configuration
 +  for a successful automatic nickserv identification.
 +
 +* Changes in ERC 3.0.cvs.20030119
 +
 +** New module erc-dcc:
 +
 +This finally implements DCC.  It requires server sockets to fully work
 +in both directions.  This feature is currently only available in Emacs
 +21.3.50 (CVS). Here is a short list of what should work though.
 +
 +** Compatibility:
 +  * Emacs 21.2, DCC get, and accepting DCC chat offers.
 +  * XEmacs 21, Only accepting DCC chat offers.
 +
 +** erc is switching to global-minor-modes for activation of submodules.
 +
 +This allows you to customize such a mode and get automatic loading of
 +the module.  No longer putting a lot of require statments in .emacs.
 +At least this is the long-term plan, not all modules are converted
 +yet.
 +
 +** The most important user visible change is that you now need to activate
 +erc-completion-mode, to get TAB completion.  The new completion code
 +is based on pcomplete.  To get the old code, manually load
 +erc-complete and bind TAB to erc-complete in erc-mode-map.
 +
 +To activate completion on startup, put (erc-completion-mode 1) in your
 +.emacs file.
 +
 +Same applies to timestamps.  You no longer need to (require
 +'erc-stamp), you can customize the variable `erc-timestamp-mode', and
 +the rest should be automatic.
 +
++
++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 2, 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.
++
 +arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1



From MAILER-DAEMON Sun Oct 28 21:08:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ImJ6v-0002jP-VQ
	for mharc-erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ImJ6u-0002gU-AG
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ImJ6t-0002ev-F2
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ImJ6t-0002ei-24
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:07 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1ImJ6s-0003e5-NN
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:06 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ImJ8p-00057p-Vb
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:10:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ImJ8p-00057p-Vb@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 28 Oct 2007 21:10:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] erc-ibuffer: Readjust fix of compiler
	warning
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, 29 Oct 2007 01:08:08 -0000

commit e45b7299ab6dd9a1c80ddb9467470f8822c1cd6f
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Oct 28 20:52:56 2007 -0400

    erc-ibuffer: Readjust fix of compiler warning
    
    * erc-ibuffer.el (erc-modified-channels-alist): Use eval-when-compile,
      and explain why we are doing this..

diff --git a/ChangeLog b/ChangeLog
index 7da98e6..f8667e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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..
+
 	* erc-track.el: Make sure that the state of erc-track-minor-mode
 	is not preserved when using desktop.el.  Thanks to Levin for the
 	report.
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index e4de3c1..76c2d2b 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -71,7 +71,9 @@
 	 (string-match qualifier (or erc-server-announced-name
 				     erc-session-server)))))
 
-(defvar erc-modified-channels-alist)
+;; Silence the byte-compiler
+(eval-when-compile
+  (defvar erc-modified-channels-alist))
 
 (define-ibuffer-column erc-modified (:name "M")
   (if (and (boundp 'erc-track-mode)



From MAILER-DAEMON Sun Oct 28 21:08:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ImJ6w-0002jb-2z
	for mharc-erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ImJ6u-0002gV-9T
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ImJ6t-0002ez-FC
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ImJ6t-0002ej-26
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:07 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1ImJ6s-0003e3-MR
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:06 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ImJ8p-00057N-SX
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:10:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ImJ8p-00057N-SX@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 28 Oct 2007 21:10:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] erc-track: Fix buggy interaction with
	desktop.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: Mon, 29 Oct 2007 01:08:08 -0000

commit a4c556486d31d946e6d4d485838fd528c122ee4a
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Oct 28 20:49:59 2007 -0400

    erc-track: Fix buggy interaction with desktop.el
    
    * erc-track.el: Make sure that the state of erc-track-minor-mode is not
      preserved when using desktop.el.  Thanks to Levin for the report.

diff --git a/ChangeLog b/ChangeLog
index d6d6d40..7da98e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-track.el: Make sure that the state of erc-track-minor-mode
+	is not preserved when using desktop.el.  Thanks to Levin for the
+	report.
+
 2007-10-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* erc-ibuffer.el (erc-modified-channels-alist): Pacify
diff --git a/erc-track.el b/erc-track.el
index ad3eaf7..61d56c9 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -560,6 +560,8 @@ module, otherwise the keybindings will not do anything useful."
   :global t
   :group 'erc-track)
 
+(add-to-list 'desktop-minor-mode-table '(erc-track-minor-mode nil))
+
 (defun erc-track-minor-mode-maybe ()
   "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'."
   (unless (or erc-track-minor-mode



From MAILER-DAEMON Sun Oct 28 21:08:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ImJ6w-0002jw-61
	for mharc-erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ImJ6u-0002gR-Ac
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ImJ6t-0002f3-Er
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ImJ6t-0002ek-2H
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:07 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1ImJ6s-0003e1-OO
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:08:06 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ImJ8p-00056u-Os
	for erc-commit@gnu.org; Sun, 28 Oct 2007 21:10:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ImJ8p-00056u-Os@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 28 Oct 2007 21:10:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6
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: Mon, 29 Oct 2007 01:08:08 -0000

commit affec1d95625e08ae27f3b924c1cd2d2f4ff4927
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Oct 28 20:42:40 2007 -0400

    Sync from Emacs

diff --git a/ChangeLog b/ChangeLog
index c8a7c99..d6d6d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index ae256b8..e4de3c1 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -71,6 +71,8 @@
 	 (string-match qualifier (or erc-server-announced-name
 				     erc-session-server)))))
 
+(defvar erc-modified-channels-alist)
+
 (define-ibuffer-column erc-modified (:name "M")
   (if (and (boundp 'erc-track-mode)
 	   erc-track-mode)
diff --git a/erc-track.el b/erc-track.el
index 1408adc..ad3eaf7 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -701,17 +701,17 @@ ARGS are ignored."
   (unless erc-modified-channels-update-inside
     (let ((erc-modified-channels-update-inside t)
 	  (removed-channel nil))
-      (mapcar (lambda (elt)
-		(let ((buffer (car elt)))
-		  (when (or (not (bufferp buffer))
-			    (not (buffer-live-p buffer))
-			    (erc-buffer-visible buffer)
-			    (and erc-track-remove-disconnected-buffers
-			    (not (with-current-buffer buffer
-					erc-server-connected))))
-		    (setq removed-channel t)
-		    (erc-modified-channels-remove-buffer buffer))))
-	      erc-modified-channels-alist)
+      (mapc (lambda (elt)
+	      (let ((buffer (car elt)))
+		(when (or (not (bufferp buffer))
+			  (not (buffer-live-p buffer))
+			  (erc-buffer-visible buffer)
+			  (and erc-track-remove-disconnected-buffers
+			       (not (with-current-buffer buffer
+				      erc-server-connected))))
+		  (setq removed-channel t)
+		  (erc-modified-channels-remove-buffer buffer))))
+	    erc-modified-channels-alist)
       (when removed-channel
       (erc-modified-channels-display)
 	(force-mode-line-update t)))))



From MAILER-DAEMON Mon Oct 29 20:48:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ImfH5-0007c5-J2
	for mharc-erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ImfH3-0007bI-Qq
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ImfH2-0007aO-JH
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ImfH2-0007a1-8H
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:04 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1ImfH1-00038i-P7
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:03 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ImfJ0-0002Ko-AE
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:50:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ImfJ0-0002Ko-AE@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Mon, 29 Oct 2007 20:50:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] Revert "erc-track: Fix buggy
	interaction with desktop.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: Tue, 30 Oct 2007 00:48:06 -0000

commit aa1f9a9f82fc10781e22b2c70409aa2dce566d5f
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Mon Oct 29 20:43:44 2007 -0400

    Revert "erc-track: Fix buggy interaction with desktop.el"
    
    It was causing problems with non-desktop users.  People should just do
    this workaround in their own config.
    
    This reverts commit a4c556486d31d946e6d4d485838fd528c122ee4a.

diff --git a/ChangeLog b/ChangeLog
index dac0b51..24e7e71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,10 +3,6 @@
 	* erc-ibuffer.el (erc-modified-channels-alist): Use
 	eval-when-compile, and explain why we are doing this.
 
-	* erc-track.el: Make sure that the state of erc-track-minor-mode
-	is not preserved when using desktop.el.  Thanks to Levin for the
-	report.
-
 2007-10-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* erc-ibuffer.el (erc-modified-channels-alist): Pacify
diff --git a/erc-track.el b/erc-track.el
index 61d56c9..ad3eaf7 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -560,8 +560,6 @@ module, otherwise the keybindings will not do anything useful."
   :global t
   :group 'erc-track)
 
-(add-to-list 'desktop-minor-mode-table '(erc-track-minor-mode nil))
-
 (defun erc-track-minor-mode-maybe ()
   "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'."
   (unless (or erc-track-minor-mode



From MAILER-DAEMON Mon Oct 29 20:48:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ImfH6-0007db-Mn
	for mharc-erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ImfH4-0007bR-Qz
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ImfH2-0007aI-I5
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ImfH2-0007a6-9M
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:04 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1ImfH1-00038g-PT
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:48:03 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ImfJ0-0002KN-7F
	for erc-commit@gnu.org; Mon, 29 Oct 2007 20:50:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ImfJ0-0002KN-7F@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Mon, 29 Oct 2007 20:50:06 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] ChangeLog: Fix typo
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, 30 Oct 2007 00:48:07 -0000

commit 0b55a86256aa3a8c069da853ae75e3f117c9dafe
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Sun Oct 28 21:21:43 2007 -0400

    ChangeLog: Fix typo

diff --git a/ChangeLog b/ChangeLog
index f8667e6..dac0b51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 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..
+	eval-when-compile, and explain why we are doing this.
 
 	* erc-track.el: Make sure that the state of erc-track-minor-mode
 	is not preserved when using desktop.el.  Thanks to Levin for the



From MAILER-DAEMON Wed Oct 31 21:23:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1InOhR-0004KZ-VM
	for mharc-erc-commit@gnu.org; Wed, 31 Oct 2007 21:18:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1InOhJ-0004BW-EH
	for erc-commit@gnu.org; Wed, 31 Oct 2007 21:18:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1InOhB-00043f-Sh
	for erc-commit@gnu.org; Wed, 31 Oct 2007 21:18:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1InOhA-00042I-P8
	for erc-commit@gnu.org; Wed, 31 Oct 2007 21:18:05 -0400
Received: from fyodor.hcoop.net ([64.20.38.170])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@hcoop.net>) id 1InOhA-0001u2-9q
	for erc-commit@gnu.org; Wed, 31 Oct 2007 21:18:04 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1InOj9-0005eH-7r
	for erc-commit@gnu.org; Wed, 31 Oct 2007 21:20:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1InOj9-0005eH-7r@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Wed, 31 Oct 2007 21:20:07 -0400
X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6
Subject: [Erc-commit] [commit][master] Fix some byte-compiler warnings
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, 01 Nov 2007 01:18:15 -0000

commit d65e9d7dd24ca25439f4fa00e976b52d5f883c83
Author: Michael W. Olson <mwolson@gnu.org>
Date:   Wed Oct 31 21:08:45 2007 -0400

    Fix some byte-compiler warnings
    
    * 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.

diff --git a/ChangeLog b/ChangeLog
index 24e7e71..97d5100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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
diff --git a/erc-compat.el b/erc-compat.el
index 672b11e..626d812 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -208,6 +208,19 @@ one is kept."
       ((fboundp 'replace-in-string)
        (defun erc-replace-regexp-in-string (regexp rep string &optional fixedcase literal)
          (replace-in-string string regexp rep literal))))
+
+;;; Several different Emacsen have different variables for setting
+;;; write hooks.
+(cond ((boundp 'write-file-functions)
+       (defun erc-set-write-file-functions (new-val)
+	 (set (make-local-variable 'write-file-functions) new-val)))
+      ((boundp 'local-write-file-hooks)
+       (defun erc-set-write-file-functions (new-val)
+	 (setq local-write-file-hooks new-val)))
+      (t
+       (defun erc-set-write-file-functions (new-val)
+	 (set (make-local-variable 'write-file-hooks) new-val))))
+
 ;;; Done!
 
 ;; XEmacs has a string representation of the build time.  It's
diff --git a/erc-log.el b/erc-log.el
index 7ea3c63..8b5e07a 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -268,14 +268,7 @@ The current buffer is given by BUFFER."
     (with-current-buffer buffer
       (auto-save-mode -1)
       (setq buffer-file-name nil)
-      (cond ((boundp 'write-file-functions)
-	     (set (make-local-variable 'write-file-functions)
-		  '(erc-save-buffer-in-logs)))
-	    ((boundp 'local-write-file-hooks)
-	     (setq local-write-file-hooks '(erc-save-buffer-in-logs)))
-	    (t
-	     (set (make-local-variable 'write-file-hooks)
-		  '(erc-save-buffer-in-logs))))
+      (erc-set-write-file-functions '(erc-save-buffer-in-logs))
       (when erc-log-insert-log-on-open
 	(ignore-errors (insert-file-contents (erc-current-logfile))
 		       (move-marker erc-last-saved-position
diff --git a/erc-stamp.el b/erc-stamp.el
index 3b7f5ba..64b0405 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -264,6 +264,10 @@ property to get to the POSth column."
 		       (list 'space ':align-to pos)))
   (insert string))
 
+;; Silence byte-compiler
+(eval-when-compile
+  (defvar erc-fill-column))
+
 (defun erc-insert-timestamp-right (string)
   "Insert timestamp on the right side of the screen.
 STRING is the timestamp to insert.  The function is a possible value
diff --git a/erc.el b/erc.el
index 18efee6..2b6494c 100644
--- a/erc.el
+++ b/erc.el
@@ -1680,13 +1680,16 @@ nil."
   ;; Make the evaluation have the correct order
   (let ((pre (make-symbol "pre"))
 	(pro (make-symbol "pro")))
-    `(let ((,pro ,process)
-	   (,pre ,pred))
-       (mapcar (lambda (buffer)
-		 (with-current-buffer buffer
-		   ,@forms))
-	       (erc-buffer-list ,pre
-				,pro)))))
+    `(let* ((,pro ,process)
+	    (,pre ,pred)
+	    (res (mapcar (lambda (buffer)
+			   (with-current-buffer buffer
+			     ,@forms))
+			 (erc-buffer-list ,pre
+					  ,pro))))
+       ;; Silence the byte-compiler by binding the result of mapcar to
+       ;; a variable.
+       res)))
 (put 'erc-with-all-buffers-of-server 'lisp-indent-function 1)
 (put 'erc-with-all-buffers-of-server 'edebug-form-spec '(form form body))
 



