Mercurial > emacs

changeset 60013:b107d63ac05b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(try_window_id): Set first_unchanged_at_end_row to NULL if it moves outside window or it doesn't display text.
author Kim F. Storm <storm@cua.dk>
date Thu, 10 Feb 2005 22:49:16 +0000
parents 870890cbb396
children 30c4551738fd
files src/xdisp.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Thu Feb 10 22:48:35 2005 +0000
+++ b/src/xdisp.c	Thu Feb 10 22:49:16 2005 +0000
@@ -13824,7 +13824,12 @@
 			bottom_vpos, dy);
 
   if (first_unchanged_at_end_row)
-    first_unchanged_at_end_row += dvpos;
+    {
+      first_unchanged_at_end_row += dvpos;
+      if (first_unchanged_at_end_row->y >= it.last_visible_y
+	  || !MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row))
+	first_unchanged_at_end_row = NULL;
+    }
 
   /* If scrolling up, there may be some lines to display at the end of
      the window.  */
@@ -13881,7 +13886,6 @@
 
   /* Update window_end_pos and window_end_vpos.  */
   if (first_unchanged_at_end_row
-      && first_unchanged_at_end_row->y < it.last_visible_y
       && !last_text_row_at_end)
     {
       /* Window end line if one of the preserved rows from the current