From MAILER-DAEMON Sun Sep 02 21:38:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IS0tw-0005AE-VA
	for mharc-erc-commit@gnu.org; Sun, 02 Sep 2007 21:38:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IS0tu-00059a-Ki
	for erc-commit@gnu.org; Sun, 02 Sep 2007 21:38:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IS0tt-00059C-6C
	for erc-commit@gnu.org; Sun, 02 Sep 2007 21:38:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IS0tt-000595-1r
	for erc-commit@gnu.org; Sun, 02 Sep 2007 21:38:49 -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 1IS0ts-0006gM-MU
	for erc-commit@gnu.org; Sun, 02 Sep 2007 21:38:48 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IS0vB-0002gk-1b
	for erc-commit@gnu.org; Sun, 02 Sep 2007 21:40:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IS0vB-0002gk-1b@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 02 Sep 2007 21:40:09 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Mon, 03 Sep 2007 01:38:50 -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 Sep 02 22:28:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IS1gJ-0005Cu-3o
	for mharc-erc-commit@gnu.org; Sun, 02 Sep 2007 22:28:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IS1gH-0005Az-38
	for erc-commit@gnu.org; Sun, 02 Sep 2007 22:28:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IS1gF-00059k-U8
	for erc-commit@gnu.org; Sun, 02 Sep 2007 22:28:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IS1gF-00059K-Lf
	for erc-commit@gnu.org; Sun, 02 Sep 2007 22:28:47 -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 1IS1gF-0006S4-Cf
	for erc-commit@gnu.org; Sun, 02 Sep 2007 22:28:47 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IS1hX-0005Vx-N3
	for erc-commit@gnu.org; Sun, 02 Sep 2007 22:30:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IS1hX-0005Vx-N3@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 02 Sep 2007 22:30:07 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Mon, 03 Sep 2007 02:28:49 -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 Fri Sep 07 23:38:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ITr9v-0006Bo-C6
	for mharc-erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ITr9t-00069Z-LN
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ITr9r-00067p-QV
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ITr9r-00067h-Nq
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:55 -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 1ITr9r-0004g8-CA
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:55 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ITrB9-0001VX-TZ
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:40:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ITrB9-0001VX-TZ@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Fri, 07 Sep 2007 23:40:15 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Sat, 08 Sep 2007 03:38:57 -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 Fri Sep 07 23:39:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ITr9w-0006DC-Ff
	for mharc-erc-commit@gnu.org; Fri, 07 Sep 2007 23:39:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ITr9u-0006Av-O4
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ITr9s-00068B-8V
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ITr9r-00067m-Pg
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:55 -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 1ITr9r-0004g6-Bg
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:55 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ITrB9-0001V0-9a
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:40:15 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ITrB9-0001V0-9a@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Fri, 07 Sep 2007 23:40:15 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Sat, 08 Sep 2007 03:38:59 -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 Fri Sep 07 23:39:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ITr9x-0006EZ-KZ
	for mharc-erc-commit@gnu.org; Fri, 07 Sep 2007 23:39:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ITr9v-0006CG-LM
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ITr9s-000682-0q
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ITr9r-00067v-SE
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:55 -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 1ITr9r-0004gA-Jh
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:38:55 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ITrBA-0001W2-Da
	for erc-commit@gnu.org; Fri, 07 Sep 2007 23:40:16 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ITrBA-0001W2-Da@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Fri, 07 Sep 2007 23:40:16 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Sat, 08 Sep 2007 03:38:59 -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 Sat Sep 08 00:09:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ITrdG-0004fG-Cz
	for mharc-erc-commit@gnu.org; Sat, 08 Sep 2007 00:09:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ITrdE-0004cx-NV
	for erc-commit@gnu.org; Sat, 08 Sep 2007 00:09:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ITrdD-0004bh-Px
	for erc-commit@gnu.org; Sat, 08 Sep 2007 00:09:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ITrdD-0004bR-Fi
	for erc-commit@gnu.org; Sat, 08 Sep 2007 00:09:15 -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 1ITrdD-0000OS-6I
	for erc-commit@gnu.org; Sat, 08 Sep 2007 00:09:15 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ITreU-0003kj-1j
	for erc-commit@gnu.org; Sat, 08 Sep 2007 00:10:34 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ITreU-0003kj-1j@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sat, 08 Sep 2007 00:10:34 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Sat, 08 Sep 2007 04:09:17 -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 Sat Sep 08 02:28:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ITtoP-0001kx-7c
	for mharc-erc-commit@gnu.org; Sat, 08 Sep 2007 02:28:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1ITtoM-0001h1-DF
	for erc-commit@gnu.org; Sat, 08 Sep 2007 02:28:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1ITtoJ-0001dm-Ji
	for erc-commit@gnu.org; Sat, 08 Sep 2007 02:28:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ITtoJ-0001da-AQ
	for erc-commit@gnu.org; Sat, 08 Sep 2007 02:28:51 -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 1ITtoJ-0000vI-3M
	for erc-commit@gnu.org; Sat, 08 Sep 2007 02:28:51 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1ITtpb-0006IP-S4
	for erc-commit@gnu.org; Sat, 08 Sep 2007 02:30:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1ITtpb-0006IP-S4@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sat, 08 Sep 2007 02:30:11 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Sat, 08 Sep 2007 06:28:55 -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 Sep 09 21:18:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IUXvR-0006pm-2p
	for mharc-erc-commit@gnu.org; Sun, 09 Sep 2007 21:18:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IUXvP-0006nn-PZ
	for erc-commit@gnu.org; Sun, 09 Sep 2007 21:18:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IUXvN-0006kS-Pp
	for erc-commit@gnu.org; Sun, 09 Sep 2007 21:18:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IUXvN-0006kG-Mg
	for erc-commit@gnu.org; Sun, 09 Sep 2007 21:18:49 -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 1IUXvN-0007pc-BH
	for erc-commit@gnu.org; Sun, 09 Sep 2007 21:18:49 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IUXwd-0007LN-0v
	for erc-commit@gnu.org; Sun, 09 Sep 2007 21:20:07 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IUXwd-0007LN-0v@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 09 Sep 2007 21:20:07 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Mon, 10 Sep 2007 01:18:52 -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 Mon Sep 10 13:48:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IUnNR-0001uc-DS
	for mharc-erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IUnNQ-0001u3-5e
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IUnNO-0001tH-Jo
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IUnNO-0001tE-FF
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:46 -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 1IUnNN-00008f-VA
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:46 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IUnOg-0003sO-IV
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:50:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IUnOg-0003sO-IV@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Mon, 10 Sep 2007 13:50:06 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Mon, 10 Sep 2007 17:48:48 -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 Mon Sep 10 13:48:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IUnNR-0001up-JK
	for mharc-erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IUnNP-0001tv-Ta
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IUnNO-0001t9-CL
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IUnNO-0001t6-97
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:46 -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 1IUnNN-00008h-Us
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:48:46 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IUnOg-0003rt-Bn
	for erc-commit@gnu.org; Mon, 10 Sep 2007 13:50:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IUnOg-0003rt-Bn@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Mon, 10 Sep 2007 13:50:06 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Mon, 10 Sep 2007 17:48:48 -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 Tue Sep 11 18:18:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IVE4E-000609-JH
	for mharc-erc-commit@gnu.org; Tue, 11 Sep 2007 18:18:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IVE4D-0005zr-LY
	for erc-commit@gnu.org; Tue, 11 Sep 2007 18:18:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IVE4C-0005z8-1r
	for erc-commit@gnu.org; Tue, 11 Sep 2007 18:18:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IVE4B-0005z2-Sz
	for erc-commit@gnu.org; Tue, 11 Sep 2007 18:18:43 -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 1IVE4B-0006bO-Ly
	for erc-commit@gnu.org; Tue, 11 Sep 2007 18:18:43 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IVE5W-0007GR-Ev
	for erc-commit@gnu.org; Tue, 11 Sep 2007 18:20:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IVE5W-0007GR-Ev@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Tue, 11 Sep 2007 18:20:06 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Tue, 11 Sep 2007 22:18:45 -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 Sep 16 16:28:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IX0jS-0005hY-C5
	for mharc-erc-commit@gnu.org; Sun, 16 Sep 2007 16:28:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IX0jQ-0005hK-R9
	for erc-commit@gnu.org; Sun, 16 Sep 2007 16:28:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IX0jP-0005gP-7q
	for erc-commit@gnu.org; Sun, 16 Sep 2007 16:28:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IX0jP-0005gM-1v
	for erc-commit@gnu.org; Sun, 16 Sep 2007 16:28:39 -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 1IX0jO-0006pO-QZ
	for erc-commit@gnu.org; Sun, 16 Sep 2007 16:28:38 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IX0ko-0006Sp-2z
	for erc-commit@gnu.org; Sun, 16 Sep 2007 16:30:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IX0ko-0006Sp-2z@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 16 Sep 2007 16:30:06 -0400
