Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

Conflicts:
	cmd-split-window.c
	cmd-unbind-key.c
	format.c
	osdep-openbsd.c
This commit is contained in:
Nicholas Marriott
2013-10-11 16:52:39 +01:00
4 changed files with 16 additions and 10 deletions

6
tmux.1
View File

@ -2738,8 +2738,8 @@ instead redraw it entirely every
.Ar interval
milliseconds.
This helps to prevent fast output (such as
.Xr yes 1
overwhelming the terminal).
.Xr yes 1 )
overwhelming the terminal.
The default is a trigger of 250 and an interval of 100.
A trigger of zero disables the rate limiting.
.Pp
@ -3812,4 +3812,4 @@ bind-key S command-prompt "new-window -n %1 'ssh %1'"
.Sh SEE ALSO
.Xr pty 4
.Sh AUTHORS
.An Nicholas Marriott Aq nicm@users.sourceforge.net
.An Nicholas Marriott Aq Mt nicm@users.sourceforge.net