diff options
author | Kim F. Storm <storm@cua.dk> | 2005-02-10 22:49:16 +0000 |
---|---|---|
committer | Kim F. Storm <storm@cua.dk> | 2005-02-10 22:49:16 +0000 |
commit | f1deb763a49fb5bbf3fda609c61d1d6937d531c5 (patch) | |
tree | 3e2e3b389242691220a2c9d87ce3ef1696f5d1bc /src/xdisp.c | |
parent | c10bb00a967e145c8fc1ebf277ad45f49e0f8e69 (diff) | |
download | emacs-f1deb763a49fb5bbf3fda609c61d1d6937d531c5.tar.gz |
(try_window_id): Set first_unchanged_at_end_row to NULL
if it moves outside window or it doesn't display text.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r-- | src/xdisp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index db4b2a244ac..0f385dc08df 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13824,7 +13824,12 @@ try_window_id (w) 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 @@ try_window_id (w) /* 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 |