# HG changeset patch
# User Michael Olson <mwolson@gnu.org>
# Date 1230015499 0
# Node ID 20fa0beede6accbd2fceef31382692eae8d628cf
# Parent  baacf563d823644633824a01013b363ec57822ad
ERC: Sync with upstream.

 - Add `erc-header-line-uses-tabbar-p' option for better integration with
   Tabbar Mode.

 - Update some TODO items in manual.

diff -r baacf563d823 -r 20fa0beede6a doc/misc/erc.texi
--- a/doc/misc/erc.texi	Tue Dec 23 04:06:40 2008 +0000
+++ b/doc/misc/erc.texi	Tue Dec 23 06:58:19 2008 +0000
@@ -699,7 +699,7 @@
 
 @end table
 
-@c PRE5_3: Document every option of every module in its own subnode
+@c PRE5_4: Document every option of every module in its own subnode
 
 
 @node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
@@ -932,7 +932,7 @@
 @section Options
 @cindex options
 
-@c PRE5_3: (Node) Document every ERC option (module options go in
+@c PRE5_4: (Node) Document every ERC option (module options go in
 @c previous chapter)
 
 This section has not yet been written.  For now, the easiest way to
diff -r baacf563d823 -r 20fa0beede6a lisp/erc/erc.el
--- a/lisp/erc/erc.el	Tue Dec 23 04:06:40 2008 +0000
+++ b/lisp/erc/erc.el	Tue Dec 23 06:58:19 2008 +0000
@@ -5914,6 +5914,11 @@
   :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."
@@ -6085,7 +6090,11 @@
 	(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