Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-05-29 10:01:15 +01:00
commit bfd7209053
2 changed files with 5 additions and 5 deletions

8
tmux.1
View File

@ -833,13 +833,13 @@ is given.
and
.Ar shell-command
are the name of and shell command to execute in the initial window.
If
.Fl d
is used,
With
.Fl d ,
the initial size is 80 x 24;
.Fl x
and
.Fl y
specify the size of the initial window.
can be used to specify a different size.
.Pp
If run from a terminal, any
.Xr termios 4

View File

@ -1458,7 +1458,7 @@ window_copy_adjust_selection(struct window_pane *wp, u_int *selx, u_int *sely)
}
*selx = sx;
*sely = screen_hsize(s) + sy;
*sely = sy;
return (relpos);
}