Sync OpenBSD patchset 164:

Tidy the target parsing code a bit and correct the behaviour so that as before
a string with no colon as a target window is first looked up as a window then
as a session, noted by Iain Morgan.

Also attempt to clarify the description of the target specification in the man
page.
This commit is contained in:
Tiago Cunha
2009-07-23 13:06:31 +00:00
parent c84145751a
commit fb0301f8b8
2 changed files with 112 additions and 76 deletions

44
tmux.1
View File

@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.128 2009-07-20 17:08:48 tcunha Exp $
.\" $Id: tmux.1,v 1.129 2009-07-23 13:06:31 tcunha Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@ -544,36 +544,36 @@ is a prefix or for which it matches as an
.Xr fnmatch 3
pattern.
If a single match is found, it is used as the target session; multiple matches
produce an error
produce an error.
If a session is omitted, the current session is used if available; if no
current session is available, the most recently created is chosen.
.Pp
.Ar target-window
specifies a window in the form
.Em session Ns \&: Ns Em window ,
where
.Em window
is a window index, for example mysession:1, or a window name,
.Xr fnmatch 3
pattern, or prefix, such as mysession:mywin[0-3].
If the latter, the window is looked up in a similar fashion to session name
searches described above.
The session is in the same form as for
.Ar target-session .
.Em session ,
.Em index
or both may be omitted.
If
.Em session Ns \&: Ns Em window .
.Em session
is omitted, the same rules as for
.Ar target-session
are followed; if
follows the same rules as for
.Ar target-session ,
and
.Em window
is not present, the current window for the given session is used.
is looked for in order: as a window index, for example mysession:1; as an exact
window name, such as mysession:mywindow; then as an
.Xr fnmatch 3
pattern or the start of a window name, such as mysession:mywin* or
mysession:mywin.
An empty window name specifies the next unused index if appropriate (for
example the
.Ic new-window
and
.Ic link-window
commands)
otherwise the current window in
.Em session
is chosen.
When the argument does not contain a colon,
.Nm
first attempts to parse it as window index; if that fails, an attempt is made
to match a session or client name.
first attempts to parse it as window; if that fails, an attempt is made to
match a session.
.Pp
Multiple commands may be specified together as part of a
.Em command sequence .