Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-13 22:01:12 +01:00
13 changed files with 280 additions and 204 deletions

8
tmux.1
View File

@ -2183,13 +2183,9 @@ With
the key bindings in
.Ar mode-table
are listed; this may be one of:
.Em vi-edit ,
.Em emacs-edit ,
.Em vi-choice ,
.Em emacs-choice ,
.Em vi-copy
.Em vi-choice
or
.Em emacs-copy .
.Em emacs-choice .
.It Xo Ic send-keys
.Op Fl lMRX
.Op Fl N Ar repeat-count