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.

diff --git a/src/ChangeLog b/src/ChangeLog
index e142cad7bf6b50a39ec54b0687a93a100a280952..6acc22a1b279a961cc11dbb1b7b99ef0a8e51ba8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-15  Martin Rudalics  <rudalics@gmx.at>
+
+       * 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  <dancol@dancol.org>
 
        * dbusbind.c: Fix cygw32 build break when compiling with dbus

diff --git a/src/window.c b/src/window.c
index 61d2a8b073f30670e3dcf4e4b5c0c2d613275ef6..b4fee61cac8a2dfc0cb67ce927ea2c388179e39d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1464,9 +1464,7 @@ if it isn't already recorded.  */)
 #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 @@ resize_frame_windows (struct frame *f, int size, int horflag)
            (m, make_number (XINT (r->top_line) + XINT (r->total_lines)));
        }
     }
+
+  windows_or_buffers_changed++;
 }
 
 
@@ -4208,6 +4208,7 @@ grow_mini_window (struct window *w, int delta)
       w->last_modified = 0;
       w->last_overlay_modified = 0;
 
+      windows_or_buffers_changed++;
       adjust_glyphs (f);
       unblock_input ();
     }
@@ -4245,6 +4246,7 @@ shrink_mini_window (struct window *w)
          w->last_modified = 0;
          w->last_overlay_modified = 0;
 
+         windows_or_buffers_changed++;
          adjust_glyphs (f);
          unblock_input ();
        }