Merge branch 'obsd-master'

Conflicts:
	tmux.h

1 files changed, 7 insertions, 1 deletions

diff --git a/screen.c b/screen.c
index e92c6aa7..39720f4e 100644
--- a/screen.c
+++ b/screen.c
@@ -366,7 +366,13 @@ void
 screen_reflow(struct screen *s, u_int new_x)
 {
 	struct grid	*old = s->grid;
+	u_int		 change;
 
 	s->grid = grid_create(old->sx, old->sy, old->hlimit);
-	s->cy -= grid_reflow(s->grid, old, new_x);
+
+	change = grid_reflow(s->grid, old, new_x);
+	if (change < s->cy)
+		s->cy -= change;
+	else
+		s->cy = 0;
 }