[Emacs-diffs] emacs doc/misc/erc.texi lisp/erc/erc.el

[Michael W. Olson]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael W. Olson <mwolson>      08/12/23 06:58:19

Modified files:
        doc/misc       : erc.texi 
        lisp/erc       : erc.el 

Log message:
        ERC: Sync with upstream.
        
         - Add `erc-header-line-uses-tabbar-p' option for better integration 
with
           Tabbar Mode.
        
         - Update some TODO items in manual.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/misc/erc.texi?cvsroot=emacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc.el?cvsroot=emacs&r1=1.52&r2=1.53

Patches:
Index: doc/misc/erc.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/misc/erc.texi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- doc/misc/erc.texi   19 Nov 2008 04:28:40 -0000      1.9
+++ doc/misc/erc.texi   23 Dec 2008 06:58:19 -0000      1.10
@@ -699,7 +699,7 @@
 
 @end table
 
address@hidden PRE5_3: Document every option of every module in its own subnode
address@hidden 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
 
address@hidden PRE5_3: (Node) Document every ERC option (module options go in
address@hidden 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

Index: lisp/erc/erc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/erc/erc.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- lisp/erc/erc.el     27 Jul 2008 18:24:33 -0000      1.52
+++ lisp/erc/erc.el     23 Dec 2008 06:58:19 -0000      1.53
@@ -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