===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.677
retrieving revision 1.678
diff -c -r1.677 -r1.678
*** src/usr.bin/tmux/tmux.1	2019/07/10 11:20:10	1.677
--- src/usr.bin/tmux/tmux.1	2019/07/19 07:18:03	1.678
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.677 2019/07/10 11:20:10 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.678 2019/07/19 07:18:03 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
  .\"
***************
*** 14,20 ****
  .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: July 10 2019 $
  .Dt TMUX 1
  .Os
  .Sh NAME
--- 14,20 ----
  .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: July 19 2019 $
  .Dt TMUX 1
  .Os
  .Sh NAME
***************
*** 609,615 ****
  .Fl s )
  argument with one of
  .Ar target-client ,
! .Ar target-session
  .Ar target-window ,
  or
  .Ar target-pane .
--- 609,615 ----
  .Fl s )
  argument with one of
  .Ar target-client ,
! .Ar target-session ,
  .Ar target-window ,
  or
  .Ar target-pane .
***************
*** 776,782 ****
  .Ql {mouse}
  (alternative form
  .Ql = )
! to specify the most recent mouse event
  (see the
  .Sx MOUSE SUPPORT
  section)
--- 776,782 ----
  .Ql {mouse}
  (alternative form
  .Ql = )
! to specify the session, window or pane where the most recent mouse event occurred
  (see the
  .Sx MOUSE SUPPORT
  section)
***************
*** 1361,1366 ****
--- 1361,1369 ----
  .Ic list-keys ,
  is executed from a key binding.
  .Pp
+ In copy mode an indicator is displayed in the top-right corner of the pane with
+ the current position and the number of lines in the history.
+ .Pp
  Commands are sent to copy mode using the
  .Fl X
  flag to the
***************
*** 1414,1419 ****
--- 1417,1423 ----
  .It Li "jump-to-backward <to>" Ta "T" Ta ""
  .It Li "jump-to-forward <to>" Ta "t" Ta ""
  .It Li "middle-line" Ta "M" Ta "M-r"
+ .It Li "next-matching-bracket" Ta "%" Ta "M-C-f"
  .It Li "next-paragraph" Ta "}" Ta "M-}"
  .It Li "next-space" Ta "W" Ta ""
  .It Li "next-space-end" Ta "E" Ta ""
***************
*** 1423,1428 ****
--- 1427,1433 ----
  .It Li "page-down" Ta "C-f" Ta "PageDown"
  .It Li "page-down-and-cancel" Ta "" Ta ""
  .It Li "page-up" Ta "C-b" Ta "PageUp"
+ .It Li "previous-matching-bracket" Ta "" Ta "M-C-b"
  .It Li "previous-paragraph" Ta "{" Ta "M-{"
  .It Li "previous-space" Ta "B" Ta ""
  .It Li "previous-word" Ta "b" Ta "M-b"
***************
*** 3017,3022 ****
--- 3022,3039 ----
  The terminal entry value is passed through
  .Xr strunvis 3
  before interpretation.
+ .It Ic user-keys[] Ar key
+ Set list of user-defined key escape sequences.
+ Each item is associated with a key named
+ .Ql User0 ,
+ .Ql User1 ,
+ and so on.
+ .Pp
+ For example:
+ .Bd -literal -offset indent
+ set -s user-keys[0] "\ee[5;30012~"
+ bind User0 resize-pane -L 3
+ .Ed
  .El
  .Pp
  Available session options are:
***************
*** 3223,3229 ****
  .Xr xterm 1 .
  This option is off by default.
  .It Ic set-titles-string Ar string
! String used to set the window title if
  .Ic set-titles
  is on.
  Formats are expanded, see the
--- 3240,3246 ----
  .Xr xterm 1 .
  This option is off by default.
  .It Ic set-titles-string Ar string
! String used to set the client terminal title if
  .Ic set-titles
  is on.
  Formats are expanded, see the
***************
*** 3357,3374 ****
  was given to the
  .Ic set-environment
  command).
- .It Ic user-keys[] Ar key
- Set list of user-defined key escape sequences.
- Each item is associated with a key named
- .Ql User0 ,
- .Ql User1 ,
- and so on.
- .Pp
- For example:
- .Bd -literal -offset indent
- set -s user-keys[0] "\ee[5;30012~"
- bind User0 resize-pane -L 3
- .Ed
  .It Xo Ic visual-activity
  .Op Ic on | off | both
  .Xc
--- 3374,3379 ----
***************
*** 3915,3921 ****
  .Ar format
  argument.
  This is a string which controls the output format of the command.
! Replacement variables are enclosed in
  .Ql #{
  and
  .Ql } ,
--- 3920,3926 ----
  .Ar format
  argument.
  This is a string which controls the output format of the command.
! Format variables are enclosed in
  .Ql #{
  and
  .Ql } ,
***************
*** 3974,3980 ****
  #{?pane_in_mode,#[fg=white#,bg=red],#[fg=red#,bg=white]}#W .
  .Ed
  .Pp
! Comparisons may be expressed by prefixing two comma-separated
  alternatives by
  .Ql == ,
  .Ql != ,
--- 3979,3985 ----
  #{?pane_in_mode,#[fg=white#,bg=red],#[fg=red#,bg=white]}#W .
  .Ed
  .Pp
! String comparisons may be expressed by prefixing two comma-separated
  alternatives by
  .Ql == ,
  .Ql != ,
