[Emacs-diffs] trunk r113868: * xdisp.c (redisplay_window): If window_end_valid is cleared due to

[Dmitry Antipov]

------------------------------------------------------------
revno: 113868
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-14 11:25:45 +0400
message:
  * xdisp.c (redisplay_window): If window_end_valid is cleared due to
  non-zero windows_or_buffers_changed, clear current_matrix_up_to_date_p
  and so do not call to try_cursor_movement for that window.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-14 07:05:54 +0000
+++ b/src/ChangeLog     2013-08-14 07:25:45 +0000
@@ -10,6 +10,9 @@
 
        * xdisp.c (adjust_window_ends): Move duplicated code to new function.
        (try_window, try_window_reusing_current_matrix, try_window_id): Use it.
+       (redisplay_window): If window_end_valid is cleared due to non-zero
+       windows_or_buffers_changed, clear current_matrix_up_to_date_p and
+       so do not call to try_cursor_movement for that window.
 
 2013-08-14  Dmitry Antipov  <address@hidden>
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-08-14 07:05:54 +0000
+++ b/src/xdisp.c       2013-08-14 07:25:45 +0000
@@ -15449,8 +15449,8 @@
        && !current_buffer->clip_changed
        && !window_outdated (w));
 
-  /* When windows_or_buffers_changed is non-zero, we can't rely on
-     the window end being valid, so set it to nil there.  */
+  /* When windows_or_buffers_changed is non-zero, we can't rely
+     on the window end being valid, so set it to zero there.  */
   if (windows_or_buffers_changed)
     {
       /* If window starts on a continuation line, maybe adjust the
@@ -15459,6 +15459,9 @@
        compute_window_start_on_continuation_line (w);
 
       w->window_end_valid = 0;
+      /* If so, we also can't rely on current matrix
+        and should not fool try_cursor_movement below.  */
+      current_matrix_up_to_date_p = 0;
     }
 
   /* Some sanity checks.  */