Commit a83df153 authored by Michael Olson's avatar Michael Olson
Browse files

ERC: Sync with upstream.

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

 - Update some TODO items in manual.
parent 510ef922
......@@ -699,7 +699,7 @@ Translate morse code in messages
@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 @@ stuff, to the current ERC buffer."
@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
......
......@@ -5914,6 +5914,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."
......@@ -6085,7 +6090,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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment