From 15253448af2dc15dcfe17add5cedafaebdd4d62f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 29 May 2017 07:46:32 +0000
Subject: [PATCH 1/2] Tweak text to mention initial size, from John Hood.

---
 tmux.1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tmux.1 b/tmux.1
index e38cb185..41f6057c 100644
--- a/tmux.1
+++ b/tmux.1
@@ -829,13 +829,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

From 1883d299bf853dac75cd67c012b9f074b0a4dbef Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 29 May 2017 07:58:33 +0000
Subject: [PATCH 2/2] Do not factor in screen_hsize() for the visible copy mode
 screen when adjusting the selection, it should never have any useful history
 (and when it does, after resize, we shouldn't use it). From Michal Mazurek.

---
 window-copy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
 }