Merge branch 'obsd-master'

1 files changed, 4 insertions, 3 deletions

diff --git a/screen.c b/screen.c
index a1dc52c8..dbd418a1 100644
--- a/screen.c
+++ b/screen.c
@@ -47,7 +47,7 @@ struct screen_title_entry {
 };
 TAILQ_HEAD(screen_titles, screen_title_entry);
 
-static void	screen_resize_y(struct screen *, u_int, int);
+static void	screen_resize_y(struct screen *, u_int, int, u_int *);
 static void	screen_reflow(struct screen *, u_int, u_int *, u_int *);
 
 /* Free titles stack. */
@@ -253,7 +253,7 @@ screen_resize_cursor(struct screen *s, u_int sx, u_int sy, int reflow,
 		reflow = 0;
 
 	if (sy != screen_size_y(s))
-		screen_resize_y(s, sy, eat_empty);
+		screen_resize_y(s, sy, eat_empty, cy);
 
 	if (reflow)
 		screen_reflow(s, sx, cx, cy);
@@ -280,7 +280,7 @@ screen_resize(struct screen *s, u_int sx, u_int sy, int reflow)
 }
 
 static void
-screen_resize_y(struct screen *s, u_int sy, int eat_empty)
+screen_resize_y(struct screen *s, u_int sy, int eat_empty, u_int *cy)
 {
 	struct grid	*gd = s->grid;
 	u_int		 needed, available, oldy, i;
@@ -329,6 +329,7 @@ screen_resize_y(struct screen *s, u_int sy, int eat_empty)
 			if (available > needed)
 				available = needed;
 			grid_view_delete_lines(gd, 0, available, 8);
+			(*cy) -= available;
 		}
 	}