# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1027283506 0
# Node ID 4298549687a88ae5a59998b4dab9cd3b2dcf964b
# Parent  5879624dc26f20000dc9a0d9f21ae1121d15b4cc
(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.

diff -r 5879624dc26f -r 4298549687a8 src/xdisp.c
--- a/src/xdisp.c	Sun Jul 21 20:30:08 2002 +0000
+++ b/src/xdisp.c	Sun Jul 21 20:31:46 2002 +0000
@@ -10169,7 +10169,6 @@
   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 @@
     }
 
   /* 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))
     {