changeset 46603:4298549687a8

(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.
author Richard M. Stallman <rms@gnu.org>
date Sun, 21 Jul 2002 20:31:46 +0000
parents 5879624dc26f
children 8980a92ac42a
files src/xdisp.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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))
     {