Merge from mainline.

2 files changed, 16 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index add827a9dc4..90722187e6c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-03-06  Paul Eggert  <eggert@cs.ucla.edu>
+2011-03-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xmenu.c (menu_highlight_callback): Now static.
         (set_frame_menubar): Remove unused local.
@@ -12,10 +12,18 @@
         (note_mouse_highlight): Mark variables that gcc -Wuninitialized
         does not deduce are never used uninitialized.
 
-        * lisp.h (IF_LINT): New macro, copied from ../lib-src/emacsclient.c
-        which in turn is copied from coreutils.
+        * lisp.h (IF_LINT): New macro, copied from ../lib-src/emacsclient.c.
+
+2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
+        change.
 
-        current_column: Now returns EMACS_INT, fixing some iftc.
+2011-03-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        current_column: Now returns EMACS_INT, fixing some iftc
+        that was introduced in the 2002-06-02 change "temporarily"; see
+        <http://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
         * bytecode.c (Fbyte_code): Don't cast current_column () to int.
         * cmds.c (internal_self_insert): Likewise.
         * indent.c (Fcurrent_column): Likewise.
@@ -25,7 +33,6 @@
         to int.
         * xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
         Likewise.
-
         * cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
         not int or double, if they might contain a column number.
         * indent.c (current_column, Findent_to, indented_beyond_p):
diff --git a/src/xdisp.c b/src/xdisp.c
index f7f887f7850..858a0f74fb1 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;