Merge branch 'feature/tabs'

3 files changed, 37 insertions, 19 deletions

diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 1fd56d02841..a351917b852 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1348,8 +1348,8 @@ button.  @xref{Repeat Events}.
 @var{position} slot of a click event, you should typically use the
 functions documented in @ref{Accessing Mouse}.  The explicit format of
 the list depends on where the click occurred.  For clicks in the text
-area, mode line, header line, or in the fringe or marginal areas, the
-mouse position list has the form
+area, mode line, header line, tab line, or in the fringe or marginal
+areas, the mouse position list has the form
 
 @example
 (@var{window} @var{pos-or-area} (@var{x} . @var{y}) @var{timestamp}
@@ -1368,8 +1368,9 @@ The window in which the click occurred.
 The buffer position of the character clicked on in the text area; or,
 if the click was outside the text area, the window area where it
 occurred.  It is one of the symbols @code{mode-line},
-@code{header-line}, @code{vertical-line}, @code{left-margin},
-@code{right-margin}, @code{left-fringe}, or @code{right-fringe}.
+@code{header-line}, @code{tab-line}, @code{vertical-line},
+@code{left-margin}, @code{right-margin}, @code{left-fringe}, or
+@code{right-fringe}.
 
 In one special case, @var{pos-or-area} is a list containing a symbol
 (one of the symbols listed above) instead of just the symbol.  This
@@ -1380,12 +1381,12 @@ by Emacs.  @xref{Key Sequence Input}.
 The relative pixel coordinates of the click.  For clicks in the text
 area of a window, the coordinate origin @code{(0 . 0)} is taken to be
 the top left corner of the text area.  @xref{Window Sizes}.  For
-clicks in a mode line or header line, the coordinate origin is the top
-left corner of the window itself.  For fringes, margins, and the
-vertical border, @var{x} does not have meaningful data.  For fringes
-and margins, @var{y} is relative to the bottom edge of the header
-line.  In all cases, the @var{x} and @var{y} coordinates increase
-rightward and downward respectively.
+clicks in a mode line, header line or tab line, the coordinate origin
+is the top left corner of the window itself.  For fringes, margins,
+and the vertical border, @var{x} does not have meaningful data.
+For fringes and margins, @var{y} is relative to the bottom edge of the
+header line.  In all cases, the @var{x} and @var{y} coordinates
+increase rightward and downward respectively.
 
 @item @var{timestamp}
 The time at which the event occurred, as an integer number of
@@ -1407,17 +1408,18 @@ The position in the string where the click occurred.
 @item @var{text-pos}
 For clicks on a marginal area or on a fringe, this is the buffer
 position of the first visible character in the corresponding line in
-the window.  For clicks on the mode line or the header line, this is
-@code{nil}.  For other events, it is the buffer position closest to
-the click.
+the window.  For clicks on the mode line, the header line or the tab
+line, this is @code{nil}.  For other events, it is the buffer position
+closest to the click.
 
 @item @var{col}, @var{row}
 These are the actual column and row coordinate numbers of the glyph
 under the @var{x}, @var{y} position.  If @var{x} lies beyond the last
 column of actual text on its line, @var{col} is reported by adding
-fictional extra columns that have the default character width.  Row 0
-is taken to be the header line if the window has one, or the topmost
-row of the text area otherwise.  Column 0 is taken to be the leftmost
+fictional extra columns that have the default character width.
+Row 0 is taken to be the header line if the window has one, or Row 1
+if the window also has the tab line, or the topmost row of
+the text area otherwise.  Column 0 is taken to be the leftmost
 column of the text area for clicks on a window text area, or the
 leftmost mode line or header line column for clicks there.  For clicks
 on fringes or vertical borders, these have no meaningful data.  For
@@ -2094,7 +2096,8 @@ computed values.)
 
 Note that @var{row} is counted from the top of the text area.  If the
 window given by @var{position} possesses a header line (@pxref{Header
-Lines}), it is @emph{not} included in the @var{row} count.
+Lines}) or a tab line, they are @emph{not} included in the @var{row}
+count.
 @end defun
 
 @defun posn-actual-col-row position
@@ -2452,12 +2455,14 @@ button-down events entirely.  It also reshuffles focus events and
 miscellaneous window events so that they never appear in a key sequence
 with any other events.
 
+@cindex @code{tab-line} prefix key
 @cindex @code{header-line} prefix key
 @cindex @code{mode-line} prefix key
 @cindex @code{vertical-line} prefix key
 @cindex @code{horizontal-scroll-bar} prefix key
 @cindex @code{vertical-scroll-bar} prefix key
 @cindex @code{menu-bar} prefix key
+@cindex @code{tab-bar} prefix key
 @cindex mouse events, in special parts of frame
 When mouse events occur in special parts of a window, such as a mode
 line or a scroll bar, the event type shows nothing special---it is the
@@ -2465,8 +2470,8 @@ same symbol that would normally represent that combination of mouse
 button and modifier keys.  The information about the window part is kept
 elsewhere in the event---in the coordinates.  But
 @code{read-key-sequence} translates this information into imaginary
-prefix keys, all of which are symbols: @code{header-line},
-@code{horizontal-scroll-bar}, @code{menu-bar}, @code{mode-line},
+prefix keys, all of which are symbols: @code{tab-line}, @code{header-line},
+@code{horizontal-scroll-bar}, @code{menu-bar}, @code{tab-bar}, @code{mode-line},
 @code{vertical-line}, and @code{vertical-scroll-bar}.  You can define
 meanings for mouse clicks in special window parts by defining key
 sequences using these imaginary prefix keys.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 64b24f712ae..494bf0d3f7e 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2944,6 +2944,7 @@ If the text lies within the mode line of the selected window, Emacs
 applies the @code{mode-line} face.  For the mode line of a
 non-selected window, Emacs applies the @code{mode-line-inactive} face.
 For a header line, Emacs applies the @code{header-line} face.
+For a tab line, Emacs applies the @code{tab-line} face.
 
 @item
 If the text comes from an overlay string via @code{before-string} or
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 39d3960c9a2..f05a6db1761 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -5558,6 +5558,9 @@ The coordinates are in the mode line of @var{window}.
 @item header-line
 The coordinates are in the header line of @var{window}.
 
+@item tab-line
+The coordinates are in the tab line of @var{window}.
+
 @item right-divider
 The coordinates are in the divider separating @var{window} from a
 window on the right.
@@ -6115,6 +6118,15 @@ to suppress display of a header line for this window.  Display and
 contents of the header line on other windows showing this buffer are not
 affected.
 
+@item tab-line-format
+@vindex tab-line-format@r{, a window parameter}
+This parameter replaces the value of the buffer-local variable
+@code{tab-line-format} (@pxref{Mode Line Basics}) of this window's
+buffer whenever this window is displayed.  The symbol @code{none} means
+to suppress display of a tab line for this window.  Display and
+contents of the tab line on other windows showing this buffer are not
+affected.
+
 @item min-margins
 @vindex min-margins@r{, a window parameter}
 The value of this parameter is a cons cell whose @sc{car} and