(try_window_id): When scrolling on a terminal, take

the change of window_internal_height into account.

diff --git a/src/ChangeLog b/src/ChangeLog
index 048eedf14faf27f5bed4050b2ab6531d0a5d92b5..61598c01b0b67890e930da4990158eae3573bb64 100644 (file)
--- 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 2a17d947216ceda960f0acf07934bd3b89ea8617..61fb6334678e972b89756757fd66a8fce491b641 100644 (file)
--- 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)