Merge branch 'obsd-master'

Conflicts:
	Makefile
This commit is contained in:
Thomas Adam
2015-09-14 12:42:19 +01:00
14 changed files with 103 additions and 143 deletions

12
tmux.1
View File

@ -1137,7 +1137,7 @@ The synopsis for the
command is:
.Bl -tag -width Ds
.It Xo Ic copy-mode
.Op Fl Mu
.Op Fl Meu
.Op Fl t Ar target-pane
.Xc
Enter copy mode.
@ -1147,6 +1147,16 @@ option scrolls one page up.
.Fl M
begins a mouse drag (only valid if bound to a mouse key binding, see
.Sx MOUSE SUPPORT ) .
.Fl e
specifies that scrolling to the bottom of the history (to the visible screen)
should exit copy mode.
While in copy mode, pressing a key other than those used for scrolling will
disable this behaviour.
This is intended to allow fast scrolling through a pane's history, for
example with:
.Bd -literal -offset indent
bind PageUp copy-mode -eu
.Ed
.El
.Pp
Each window displayed by