Merge branch 'obsd-master'

tmux.1

@@ -2247,6 +2247,18 @@ Same as
 .Ic scroll-down
 but also exit copy mode if the cursor reaches the bottom.
 .It Xo
+.It Xo
+.Ic scroll-exit-on
+.Xc
+Turn on exiting copy mode when scrolling to the end of the buffer.
+.It Xo
+.Ic scroll-exit-off
+.Xc
+Turn off exiting copy mode when scrolling to the end of the buffer.
+.It Xo
+.Ic scroll-exit-toggle
+.Xc
+Toggle exiting copy mode when scrolling to the end of the buffer.
 .Ic scroll-middle
 (vi: z)
 .Xc
@@ -3827,24 +3839,45 @@ To view the default bindings and possible commands, see the
 command.
 .Tg lsk
 .It Xo Ic list-keys
-.Op Fl 1aN
+.Op Fl 1aNr
+.Op Fl F Ar format
+.Op Fl O Ar sort-order
 .Op Fl P Ar prefix-string
 .Op Fl T Ar key-table
 .Op Ar key
 .Xc
 .D1 Pq alias: Ic lsk
 List key bindings.
-There are two forms: the default lists keys as
+.Fl F
+specifies the format of each line.
+See the
+.Sx FORMATS
+section.
+.Fl T
+specifies a
+.Ar key-table
+to list from.
+.Fl 1
+lists only the first matching key.
+.Fl O
+specifies the sort order: one of
+.Ql key ,
+.Ql modifier ,
+.Ql name
+(table name).
+.Fl r
+reverses the sort order.
+.Pp
+If no
+.Ar format
+is given, there are two forms: the default lists keys as
 .Ic bind-key
 commands;
 .Fl N
 lists only keys with attached notes and shows only the key and note for each
 key.
 .Pp
-With the default form, all key tables are listed by default.
-.Fl T
-lists only keys in
-.Ar key-table .
+With the default form, all key tables are listed unless specified otherwise.
 .Pp
 With the
 .Fl N
@@ -3857,9 +3890,7 @@ key tables are listed by default;
 also lists only keys in
 .Ar key-table .
 .Fl P
-specifies a prefix to print before each key and
-.Fl 1
-lists only the first matching key.
+specifies a prefix to print before each key.
 .Fl a
 lists the command for keys that do not have a note rather than skipping them.
 .Tg send
@@ -6236,6 +6267,15 @@ The following variables are available, where appropriate:
 .It Li "host" Ta "#H" Ta "Hostname of local host"
 .It Li "host_short" Ta "#h" Ta "Hostname of local host (no domain name)"
 .It Li "insert_flag" Ta "" Ta "Pane insert flag"
+.It Li "key_string" Ta "" Ta "String representation of the key binding"
+.It Li "key_repeat" Ta "" Ta "1 if key binding is repeatable"
+.It Li "key_note" Ta "" Ta "Note of the key binding"
+.It Li "key_prefix" Ta "" Ta "Global key prefix"
+.It Li "key_table" Ta "" Ta "Table name of the key binding"
+.It Li "key_command" Ta "" Ta "Command of the key binding"
+.It Li "key_has_repeat" Ta "" Ta "1 if list contain a repeatable key"
+.It Li "key_string_width" Ta "" Ta "Maximum key_string width in list"
+.It Li "key_table_width" Ta "" Ta "Maximum key_table width in list"
 .It Li "keypad_cursor_flag" Ta "" Ta "Pane keypad cursor flag"
 .It Li "keypad_flag" Ta "" Ta "Pane keypad flag"
 .It Li "last_window_index" Ta "" Ta "Index of last window in session"
@@ -7411,7 +7451,7 @@ is
 the contents are read from stdin.
 .Tg pasteb
 .It Xo Ic paste-buffer
-.Op Fl dpr
+.Op Fl dprS
 .Op Fl b Ar buffer-name
 .Op Fl s Ar separator
 .Op Fl t Ar target-pane
@@ -7419,9 +7459,14 @@ the contents are read from stdin.
 .D1 Pq alias: Ic pasteb
 Insert the contents of a paste buffer into the specified pane.
 If not specified, paste into the current one.
+By default, control characters are sanitized with
+.Xr vis 3 ;
+.Fl S
+disables this.
 With
 .Fl d ,
 also delete the paste buffer.
+.Pp
 When output, any linefeed (LF) characters in the paste buffer are replaced with
 a separator, by default carriage return (CR).
 A custom separator may be specified using the