From MAILER-DAEMON Fri Dec 19 10:40:45 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LDhT3-0003Md-Jj
	for mharc-erc-commit@gnu.org; Fri, 19 Dec 2008 10:40:45 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LDhT2-0003Lx-19
	for erc-commit@gnu.org; Fri, 19 Dec 2008 10:40:44 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LDhT0-0003Lh-In
	for erc-commit@gnu.org; Fri, 19 Dec 2008 10:40:43 -0500
Received: from [199.232.76.173] (port=49323 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LDhT0-0003Le-Cb
	for erc-commit@gnu.org; Fri, 19 Dec 2008 10:40:42 -0500
Received: from deleuze.hcoop.net ([69.90.123.67]:43775)
	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 1LDhSz-00058W-Vt
	for erc-commit@gnu.org; Fri, 19 Dec 2008 10:40:42 -0500
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1LDhSy-0001nN-SI
	for erc-commit@gnu.org; Fri, 19 Dec 2008 10:40:41 -0500
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1LDhSx-00030b-Ek
	for erc-commit@gnu.org; Fri, 19 Dec 2008 10:40:39 -0500
From: Andy Stewart <lazycat.manatee@gmail.com>
Date: Fri, 19 Dec 2008 07:38:10 -0800
To: erc-commit@gnu.org
Message-Id: <E1LDhSx-00030b-Ek@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] Make ERC work with Tabbar 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: Fri, 19 Dec 2008 15:40:44 -0000

---
 erc.el |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/erc.el b/erc.el
