Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-18 22:01:12 +01:00
2 changed files with 6 additions and 6 deletions

10
tmux.1
View File

@ -3146,6 +3146,11 @@ see the
.Ic message-command-style
option.
.Pp
.It Xo Ic wrap-search
.Op Ic on | off
.Xc
If this option is set, searches will wrap around the end of the pane contents.
The default is on.
.It Xo Ic xterm-keys
.Op Ic on | off
.Xc
@ -3157,11 +3162,6 @@ function key sequences; these have a number included to indicate modifiers such
as Shift, Alt or Ctrl.
The default is off.
.Pp
.It Xo Ic wrap-search
.Op Ic on | off
.Xc
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 gqsvw