From MAILER-DAEMON Wed Sep 17 00:50:44 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kfp00-00036F-4O
	for mharc-erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kfozy-00035t-CF
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kfozw-00035h-RB
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:40 -0400
Received: from [199.232.76.173] (port=35137 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kfozw-00035e-KE
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:40 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:50879)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kfozw-0007Hn-Fb
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:40 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kfozv-0005Xu-9O
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:39 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kfozu-0000fC-49
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:38 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 16 Sep 2008 21:45:26 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kfozu-0000fC-49@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] Changelog pedanticness.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?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, 17 Sep 2008 04:50:42 -0000

---
 ChangeLog    |    7 +++----
 ChangeLog.02 |   10 +++++-----
 ChangeLog.03 |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9905e7f..f49748d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,11 +7,11 @@
 
 	* erc-backend.el (328): New response handler.
 
-	* erc.el (english): Added 328 to catalog.
+	* erc.el (english): Add 328 to catalog.
 
 2008-05-29  Diane Murray  <disumu@x3y2z1.net>
 
-	* erc-services.el (erc-nickserv-alist): Updated REGEXP and
+	* erc-services.el (erc-nickserv-alist): Update REGEXP and
 	SUCCESS-REGEXP for freenode.
 
 2008-05-05  Juanma Barranquero  <lekktu@gmail.com>
@@ -87,8 +87,7 @@
 	* erc-pkg.el: Make the version string a template.
 
 	* erc.texi (Obtaining ERC): Update extras URLs for 5.3.
-	(Development): Write instructions for git, and remove those for
-	Arch.
+	(Development): Write instructions for git, and remove those for Arch.
 	(History): Mention the switch to git.
 
 2008-01-25  Michael Olson  <mwolson@gnu.org>
diff --git a/ChangeLog.02 b/ChangeLog.02
index febdfd0..cf47994 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -162,7 +162,7 @@
 
 	* erc.el 1.384 (erc-truncate-buffer-on-save):
 	Removed documentation that
-	described behaviour now changed.  It used to say "When nil, no
+	described behavior 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.
@@ -1916,7 +1916,7 @@
 	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
+	* erc-complete.el 1.9: Fix for xemacs elt behavior
 
 2002-04-17  John Wiegley  <johnw@gnu.org>
 
@@ -1970,7 +1970,7 @@
 2002-04-11  Mario Lang  <mlang@delysid.org>
 
 	* erc-track.el 1.10:
-	try to fix behaviour when used with different frames.
+	try to fix behavior when used with different frames.
 
 2002-04-09  Mario Lang  <mlang@delysid.org>
 
@@ -2162,7 +2162,7 @@
 	* 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.el 1.222: fixed ctcp behavior abit (with auto-query on)
 
 	* erc-list.el 1.1: ChanList mode.
 	Load it, and type M-x erc-chanlist RET
@@ -2396,7 +2396,7 @@
 2002-01-30  Andreas Fuchs  <asf@void.at>
 
 	* erc.el 1.190:
-	* erc-send-current-line: fix behaviour where buffer changes.
+	* erc-send-current-line: fix behavior 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:
diff --git a/ChangeLog.03 b/ChangeLog.03
index f9a4c95..ddc8a56 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -1474,7 +1474,7 @@
 
 	* 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 ;-)
+	    messages, so we don't. fg color 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
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Sep 17 00:50:45 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kfp01-00036m-Ff
	for mharc-erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kfp00-00036E-3J
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kfozy-000361-Ux
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:43 -0400
Received: from [199.232.76.173] (port=35138 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kfozy-00035y-ME
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:42 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:50885)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kfozy-0007I1-Gw
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:42 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kfozx-0005YE-9S
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:41 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kfozw-0000g5-KI
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:40 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 16 Sep 2008 21:45:55 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kfozw-0000g5-KI@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] US English 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: Wed, 17 Sep 2008 04:50:44 -0000

---
 erc-capab.el    |    2 +-
 erc-truncate.el |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/erc-capab.el b/erc-capab.el
index e153e01..2a6e281 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -43,7 +43,7 @@
 ;; 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
+;;  optionally either highlight or colorize the line in some
 ;;  appropriate fashion, if the user is not identified."
 
 ;;; Usage:
diff --git a/erc-truncate.el b/erc-truncate.el
index 0737fb1..02641c7 100644
--- a/erc-truncate.el
+++ b/erc-truncate.el
@@ -70,7 +70,7 @@ region is logged if `erc-logging-enabled' returns non-nil."
       (set-buffer buffer)
       ;; Note that when erc-insert-post-hook runs, the buffer is
       ;; narrowed to the new message.  So do this delicate widening.
-      ;; I am not sure, I think this was not recommended behaviour in
+      ;; I am not sure, I think this was not recommended behavior in
       ;; Emacs 20.
       (save-restriction
 	(widen)
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Sep 17 00:50:49 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kfp05-00037Z-J0
	for mharc-erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kfp04-00037U-BB
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kfp03-00037I-Tu
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:48 -0400
Received: from [199.232.76.173] (port=35145 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kfp03-00037F-NR
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:47 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:50898)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kfp02-0007JB-BD
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:46 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kfp01-0005ZD-C6
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:45 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kfozz-0000ge-EY
	for erc-commit@gnu.org; Wed, 17 Sep 2008 00:50:44 -0400
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Tue, 16 Sep 2008 21:46:14 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kfozz-0000ge-EY@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc: Remove code for Carbon.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?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, 17 Sep 2008 04:50:48 -0000

---
 ChangeLog |    4 ++++
 erc.el    |    1 -
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f49748d..5d93364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* erc.el: Remove code for Carbon.
+
 2008-06-07  Glenn Morris  <rgm@gnu.org>
 
 	* erc/erc-autoaway.el, erc/erc-ibuffer.el, erc/erc-menu.el:
diff --git a/erc.el b/erc.el
index 2bf74ef..f6b8e57 100644
--- a/erc.el
+++ b/erc.el
@@ -3377,7 +3377,6 @@ the message given by REASON."
 				   ((featurep 'gtk)
 				    (concat ", GTK+ Version "
 					    gtk-version-string))
-				   ((featurep 'mac-carbon) ", Mac Carbon")
 				   ((featurep 'x-toolkit) ", X toolkit")
 				   (t ""))
 			     (if (and (boundp 'x-toolkit-scroll-bars)
-- 
debian.1.5.6.1.19.ge6b2




