[Emacs-diffs] /srv/bzr/emacs/trunk r110551: Fix Fwindow_end's handling of cached position (Bug#12600).

[martin rudalics]

------------------------------------------------------------
revno: 110551
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-15 11:03:56 +0200
message:
  Fix Fwindow_end's handling of cached position (Bug#12600).
  
  * window.c (Fwindow_end): Rewrite check whether cached position
  can be used (Bug#12600).
  (resize_frame_windows, grow_mini_window, shrink_mini_window):
  Set windows_or_buffers_changed.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-15 01:38:07 +0000
+++ b/src/ChangeLog     2012-10-15 09:03:56 +0000
@@ -1,3 +1,10 @@
+2012-10-15  Martin Rudalics  <address@hidden>
+
+       * window.c (Fwindow_end): Rewrite check whether cached position
+       can be used (Bug#12600).
+       (resize_frame_windows, grow_mini_window, shrink_mini_window):
+       Set windows_or_buffers_changed.
+
 2012-10-15  Daniel Colascione  <address@hidden>
 
        * dbusbind.c: Fix cygw32 build break when compiling with dbus

=== modified file 'src/window.c'
--- a/src/window.c      2012-10-07 22:31:58 +0000
+++ b/src/window.c      2012-10-15 09:03:56 +0000
@@ -1464,9 +1464,7 @@
 #endif
 
   if (! NILP (update)
-      && ! (! NILP (w->window_end_valid)
-           && w->last_modified >= BUF_MODIFF (b)
-           && w->last_overlay_modified >= BUF_OVERLAY_MODIFF (b))
+      && (windows_or_buffers_changed || NILP (w->window_end_valid))
       && !noninteractive)
     {
       struct text_pos startp;
@@ -3795,6 +3793,8 @@
            (m, make_number (XINT (r->top_line) + XINT (r->total_lines)));
        }
     }
+
+  windows_or_buffers_changed++;
 }
 
 
@@ -4208,6 +4208,7 @@
       w->last_modified = 0;
       w->last_overlay_modified = 0;
 
+      windows_or_buffers_changed++;
       adjust_glyphs (f);
       unblock_input ();
     }
@@ -4245,6 +4246,7 @@
          w->last_modified = 0;
          w->last_overlay_modified = 0;
 
+         windows_or_buffers_changed++;
          adjust_glyphs (f);
          unblock_input ();
        }