index f6b8e57..4a41af7 100644
--- a/erc.el
+++ b/erc.el
@@ -5907,6 +5907,11 @@ See `erc-mode-line-format' for which characters are can be used."
   :type '(choice (const :tag "Disabled" nil)
 		 string))
 
+(defcustom erc-header-line-uses-tabbar-p t
+  "Use tabbar mode instead of the header line to display the header."
+  :group 'erc-mode-line-and-header
+  :type 'boolean)
+
 (defcustom erc-header-line-uses-help-echo-p t
   "Show the contents of the header line in the echo area or as a tooltip
 when you move point into the header line."
@@ -6075,7 +6080,11 @@ if `erc-away' is non-nil."
 	(let ((header (if erc-header-line-format
 			  (format-spec erc-header-line-format spec)
 			nil)))
-	  (cond ((null header)
+	  (cond (erc-header-line-uses-tabbar-p
+		 (set (make-local-variable 'tabbar--local-hlf)
+		      header-line-format)
+		 (kill-local-variable 'header-line-format))
+		((null header)
 		 (setq header-line-format nil))
 		(erc-header-line-uses-help-echo-p
 		 (let ((help-echo (with-temp-buffer
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Tue Dec 23 02:00:44 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LF1G0-0003gn-9r
	for mharc-erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:44 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LF1Fx-0003fp-R5
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:42 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LF1Ft-0003e7-B5
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:41 -0500
Received: from [199.232.76.173] (port=55172 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LF1Ft-0003e3-3i
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:37 -0500
Received: from deleuze.hcoop.net ([69.90.123.67]:46768)
	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 1LF1Fs-0005Jq-BM
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:36 -0500
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1LF1Fq-0008O0-S6
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:35 -0500
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1LF1Fq-0008C3-Ge
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:34 -0500
From: Michael Olson <mwolson@gnu.org>
Date: Mon, 22 Dec 2008 22:46:53 -0800
To: erc-commit@gnu.org
Message-Id: <E1LF1Fq-0008C3-Ge@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] Changelog fixups 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: Tue, 23 Dec 2008 07:00:42 -0000

---
 ChangeLog.01  |    8 ++++----
 ChangeLog.05  |   12 ++++++------
 ChangeLog.07  |    2 +-
 erc-compat.el |    3 ++-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ChangeLog.01 b/ChangeLog.01
index 1978485..624ed47 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -26,8 +26,8 @@
 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-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.
 
@@ -121,7 +121,7 @@
 	* 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-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.
@@ -189,7 +189,7 @@
 	Doc fix.
 	* (erc-generate-log-file-name-old): Renamed to -long
 	Doc fix.
-	* erc-generate-log-file-name-function: Set default to ...-long
+	* (erc-generate-log-file-name-function): Set default to ...-long
 	Doc fixes
 
 	* erc-speedbar.el 1.4: *** empty log message ***
diff --git a/ChangeLog.05 b/ChangeLog.05
index 1b308fe..bf703d3 100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@ -698,7 +698,7 @@
 	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
 	edebug-form-spec.
 
-	* erc-compat (erc-define-minor-mode): Ditto.
+	* erc-compat.el (erc-define-minor-mode): Ditto.
 
 2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
 
@@ -1050,7 +1050,7 @@
 	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>
+2005-01-08  Diane Murray  <disumu@x3y2z1.net>
 
 	* ChangeLog.2002: Changed instances of my sourceforge username and
 	email address to real name and email.
@@ -1124,7 +1124,7 @@
 	* NEWS: Use 3rd level heading instead of bullets for lists that
 	contain descriptions.
 
-2005-01-07  Diane Murray <disumu@x3y2z1.net>
+2005-01-07  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-list.el: Require 'sort.
 	(erc-chanlist): Disable undo in the channel list buffer.
@@ -1180,7 +1180,7 @@
 	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>
+2005-01-04  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el (erc-connection-established, erc-login): Update the
 	mode-line.
@@ -1189,11 +1189,11 @@
 	`mode-line-process' to ":connecting" while the connection is being
 	established.
 
-2005-01-04  Lawrence Mitchell <wence@gmx.li>
+2005-01-04  Lawrence Mitchell  <wence@gmx.li>
 
 	* AUTHORS: Update list of authors.
 
-2005-01-02  Diane Murray <disumu@x3y2z1.net>
+2005-01-02  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-goodies.el (erc-control-characters): New customization
 	group.
diff --git a/ChangeLog.07 b/ChangeLog.07
index 67999ba..4915fd9 100644
--- a/ChangeLog.07
+++ b/ChangeLog.07
@@ -43,7 +43,7 @@
 	(erc-nickserv-identification-autodetect): New functions.
 	(erc-nickserv-identified-hook): New hook.
 
-2007-12-06  D. Goel  <deego3@gmail.com>
+2007-12-06  Deepak Goel  <deego3@gmail.com>
 
 	* erc-match.el (erc-add-entry-to-list): Fix buggy call to `error'.
 
diff --git a/erc-compat.el b/erc-compat.el
index 4285032..5b5edd9 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -1,6 +1,7 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
 
-;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Tue Dec 23 02:00:44 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LF1G0-0003gl-6c
	for mharc-erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:44 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LF1Fx-0003fc-Ec
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:41 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LF1Fs-0003dn-8j
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:40 -0500
Received: from [199.232.76.173] (port=55169 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LF1Fs-0003di-1s
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:36 -0500
Received: from deleuze.hcoop.net ([69.90.123.67]:46764)
	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 1LF1Fr-0005JG-5s
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:35 -0500
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1LF1Fp-0008Nj-GO
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:33 -0500
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1LF1Fo-0008Az-RC
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:00:33 -0500
From: Michael Olson <mwolson@gnu.org>
Date: Mon, 22 Dec 2008 22:46:26 -0800
To: erc-commit@gnu.org
Message-Id: <E1LF1Fo-0008Az-RC@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] Manual: Update to use GFDL 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: Tue, 23 Dec 2008 07:00:41 -0000

---
 erc.texi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/erc.texi b/erc.texi
index 980181f..e7b2f4a 100644
--- a/erc.texi
+++ b/erc.texi
@@ -18,7 +18,7 @@ Copyright @copyright{} 2005, 2006, 2007, 2008 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
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.  A copy of the license
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Tue Dec 23 02:10:17 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1LF1PF-00062X-1C
	for mharc-erc-commit@gnu.org; Tue, 23 Dec 2008 02:10:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LF1PD-00062O-Fu
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:10:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LF1PB-00062C-Ir
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:10:14 -0500
Received: from [199.232.76.173] (port=38118 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LF1PB-000629-Ea
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:10:13 -0500
Received: from deleuze.hcoop.net ([69.90.123.67]:60437)
	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 1LF1PB-0006kB-3O
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:10:13 -0500
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1LF1PA-0000uZ-9Q
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:10:12 -0500
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1LF1P9-0000kJ-Uc
	for erc-commit@gnu.org; Tue, 23 Dec 2008 02:10:12 -0500
From: Michael Olson <mwolson@gnu.org>
Date: Mon, 22 Dec 2008 23:00:24 -0800
To: erc-commit@gnu.org
Message-Id: <E1LF1P9-0000kJ-Uc@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] Update 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: Tue, 23 Dec 2008 07:10:15 -0000

---
 ChangeLog |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d1ac3b..9f6e7b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-19  Andy Stewart  <lazycat.manatee@gmail.com>
+
+	* erc.el (erc-header-line-uses-tabbar-p): New option that makes
+	tabbar mode usable with ERC if set to non-nil.
+	(erc-update-mode-line-buffer): Use it.
+
 2008-10-03  Michael Olson  <mwolson@gnu.org>
 
 	* erc-dcc.el (english): Increase size heading by two places.
-- 
debian.1.5.6.1.19.ge6b2




