From ef272f1fc10a4f8464c886ccc02ea67b2c3b2769 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 6 Mar 2011 18:19:25 -0500 Subject: [PATCH] Revert incorrect logic in 2011-03-06T07:50:01Z!eggert@cs.ucla.edu. * src/xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 change. --- src/ChangeLog | 5 +++++ src/xdisp.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a96edcdfdca..d7131096995 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-03-06 Chong Yidong + + * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 + change. + 2011-03-06 Paul Eggert current_column: Now returns EMACS_INT, fixing some iftc diff --git a/src/xdisp.c b/src/xdisp.c index 44cb7130119..e62b491ad32 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13697,6 +13697,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p) int buffer_unchanged_p = 0; int temp_scroll_step = 0; int count = SPECPDL_INDEX (); + int rc; int centering_position = -1; int last_line_misfit = 0; EMACS_INT beg_unchanged, end_unchanged; @@ -14008,15 +14009,12 @@ redisplay_window (Lisp_Object window, int just_this_one_p) /* Handle case where text has not changed, only point, and it has 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) + if (current_matrix_up_to_date_p + && (rc = try_cursor_movement (window, startp, &temp_scroll_step), + rc != CURSOR_MOVEMENT_CANNOT_BE_USED)) { - int rc = try_cursor_movement (window, startp, &temp_scroll_step); - switch (rc) { - case CURSOR_MOVEMENT_CANNOT_BE_USED: - break; - case CURSOR_MOVEMENT_SUCCESS: used_current_matrix_p = 1; goto done; -- 2.39.5