(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'.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index d6f26cbf8c..16c351b9f9 100644
--- 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);