mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-22 08:03:54 +01:00
Merge branch 'obsd-master'
This commit is contained in:
commit
0ef3e28609
@ -35,7 +35,7 @@ enum cmd_retval join_pane(struct cmd *, struct cmd_q *, int);
|
||||
const struct cmd_entry cmd_join_pane_entry = {
|
||||
"join-pane", "joinp",
|
||||
"bdhvp:l:s:t:", 0, 0,
|
||||
"[-bdhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
|
||||
"[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
|
||||
0,
|
||||
cmd_join_pane_exec
|
||||
};
|
||||
@ -43,7 +43,7 @@ const struct cmd_entry cmd_join_pane_entry = {
|
||||
const struct cmd_entry cmd_move_pane_entry = {
|
||||
"move-pane", "movep",
|
||||
"bdhvp:l:s:t:", 0, 0,
|
||||
"[-bdhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
|
||||
"[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
|
||||
0,
|
||||
cmd_join_pane_exec
|
||||
};
|
||||
|
4
format.c
4
format.c
@ -339,7 +339,7 @@ format_find(struct format_tree *ft, const char *key)
|
||||
case OPTIONS_STRING:
|
||||
return (o->str);
|
||||
case OPTIONS_NUMBER:
|
||||
snprintf(s, sizeof s, "%lld", o->num);
|
||||
xsnprintf(s, sizeof s, "%lld", o->num);
|
||||
return (s);
|
||||
case OPTIONS_STYLE:
|
||||
return (style_tostring(&o->style));
|
||||
@ -680,7 +680,7 @@ format_defaults_session(struct format_tree *ft, struct session *s)
|
||||
RB_FOREACH (wl, winlinks, &s->windows) {
|
||||
if ((wl->flags & WINLINK_ALERTFLAGS) == 0)
|
||||
continue;
|
||||
snprintf(tmp, sizeof tmp, "%u", wl->idx);
|
||||
xsnprintf(tmp, sizeof tmp, "%u", wl->idx);
|
||||
|
||||
if (*alerts != '\0')
|
||||
strlcat(alerts, ",", sizeof alerts);
|
||||
|
5
tmux.1
5
tmux.1
@ -408,14 +408,15 @@ An
|
||||
pattern which is matched against the session name.
|
||||
.El
|
||||
.Pp
|
||||
If the session name is prefixed with a
|
||||
.Ql = : ,
|
||||
If the session name is prefixed with an
|
||||
.Ql = ,
|
||||
only an exact match is accepted (so
|
||||
.Ql =mysess
|
||||
will only match exactly
|
||||
.Ql mysess ,
|
||||
not
|
||||
.Ql mysession ) .
|
||||
.Pp
|
||||
If a single session is found, it is used as the target session; multiple matches
|
||||
produce an error.
|
||||
If a session is omitted, the current session is used if available; if no
|
||||
|
Loading…
Reference in New Issue
Block a user