(redisplay_window): Don't test BEG_UNCHANGED

and END_UNCHANGED when setting buffer_unchanged_p.
Use current_matrix_up_to_date_p to decide whether to use try_cursor_movement.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index a271604aa8e..4e52d39c908 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10169,7 +10169,6 @@ redisplay_window (window, just_this_one_p)
   buffer_unchanged_p
     = (!NILP (w->window_end_valid)
        && !current_buffer->clip_changed
-       && END_UNCHANGED + BEG_UNCHANGED >= Z - BEG
        && XFASTINT (w->last_modified) >= MODIFF
        && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF);
 
@@ -10367,8 +10366,9 @@ redisplay_window (window, just_this_one_p)
     }
 
   /* Handle case where text has not changed, only point, and it has
-     not moved off the frame.  */
-  if (buffer_unchanged_p
+     not moved off the frame, and we are not retrying after hscroll.
+     (current_matrix_up_to_date_p is nonzero when retrying.)  */
+  if (current_matrix_up_to_date_p
       && (rc = try_cursor_movement (window, startp, &temp_scroll_step),
           rc != CURSOR_MOVEMENT_CANNOT_BE_USED))
     {