Merge branch 'master' into floating_panes

tmux.1

@@ -2228,6 +2228,11 @@ Turn off rectangle selection mode.
 .Xc
 Toggle rectangle selection mode.
 .It Xo
+.Ic recentre\-top\-bottom
+(emacs : C-l)
+.Xc
+Cycles the current line between centre, top, and bottom.
+.It Xo
 .Ic refresh\-from\-pane
 (vi: r)
 (emacs: r)
@@ -4664,6 +4669,8 @@ mouse sequences.
 Supports the OSC 7 working directory extension.
 .It overline
 Supports the overline SGR attribute.
+.It progressbar
+Supports the OSC 9;4 progress bar extension.
 .It rectfill
 Supports the DECFRA rectangle fill escape sequence.
 .It RGB
@@ -5357,17 +5364,6 @@ section.
 .It Ic copy\-mode\-position\-format Ar format
 Format of the position indicator in copy mode.
 .Pp
-.It Xo Ic mode\-keys
-.Op Ic vi | emacs
-.Xc
-Use vi or emacs-style key bindings in copy mode.
-The default is emacs, unless
-.Ev VISUAL
-or
-.Ev EDITOR
-contains
-.Ql vi .
-.Pp
 .It Ic copy\-mode\-position\-style Ar style
 Set the style of the position indicator in copy mode.
 For how to specify
@@ -5384,6 +5380,63 @@ see the
 .Sx STYLES
 section.
 .Pp
+.It Ic copy\-mode\-current\-line\-number\-style Ar style
+Set style of current line number in copy mode.
+For how to specify
+.Ar style ,
+see the
+.Sx STYLES
+section.
+.Pp
+.It Ic copy\-mode\-line\-number\-style Ar style
+Set style of line numbers in copy mode.
+For how to specify
+.Ar style ,
+see the
+.Sx STYLES
+section.
+.Pp
+.It Xo Ic copy\-mode\-line\-numbers
+.Op Ic off | default | absolute | relative | hybrid
+.Xc
+Show line numbers in copy mode.
+.Ic off
+hides line numbers,
+.Ic default
+shows line numbers matching the copy mode position indicator and
+.Ic goto\-line ,
+.Ic absolute
+shows absolute line numbers,
+.Ic relative
+shows line numbers relative to the cursor, and
+.Ic hybrid
+shows the current line number as absolute and other line numbers as
+relative.
+With
+.Ic off
+or
+.Ic default ,
+the position indicator and
+.Ic goto\-line
+use the same numbering;
+with
+.Ic absolute ,
+.Ic relative
+and
+.Ic hybrid ,
+they use absolute line numbers.
+.Pp
+.It Xo Ic mode\-keys
+.Op Ic vi | emacs
+.Xc
+Use vi or emacs-style key bindings in copy mode.
+The default is emacs, unless
+.Ev VISUAL
+or
+.Ev EDITOR
+contains
+.Ql vi .
+.Pp
 .It Ic mode\-style Ar style
 Set window modes style.
 For how to specify
@@ -5628,6 +5681,17 @@ A value of 0 (the default) means no limit.
 When a limit is set, panes are arranged to not exceed this number of columns,
 with additional panes stacked in extra rows.
 .Pp
+.It Ic tree\-mode\-preview\-format Ar format
+Format of the preview indicator in tree mode.
+.Pp
+.It Ic tree\-mode\-preview\-style Ar style
+Set the style of the preview indicator in tree mode.
+For how to specify
+.Ar style ,
+see the
+.Sx STYLES
+section.
+.Pp
 .It Ic window\-status\-activity\-style Ar style
 Set status line style for windows with an activity alert.
 For how to specify
@@ -6533,6 +6597,8 @@ The following variables are available, where appropriate:
 .It Li "copy_cursor_word" Ta "" Ta "Word under cursor in copy mode"
 .It Li "copy_cursor_x" Ta "" Ta "Cursor X position in copy mode"
 .It Li "copy_cursor_y" Ta "" Ta "Cursor Y position in copy mode"
+.It Li "copy_position" Ta "" Ta "Position shown in the copy mode indicator"
+.It Li "copy_position_limit" Ta "" Ta "Limit shown in the copy mode indicator"
 .It Li "current_file" Ta "" Ta "Current configuration file"
 .It Li "cursor_character" Ta "" Ta "Character at cursor in pane"
 .It Li "cursor_colour" Ta "" Ta "Cursor colour in pane"
@@ -7493,7 +7559,6 @@ Display a popup running
 when omitted) on
 .Ar target\-client .
 A popup is a rectangular box drawn over the top of any panes.
-Panes are not updated while a popup is present.
 If the command is run inside an existing popup, that popup is modified.
 Only the
 .Fl b ,
@@ -8081,6 +8146,8 @@ $ printf \[aq]\e033[4 q\[aq]
 If
 .Em Se
 is not set, \&Ss with argument 0 will be used to reset the cursor style instead.
+.It Em \&Spb
+Set the state and progress for the OSC9;4 progress bar.
 .It Em \&Swd
 Set the opening sequence for the working directory notification.
 The sequence is terminated using the standard