From MAILER-DAEMON Sat May 19 19:09:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HpY3S-0006J6-MH
	for mharc-erc-commit@gnu.org; Sat, 19 May 2007 19:09:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HpY3R-0006G0-4E
	for erc-commit@gnu.org; Sat, 19 May 2007 19:09:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HpY3Q-0006Ei-FU
	for erc-commit@gnu.org; Sat, 19 May 2007 19:09:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HpY3Q-0006EN-9P
	for erc-commit@gnu.org; Sat, 19 May 2007 19:09:40 -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 1HpY3P-0000f9-TO
	for erc-commit@gnu.org; Sat, 19 May 2007 19:09:40 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1HpY3o-00042p-TI
	for erc-commit@gnu.org; Sat, 19 May 2007 19:10:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1HpY3o-00042p-TI@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sat, 19 May 2007 19:10:04 -0400
X-detected-kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][erc--rel--5.2] 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: Sat, 19 May 2007 23:09:41 -0000

Revision: erc--rel--5.2--patch-19
Archive: erc@sv.gnu.org
Creator: Michael Olson <mwolson@gnu.org>
Date: Sat May 19 19:08:15 EDT 2007
Standard-date: 2007-05-19 23:08:15 GMT
New-files: .arch-ids/erc-pkg.el.id erc-pkg.el
Modified-files: ChangeLog Makefile
New-patches: erc@sv.gnu.org/erc--rel--5.2--patch-19
Summary: Make an ELPA package for ERC
Keywords: 

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.



From MAILER-DAEMON Sun May 20 20:39:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hpvw5-0004HV-EM
	for mharc-erc-commit@gnu.org; Sun, 20 May 2007 20:39:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hpvw4-0004HQ-OD
	for erc-commit@gnu.org; Sun, 20 May 2007 20:39:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hpvw2-0004HE-7n
	for erc-commit@gnu.org; Sun, 20 May 2007 20:39:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hpvw2-0004HB-4u
	for erc-commit@gnu.org; Sun, 20 May 2007 20:39:38 -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 1Hpvw1-00029m-S8
	for erc-commit@gnu.org; Sun, 20 May 2007 20:39:37 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1HpvwR-0003uJ-Kp
	for erc-commit@gnu.org; Sun, 20 May 2007 20:40:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1HpvwR-0003uJ-Kp@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 20 May 2007 20:40:03 -0400
X-detected-kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][erc--rel--5.2] 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: Mon, 21 May 2007 00:39:40 -0000

Revision: erc--rel--5.2--patch-20
Archive: erc@sv.gnu.org
Creator: Michael Olson <mwolson@gnu.org>
Date: Sun May 20 20:39:10 EDT 2007
Standard-date: 2007-05-21 00:39:10 GMT
Modified-files: ChangeLog Makefile
New-patches: erc@sv.gnu.org/erc--rel--5.2--patch-20
Summary: Makefile: Improve Debian package building
Keywords: 

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.



From MAILER-DAEMON Sun May 20 20:49:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hpw5n-00006h-4W
	for mharc-erc-commit@gnu.org; Sun, 20 May 2007 20:49:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hpw5l-0008Ui-M4
	for erc-commit@gnu.org; Sun, 20 May 2007 20:49:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hpw5k-0008Sb-6V
	for erc-commit@gnu.org; Sun, 20 May 2007 20:49:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hpw5j-0008Rs-W5
	for erc-commit@gnu.org; Sun, 20 May 2007 20:49:40 -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 1Hpw5j-0002k1-JP
	for erc-commit@gnu.org; Sun, 20 May 2007 20:49:39 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1Hpw68-0004Ei-R3
	for erc-commit@gnu.org; Sun, 20 May 2007 20:50:05 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1Hpw68-0004Ei-R3@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 20 May 2007 20:50:04 -0400
X-detected-kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][erc--rel--5.2] 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: Mon, 21 May 2007 00:49:41 -0000

Revision: erc--rel--5.2--patch-21
Archive: erc@sv.gnu.org
Creator: Michael Olson <mwolson@gnu.org>
Date: Sun May 20 20:45:40 EDT 2007
Standard-date: 2007-05-21 00:45:40 GMT
Modified-files: ChangeLog erc-nicklist.el
New-patches: erc@sv.gnu.org/erc--rel--5.2--patch-21
Summary: erc-nicklist: Use locate-library to find images dir
Keywords: 

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.



From MAILER-DAEMON Sun May 20 20:59:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HpwFS-0000QX-8F
	for mharc-erc-commit@gnu.org; Sun, 20 May 2007 20:59:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HpwFQ-0000QS-Pz
	for erc-commit@gnu.org; Sun, 20 May 2007 20:59:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HpwFO-0000QC-RD
	for erc-commit@gnu.org; Sun, 20 May 2007 20:59:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HpwFO-0000Q9-O0
	for erc-commit@gnu.org; Sun, 20 May 2007 20:59:38 -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 1HpwFO-0003ja-Cf
	for erc-commit@gnu.org; Sun, 20 May 2007 20:59:38 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1HpwFn-0004Z5-7E
	for erc-commit@gnu.org; Sun, 20 May 2007 21:00:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1HpwFn-0004Z5-7E@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 20 May 2007 21:00:03 -0400
X-detected-kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][erc--rel--5.2] 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: Mon, 21 May 2007 00:59:41 -0000

