Merge.

tmux.1

@@ -5769,7 +5769,7 @@ uses when the colour with that index is requested.
 The index may be from zero to 255.
 .Pp
 .It Xo Ic remain\-on\-exit
-.Op Ic on | off | failed | keypress
+.Op Ic on | off | failed | key
 .Xc
 A pane with this flag set is not destroyed when the program running in it
 exits.
@@ -5777,9 +5777,8 @@ If set to
 .Ic failed ,
 then only when the program exit status is not zero.
 If set to
-.Ic keypress ,
-the pane stays open and closes when the user presses any key (other than
-a mouse button or paste).
+.Ic key ,
+the pane stays open and closes when a key is pressed.
 The pane may be reactivated with the
 .Ic respawn\-pane
 command.
@@ -6013,8 +6012,13 @@ and a location suffix, one of the following:
 .It Li "ScrollbarSlider" Ta "the scrollbar slider"
 .It Li "ScrollbarUp" Ta "above the scrollbar slider"
 .It Li "ScrollbarDown" Ta "below the scrollbar slider"
+.It Li "ControlN" Ta "on control range N"
 .El
 .Pp
+See the
+.Sx STYLES
+section for information on control ranges.
+.Pp
 The following mouse events are available:
 .Bl -column "MouseDown1" "MouseDrag1" "WheelDown" -offset indent
 .It Li "WheelUp" Ta "WheelDown" Ta ""
@@ -6475,6 +6479,7 @@ The following variables are available, where appropriate:
 .It Li "alternate_on" Ta "" Ta "1 if pane is in alternate screen"
 .It Li "alternate_saved_x" Ta "" Ta "Saved cursor X in alternate screen"
 .It Li "alternate_saved_y" Ta "" Ta "Saved cursor Y in alternate screen"
+.It Li "bracket_paste_flag" Ta "" Ta "Pane bracketed paste flag"
 .It Li "buffer_created" Ta "" Ta "Time buffer created"
 .It Li "buffer_full" Ta "" Ta "Full buffer content"
 .It Li "buffer_name" Ta "" Ta "Name of buffer"
@@ -6600,6 +6605,8 @@ The following variables are available, where appropriate:
 .It Li "pane_pid" Ta "" Ta "PID of first process in pane"
 .It Li "pane_pipe" Ta "" Ta "1 if pane is being piped"
 .It Li "pane_pipe_pid" Ta "" Ta "PID of pipe process, if any"
+.It Li "pane_pb_state" Ta "" Ta "Pane progress bar state, one of hidden, normal, error, indeterminate, paused (can be set by application)"
+.It Li "pane_pb_progress" Ta "" Ta "Pane progress bar progress percentage (can be set by application)"
 .It Li "pane_right" Ta "" Ta "Right of pane"
 .It Li "pane_search_string" Ta "" Ta "Last search string in copy mode"
 .It Li "pane_start_command" Ta "" Ta "Command pane started with"
@@ -6828,6 +6835,7 @@ replaces the previous saved default).
 .Ic range=window|X ,
 .Ic range=pane|X ,
 .Ic range=user|X ,
+.Ic range=control|N ,
 .Ic norange
 .Xc
 Mark a range for mouse events in the
@@ -6874,6 +6882,19 @@ will be available in the
 format variable.
 .Ql X
 must be at most 15 bytes in length.
+.Pp
+.Ic range=control|N
+is a set of ranges for users to define custom behavior.
+.Ql N
+can be 0 through 9.
+When a mouse event occurs in the
+.Ic range=control|N
+range, the
+.Ql ControlN
+key binding is triggered.
+See
+.Sx MOUSE SUPPORT
+for details.
 .It Ic set\-default
 Set the current colours and attributes as the default, overwriting any previous
 default.
@@ -7403,7 +7424,7 @@ If
 is not given, the
 .Ic display\-time
 option is used; a delay of zero waits for a key press.
-.Ql N
+.Fl N
 ignores key presses and closes only after the delay expires.
 If
 .Fl C