summaryrefslogtreecommitdiffstats
path: root/tmux.1
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2013-03-25 10:09:35 +0000
committerNicholas Marriott <nicm@openbsd.org>2013-03-25 10:09:35 +0000
commit748acdc77ca11a09e637324946a6a4f189defc8e (patch)
tree26846948d489e01099e0f63ae2e17a6e38e58c8e /tmux.1
parent410a3abbefee60750432d4c0ddcf9157e5b6f580 (diff)
Add wait-for -L and -U for lock and unlock, from Thiago Padilha.
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.135
1 files changed, 31 insertions, 4 deletions
diff --git a/tmux.1 b/tmux.1
index b0d6b4e7..f6055f11 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1062,8 +1062,7 @@ By default, it uses the format
but a different format may be specified with
.Fl F .
.It Xo Ic capture-pane
-.Op Fl e
-.Op Fl p
+.Op Fl aepq
.Op Fl b Ar buffer-index
.Op Fl E Ar end-line
.Op Fl S Ar start-line
@@ -1077,13 +1076,19 @@ is given, the output goes to stdout, otherwise to the buffer specified with
.Fl b
or a new buffer if omitted.
If
+.Fl a
+is given, the alternate screen is used, and the history is not accessible.
+If no alternate screen exists, an error will be returned unless
+.Fl q
+is given.
+If
.Fl e
is given, the output includes escape sequences for text and background
attributes.
.Fl C
also escapes non-printable characters as octal \exxx.
.Fl J
-joins wrapped lines.
+joins wrapped lines and preserves trailing spaces at each line's end.
.Pp
.Fl S
and
@@ -2946,7 +2951,7 @@ If this option is set, searches will wrap around the end of the pane contents.
The default is on.
.El
.It Xo Ic show-options
-.Op Fl gsvw
+.Op Fl gqsvw
.Op Fl t Ar target-session | Ar target-window
.Op Ar option
.Xc
@@ -2964,6 +2969,11 @@ Global session or window options are listed if
is used.
.Fl v
shows only the option value, not the name.
+If
+.Fl q
+is set, no error will be returned if
+.Ar option
+is unset.
.It Xo Ic show-window-options
.Op Fl gv
.Op Fl t Ar target-window
@@ -3539,6 +3549,23 @@ If the command doesn't return success, the exit status is also displayed.
.It Ic server-info
.D1 (alias: Ic info )
Show server information and terminal details.
+.It Xo Ic wait-for
+.Fl LSU
+.Ar channel
+.Xc
+.D1 (alias: Ic wait )
+When used without options, prevents the client from exiting until woken using
+.Ic wait-for
+.Fl S
+with the same channel.
+When
+.Fl L
+is used, the channel is locked and any clients that try to lock the same
+channel are made to wait until the channel is unlocked with
+.Ic wait-for
+.Fl U .
+This command only works from outside
+.Nm .
.El
.Sh TERMINFO EXTENSIONS
.Nm