***************
*** 4142,4148 ****
  The following variables are available, where appropriate:
  .Bl -column "XXXXXXXXXXXXXXXXXXX" "XXXXX"
  .It Sy "Variable name" Ta Sy "Alias" Ta Sy "Replaced with"
! .It Li "alternate_on" Ta "" Ta "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 "buffer_created" Ta "" Ta "Time buffer created"
--- 4147,4153 ----
  The following variables are available, where appropriate:
  .Bl -column "XXXXXXXXXXXXXXXXXXX" "XXXXX"
  .It Sy "Variable name" Ta Sy "Alias" Ta Sy "Replaced with"
! .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 "buffer_created" Ta "" Ta "Time buffer created"
***************
*** 4213,4231 ****
  .It Li "pane_format" Ta "" Ta "1 if format is for a pane (not assuming the current)"
  .It Li "pane_height" Ta "" Ta "Height of pane"
  .It Li "pane_id" Ta "#D" Ta "Unique pane ID"
! .It Li "pane_in_mode" Ta "" Ta "If pane is in a mode"
  .It Li "pane_index" Ta "#P" Ta "Index of pane"
! .It Li "pane_input_off" Ta "" Ta "If input to pane is disabled"
  .It Li "pane_left" Ta "" Ta "Left of pane"
  .It Li "pane_marked" Ta "" Ta "1 if this is the marked pane"
  .It Li "pane_marked_set" Ta "" Ta "1 if a marked pane is set"
! .It Li "pane_mode" Ta "" Ta "Name of pane mode, if any."
  .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_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"
! .It Li "pane_synchronized" Ta "" Ta "If pane is synchronized"
  .It Li "pane_tabs" Ta "" Ta "Pane tab positions"
  .It Li "pane_title" Ta "#T" Ta "Title of pane"
  .It Li "pane_top" Ta "" Ta "Top of pane"
--- 4218,4236 ----
  .It Li "pane_format" Ta "" Ta "1 if format is for a pane (not assuming the current)"
  .It Li "pane_height" Ta "" Ta "Height of pane"
  .It Li "pane_id" Ta "#D" Ta "Unique pane ID"
! .It Li "pane_in_mode" Ta "" Ta "1 if pane is in a mode"
  .It Li "pane_index" Ta "#P" Ta "Index of pane"
! .It Li "pane_input_off" Ta "" Ta "1 if input to pane is disabled"
  .It Li "pane_left" Ta "" Ta "Left of pane"
  .It Li "pane_marked" Ta "" Ta "1 if this is the marked pane"
  .It Li "pane_marked_set" Ta "" Ta "1 if a marked pane is set"
! .It Li "pane_mode" Ta "" Ta "Name of pane mode, if any"
  .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_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"
! .It Li "pane_synchronized" Ta "" Ta "1 if pane is synchronized"
  .It Li "pane_tabs" Ta "" Ta "Pane tab positions"
  .It Li "pane_title" Ta "#T" Ta "Title of pane"
  .It Li "pane_top" Ta "" Ta "Top of pane"
***************
*** 4590,4596 ****
  Commands related to the status line are as follows:
  .Bl -tag -width Ds
  .It Xo Ic command-prompt
! .Op Fl 1i
  .Op Fl I Ar inputs
  .Op Fl p Ar prompts
  .Op Fl t Ar target-client
--- 4595,4601 ----
  Commands related to the status line are as follows:
  .Bl -tag -width Ds
  .It Xo Ic command-prompt
! .Op Fl 1Ni
  .Op Fl I Ar inputs
  .Op Fl p Ar prompts
  .Op Fl t Ar target-client
***************
*** 4640,4645 ****
--- 4645,4652 ----
  .Fl 1
  makes the prompt only accept one key press, in this case the resulting input
  is a single character.
+ .Fl N
+ makes the prompt only accept numeric key presses.
  .Fl i
  executes the command every time the prompt input changes instead of when the
  user exits the command prompt.
***************
*** 4651,4657 ****
  .Bl -column "FunctionXXXXXXXXXXXXXXXXXXXXXXXXX" "viXXXX" "emacsX" -offset indent
  .It Sy "Function" Ta Sy "vi" Ta Sy "emacs"
  .It Li "Cancel command prompt" Ta "Escape" Ta "Escape"
! .It Li "Delete current word" Ta "" Ta "C-w"
  .It Li "Delete entire command" Ta "d" Ta "C-u"
  .It Li "Delete from cursor to end" Ta "D" Ta "C-k"
  .It Li "Execute command" Ta "Enter" Ta "Enter"
--- 4658,4664 ----
  .Bl -column "FunctionXXXXXXXXXXXXXXXXXXXXXXXXX" "viXXXX" "emacsX" -offset indent
  .It Sy "Function" Ta Sy "vi" Ta Sy "emacs"
  .It Li "Cancel command prompt" Ta "Escape" Ta "Escape"
! .It Li "Delete from cursor to start of word" Ta "" Ta "C-w"
  .It Li "Delete entire command" Ta "d" Ta "C-u"
  .It Li "Delete from cursor to end" Ta "D" Ta "C-k"
  .It Li "Execute command" Ta "Enter" Ta "Enter"
***************
*** 4769,4776 ****
  .Ar target-pane
  if
  .Fl t
! is given, otherwise the active pane for the session attached to
! .Ar target-client .
  .Pp
  .Fl v
  prints verbose logging as the format is parsed and
--- 4776,4782 ----
  .Ar target-pane
  if
  .Fl t
! is given, otherwise the active pane.
  .Pp
  .Fl v
  prints verbose logging as the format is parsed and