aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-08-01 11:02:26 +0100
committerThomas Adam <thomas@xteddy.org>2019-08-01 11:02:26 +0100
commit11315c589a25237579d0ea7e046ca1cabaac79a3 (patch)
treea531d5959a8a80070e393738b4201c39fc1bccb7 /tmux.1
parentcea87758e7b0dbd1fa1e8a8e6443dfb59bf72de6 (diff)
parent2db5f9c21528e9a604af6e5d82689af93028d28b (diff)
downloadrtmux-11315c589a25237579d0ea7e046ca1cabaac79a3.tar.gz
rtmux-11315c589a25237579d0ea7e046ca1cabaac79a3.tar.bz2
rtmux-11315c589a25237579d0ea7e046ca1cabaac79a3.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.16
1 files changed, 4 insertions, 2 deletions
diff --git a/tmux.1 b/tmux.1
index ebf81d48..394bd284 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1647,7 +1647,7 @@ By default, it uses the format
but a different format may be specified with
.Fl F .
.It Xo Ic capture-pane
-.Op Fl aepPqCJ
+.Op Fl aepPqCJN
.Op Fl b Ar buffer-name
.Op Fl E Ar end-line
.Op Fl S Ar start-line
@@ -1672,8 +1672,10 @@ is given, the output includes escape sequences for text and background
attributes.
.Fl C
also escapes non-printable characters as octal \exxx.
+.Fl N
+preserves trailing spaces at each line's end and
.Fl J
-joins wrapped lines and preserves trailing spaces at each line's end.
+preserves trailing spaces and joins any wrapped lines.
.Fl P
captures only any output that the pane has received that is the beginning of an
as-yet incomplete escape sequence.