(try_scrolling): If after make_cursor_line_fully_visible

we go to too_near_end, call clear_glyph_matrix.
(redisplay_window): After make_cursor_line_fully_visible,
call clear_glyph_matrix and bypass `goto done'.

diff --git a/src/xdisp.c b/src/xdisp.c
index d6f26cbf8c8fd16148e70489d1ca889130a374b1..16c351b9f91e4a0d4a1ce040c5eb08892b600e4e 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9789,7 +9789,10 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
       /* If cursor ends up on a partially visible line,
         treat that as being off the bottom of the screen.  */
       if (! make_cursor_line_fully_visible (w))
-       goto too_near_end;
+       {
+         clear_glyph_matrix (w->desired_matrix);
+         goto too_near_end;
+       }
       rc = SCROLLING_SUCCESS;
     }
 
@@ -10496,9 +10499,10 @@ redisplay_window (window, just_this_one_p)
            w->base_line_number = Qnil;
 
          if (!make_cursor_line_fully_visible (w))
+           clear_glyph_matrix (w->desired_matrix);
            /* Drop through and scroll.  */
-           ;
-         goto done;
+         else
+           goto done;
        }
       else
        clear_glyph_matrix (w->desired_matrix);