X-Detected-Kernel: Linux 2.4-2.6
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, 16 Sep 2007 20:28:41 -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 Tue Sep 18 14:38:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IXhy7-00020E-Rt
	for mharc-erc-commit@gnu.org; Tue, 18 Sep 2007 14:38:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IXhy6-0001zr-Bj
	for erc-commit@gnu.org; Tue, 18 Sep 2007 14:38:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IXhy4-0001yj-Ko
	for erc-commit@gnu.org; Tue, 18 Sep 2007 14:38:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IXhy4-0001yg-IB
	for erc-commit@gnu.org; Tue, 18 Sep 2007 14:38: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 1IXhy4-0000na-AL
	for erc-commit@gnu.org; Tue, 18 Sep 2007 14:38:40 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IXhzS-0005wV-QV
	for erc-commit@gnu.org; Tue, 18 Sep 2007 14:40:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IXhzS-0005wV-QV@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Tue, 18 Sep 2007 14:40:06 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Tue, 18 Sep 2007 18:38:42 -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 Tue Sep 18 15:38:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IXiuC-0007g0-C4
	for mharc-erc-commit@gnu.org; Tue, 18 Sep 2007 15:38:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IXiuA-0007dA-CT
	for erc-commit@gnu.org; Tue, 18 Sep 2007 15:38:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IXiu8-0007bT-Sf
	for erc-commit@gnu.org; Tue, 18 Sep 2007 15:38:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IXiu8-0007bM-Ko
	for erc-commit@gnu.org; Tue, 18 Sep 2007 15:38: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 1IXiu8-0001X0-C5
	for erc-commit@gnu.org; Tue, 18 Sep 2007 15:38:40 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IXivZ-0002Jo-EV
	for erc-commit@gnu.org; Tue, 18 Sep 2007 15:40:09 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IXivZ-0002Jo-EV@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Tue, 18 Sep 2007 15:40:09 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Tue, 18 Sep 2007 19:38:42 -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 Tue Sep 18 23:18:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IXq5L-0005kH-JJ
	for mharc-erc-commit@gnu.org; Tue, 18 Sep 2007 23:18:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IXq5J-0005jK-CR
	for erc-commit@gnu.org; Tue, 18 Sep 2007 23:18:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IXq5H-0005ir-OV
	for erc-commit@gnu.org; Tue, 18 Sep 2007 23:18:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IXq5H-0005io-L1
	for erc-commit@gnu.org; Tue, 18 Sep 2007 23:18:39 -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 1IXq5H-0004gB-Ge
	for erc-commit@gnu.org; Tue, 18 Sep 2007 23:18:39 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IXq6g-0008EE-Rp
	for erc-commit@gnu.org; Tue, 18 Sep 2007 23:20:06 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IXq6g-0008EE-Rp@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Tue, 18 Sep 2007 23:20:06 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Wed, 19 Sep 2007 03:18:42 -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 Wed Sep 19 07:19:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IXxa7-0000J4-RI
	for mharc-erc-commit@gnu.org; Wed, 19 Sep 2007 07:18:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IXxa6-0000Iz-Bz
	for erc-commit@gnu.org; Wed, 19 Sep 2007 07:18:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IXxa3-0000In-Vg
	for erc-commit@gnu.org; Wed, 19 Sep 2007 07:18:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IXxa3-0000Ik-PA
	for erc-commit@gnu.org; Wed, 19 Sep 2007 07:18:55 -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 1IXxa3-0000Xs-F3
	for erc-commit@gnu.org; Wed, 19 Sep 2007 07:18:55 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IXxbS-0006cE-NJ
	for erc-commit@gnu.org; Wed, 19 Sep 2007 07:20:22 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IXxbS-0006cE-NJ@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Wed, 19 Sep 2007 07:20:22 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Wed, 19 Sep 2007 11:18:58 -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 Fri Sep 21 06:38:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1IYfuP-0007Pd-47
	for mharc-erc-commit@gnu.org; Fri, 21 Sep 2007 06:38:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IYfuM-0007Nt-IF
	for erc-commit@gnu.org; Fri, 21 Sep 2007 06:38:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IYfuI-0007La-3w
	for erc-commit@gnu.org; Fri, 21 Sep 2007 06:38:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IYfuH-0007LP-Sp
	for erc-commit@gnu.org; Fri, 21 Sep 2007 06:38:45 -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 1IYfuH-0001PL-Lf
	for erc-commit@gnu.org; Fri, 21 Sep 2007 06:38:45 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1IYfvi-0000zz-A3
	for erc-commit@gnu.org; Fri, 21 Sep 2007 06:40:14 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1IYfvi-0000zz-A3@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Fri, 21 Sep 2007 06:40:14 -0400
