Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-585
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-586
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-587
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-588
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-589
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-590
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-591
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-592

1 files changed, 2 insertions, 1 deletions

diff --git a/src/window.c b/src/window.c
index b34cc3659c1..00a2e06bdeb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1184,7 +1184,8 @@ if it isn't already recorded.  */)
 
   if (! NILP (update)
       && ! (! NILP (w->window_end_valid)
-            && XFASTINT (w->last_modified) >= BUF_MODIFF (b))
+            && XFASTINT (w->last_modified) >= BUF_MODIFF (b)
+            && XFASTINT (w->last_overlay_modified) >= BUF_OVERLAY_MODIFF (b))
       && !noninteractive)
     {
       struct text_pos startp;