[Emacs-diffs] /srv/bzr/emacs/trunk r103569: Revert incorrect logic in revision 103558.

[Chong Yidong]

------------------------------------------------------------
revno: 103569
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-03-06 18:19:25 -0500
message:
  Revert incorrect logic in revision 103558.
  
  * src/xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 change.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-06 10:53:51 +0000
+++ b/src/ChangeLog     2011-03-06 23:19:25 +0000
@@ -1,3 +1,8 @@
+2011-03-06  Chong Yidong  <address@hidden>
+
+       * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
+       change.
+
 2011-03-06  Paul Eggert  <address@hidden>
 
        current_column: Now returns EMACS_INT, fixing some iftc

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-03-06 10:27:06 +0000
+++ b/src/xdisp.c       2011-03-06 23:19:25 +0000
@@ -13697,6 +13697,7 @@
   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 @@
   /* 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;