diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-06-19 02:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-06-19 02:01:10 +0100 |
| commit | 0ef3e28609ba89f53bedf40f5facc990cc57e60d (patch) | |
| tree | 8b865d9dca83e14e0a4a6a520e69c48e8dbb0424 | |
| parent | 86018a394773c44d08a4d000046f77e20b413a93 (diff) | |
| parent | f557c7d8ca48c79136e4997b2cba0a08ee039257 (diff) | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-join-pane.c | 4 | ||||
| -rw-r--r-- | format.c | 4 | ||||
| -rw-r--r-- | tmux.1 | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 3d2a04b2..c384631c 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -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 }; @@ -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); @@ -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 |