X-Detected-Kernel: Linux 2.4-2.6
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: Fri, 21 Sep 2007 10:38:51 -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 Sep 30 13:38:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ic2kZ-0007ot-VM
	for mharc-erc-commit@gnu.org; Sun, 30 Sep 2007 13:38:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ic2kX-0007mP-Uv
	for erc-commit@gnu.org; Sun, 30 Sep 2007 13:38:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ic2kW-0007kT-KF
	for erc-commit@gnu.org; Sun, 30 Sep 2007 13:38:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ic2kW-0007kJ-86
	for erc-commit@gnu.org; Sun, 30 Sep 2007 13:38:36 -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 1Ic2kV-0000Wf-Ky
	for erc-commit@gnu.org; Sun, 30 Sep 2007 13:38:35 -0400
Received: from mwolson by fyodor.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@hcoop.net>) id 1Ic2m3-0007vj-O2
	for erc-commit@gnu.org; Sun, 30 Sep 2007 13:40:11 -0400
To: erc-commit@gnu.org
From: mwolson@gnu.org
Message-Id: <E1Ic2m3-0007vj-O2@fyodor.hcoop.net>
Sender: Michael Olson <mwolson@hcoop.net>
Date: Sun, 30 Sep 2007 13:40:11 -0400
X-Detected-Kernel: Linux 2.4-2.6
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, 30 Sep 2007 17:38:38 -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



