circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-05 23:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2021-06-18 09:52:47 +01:00
commit 3dfb77416f
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
key-string.c
View File

@ -183,6 +183,8 @@ key_string_lookup_string(const char *string)
if (string[0] == '0' && string[1] == 'x') { if (string[0] == '0' && string[1] == 'x') {
if (sscanf(string + 2, "%x", &u) != 1) if (sscanf(string + 2, "%x", &u) != 1)
return (KEYC_UNKNOWN); return (KEYC_UNKNOWN);
if (u < 32)
return (u);
mlen = wctomb(m, u); mlen = wctomb(m, u);
if (mlen <= 0 || mlen > MB_LEN_MAX) if (mlen <= 0 || mlen > MB_LEN_MAX)
return (KEYC_UNKNOWN); return (KEYC_UNKNOWN);

7
options-table.c
View File

@ -367,7 +367,7 @@ const struct options_table_entry options_table[] = {
.maximum = INT_MAX, .maximum = INT_MAX,
.default_num = 1, .default_num = 1,
.unit = "milliseconds", .unit = "milliseconds",
.text = "Maximum time between input to assume it pasting rather " .text = "Maximum time between input to assume it is pasting rather "
"than typing." "than typing."
}, },
@ -614,7 +614,7 @@ const struct options_table_entry options_table[] = {
.text = "Formats for the status lines. " .text = "Formats for the status lines. "
"Each array member is the format for one status line. " "Each array member is the format for one status line. "
"The default status line is made up of several components " "The default status line is made up of several components "
"which may be configured individually with other option such " "which may be configured individually with other options such "
"as 'status-left'." "as 'status-left'."
}, },
@ -951,7 +951,8 @@ const struct options_table_entry options_table[] = {
.scope = OPTIONS_TABLE_WINDOW, .scope = OPTIONS_TABLE_WINDOW,
.choices = options_table_pane_lines_list, .choices = options_table_pane_lines_list,
.default_num = PANE_LINES_SINGLE, .default_num = PANE_LINES_SINGLE,
.text = "Type of the pane type lines." .text = "Type of characters used to draw pane border lines. Some of "
"these are only supported on terminals with UTF-8 support."
}, },
{ .name = "pane-border-status", { .name = "pane-border-status",

7
tmux.1
View File

@ -2102,9 +2102,11 @@ The following keys may be used in tree mode:
.It Li "q" Ta "Exit mode" .It Li "q" Ta "Exit mode"
.El .El
.Pp .Pp
After a session, window or pane is chosen, After a session, window or pane is chosen, the first instance of
.Ql %% .Ql %%
is replaced by the target in and all instances of
.Ql %1
are replaced by the target in
.Ar template .Ar template
and the result executed as a command. and the result executed as a command.
If If
@ -4331,6 +4333,7 @@ see the
.Sx STYLES .Sx STYLES
section. section.
.El .El
.El
.Sh HOOKS .Sh HOOKS
.Nm .Nm
allows commands to run on various triggers, called allows commands to run on various triggers, called