From 522ed7fb454c662f15438c40c172d71b28761e8e Mon Sep 17 00:00:00 2001
From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 9 Apr 2001 12:38:20 +0000
Subject: [PATCH] (try_window_id): When scrolling on a terminal, take the
 change of window_internal_height into account.

---
 src/ChangeLog | 8 ++++++++
 src/xdisp.c   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 048eedf14fa..61598c01b0b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-09  Gerd Moellmann  <gerd@gnu.org>
+
+	* window.c (window_internal_height): Return 1 less if the
+	window has a header line.
+
+	* xdisp.c (try_window_id): When scrolling on a terminal, take
+	the change of window_internal_height into account.
+
 2001-04-09  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* gmalloc.c (align): If the argument SIZE would overflow
diff --git a/src/xdisp.c b/src/xdisp.c
index 2a17d947216..61fb6334678 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11428,7 +11428,9 @@ try_window_id (w)
 	  int first_unchanged_at_end_vpos
 	    = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix);
 	  int from = XFASTINT (w->top) + first_unchanged_at_end_vpos;
-	  int end = XFASTINT (w->top) + window_internal_height (w);
+	  int end = (XFASTINT (w->top)
+		     + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0)
+		     + window_internal_height (w));
 	  
 	  /* Perform the operation on the screen.  */
 	  if (dvpos > 0)
-- 
2.39.5