Revision: erc--rel--5.2--patch-22
Archive: erc@sv.gnu.org
Creator: Michael Olson <mwolson@gnu.org>
Date: Sun May 20 20:52:38 EDT 2007
Standard-date: 2007-05-21 00:52:38 GMT
Modified-files: ChangeLog Makefile
New-patches: erc@sv.gnu.org/erc--rel--5.2--patch-22
Summary: Include erc-nicklist.el and images in extras tarball
Keywords: 

2007-05-21  Michael Olson  <mwolson@gnu.org>

	* Makefile (EXTRAS): Add erc-nicklist.el, since it is not
        release-quality.
	(extras): Copy images directory.



From MAILER-DAEMON Sun May 20 21:09:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HpwP7-00061t-9D
	for mharc-erc-commit@gnu.org; Sun, 20 May 2007 21:09:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HpwP5-00061U-AY
	for erc-commit@gnu.org; Sun, 20 May 2007 21:09:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HpwP4-00061I-1d
	for erc-commit@gnu.org; Sun, 20 May 2007 21:09:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HpwP3-00061F-Rr
	for erc-commit@gnu.org; Sun, 20 May 2007 21:09:37 -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 1HpwP3-0004R5-CQ
	for erc-commit@gnu.org; Sun, 20 May 2007 21:09:37 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1HpwPT-000595-Oi
	for erc-commit@gnu.org; Sun, 20 May 2007 21:10:03 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1HpwPT-000595-Oi@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 20 May 2007 21:10:03 -0400
X-detected-kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][erc--main--0] 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: Mon, 21 May 2007 01:09:40 -0000

Revision: erc--main--0--patch-144
Archive: erc@sv.gnu.org
Creator: Michael Olson <mwolson@gnu.org>
Date: Sun May 20 21:05:22 EDT 2007
Standard-date: 2007-05-21 01:05:22 GMT
New-files: .arch-ids/erc-pkg.el.id erc-pkg.el
Modified-files: ChangeLog Makefile erc-nicklist.el
New-patches: erc@sv.gnu.org/erc--main--0--patch-144
    erc@sv.gnu.org/erc--rel--5.2--patch-19
    erc@sv.gnu.org/erc--rel--5.2--patch-20
    erc@sv.gnu.org/erc--rel--5.2--patch-21
    erc@sv.gnu.org/erc--rel--5.2--patch-22
Summary: Merged from erc--rel--5.2
Keywords: merge

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



From MAILER-DAEMON Mon May 28 16:59:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HsmJa-0006ss-U5
	for mharc-erc-commit@gnu.org; Mon, 28 May 2007 16:59:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HsmJZ-0006se-R1
	for erc-commit@gnu.org; Mon, 28 May 2007 16:59:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HsmJY-0006sS-D0
	for erc-commit@gnu.org; Mon, 28 May 2007 16:59:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HsmJY-0006sP-67
	for erc-commit@gnu.org; Mon, 28 May 2007 16:59:40 -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 1HsmJX-0001z4-RT
	for erc-commit@gnu.org; Mon, 28 May 2007 16:59:39 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1HsmJw-0003OT-UD
	for erc-commit@gnu.org; Mon, 28 May 2007 17:00:04 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1HsmJw-0003OT-UD@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Mon, 28 May 2007 17:00:04 -0400
X-detected-kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][erc--main--0] 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: Mon, 28 May 2007 20:59:42 -0000

Revision: erc--main--0--patch-145
Archive: erc@sv.gnu.org
Creator: Michael Olson <mwolson@gnu.org>
Date: Mon May 28 16:53:49 EDT 2007
Standard-date: 2007-05-28 20:53:49 GMT
Modified-files: ChangeLog erc-button.el
New-patches: erc@sv.gnu.org/erc--main--0--patch-145
Summary: erc-button: Allow parentheses in URLs
Keywords: 

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.



From MAILER-DAEMON Tue May 29 20:59:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HtCXW-0003eL-Lu
	for mharc-erc-commit@gnu.org; Tue, 29 May 2007 20:59:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HtCXU-0003eG-N6
	for erc-commit@gnu.org; Tue, 29 May 2007 20:59:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HtCXQ-0003e2-BO
	for erc-commit@gnu.org; Tue, 29 May 2007 20:59:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HtCXQ-0003dz-5u
	for erc-commit@gnu.org; Tue, 29 May 2007 20:59:44 -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 1HtCXP-0001Zc-Uo
	for erc-commit@gnu.org; Tue, 29 May 2007 20:59:44 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1HtCXm-0007hO-MT
	for erc-commit@gnu.org; Tue, 29 May 2007 21:00:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1HtCXm-0007hO-MT@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Tue, 29 May 2007 21:00:06 -0400
X-detected-kernel: Linux 2.4-2.6
Subject: [Erc-commit] [commit][erc--main--0] 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: Wed, 30 May 2007 00:59:49 -0000

Revision: erc--main--0--patch-146
Archive: erc@sv.gnu.org
Creator: Michael Olson <mwolson@gnu.org>
Date: Tue May 29 20:58:37 EDT 2007
Standard-date: 2007-05-30 00:58:37 GMT
Modified-files: ChangeLog erc-compat.el erc.el
New-patches: erc@sv.gnu.org/erc--main--0--patch-146
Summary: Figure out where user-specific Emacs settings are stored
Keywords: 

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.



