aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-05-29 10:01:15 +0100
committerThomas Adam <thomas@xteddy.org>2017-05-29 10:01:15 +0100
commitbfd7209053669f58cf2ddfa86bb3ed2f9340acd8 (patch)
tree6af907cd9c481c10b1f5469ffe0e427bde530c3e
parentb017dc7e32731cd0804d0e61964da2da094888d6 (diff)
parent1883d299bf853dac75cd67c012b9f074b0a4dbef (diff)
downloadrtmux-bfd7209053669f58cf2ddfa86bb3ed2f9340acd8.tar.gz
rtmux-bfd7209053669f58cf2ddfa86bb3ed2f9340acd8.tar.bz2
rtmux-bfd7209053669f58cf2ddfa86bb3ed2f9340acd8.zip
Merge branch 'obsd-master'
-rw-r--r--tmux.18
-rw-r--r--window-copy.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/tmux.1 b/tmux.1
index 05a19e2c..563d0452 100644
--- a/tmux.1
+++ b/tmux.1
@@ -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
diff --git a/window-copy.c b/window-copy.c
index 6d1a9f69..c8807c99 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -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);
}