2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d9b2eb7ab3c..693ddb3bf57 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,10 @@
+2005-10-09  Romain Francoise  <romain@orebokech.com>
+
+        * window.c (Fwindow_end): Don't try to redisplay if non-interactive.
+
 2005-10-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * emacs.c (standard_args): Removed options -i, -itype, --icon-type, 
+        * emacs.c (standard_args): Removed options -i, -itype, --icon-type,
         added -nb, --no-bitmap-icon.
 
         * xfns.c (Fx_create_frame): Make bitmapIcon have default on.
diff --git a/src/window.c b/src/window.c
index 3e9354a7ba8..9ef4fc2eacd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1029,7 +1029,8 @@ if it isn't already recorded.  */)
 
   if (! NILP (update)
       && ! (! NILP (w->window_end_valid)
-            && XFASTINT (w->last_modified) >= MODIFF))
+            && XFASTINT (w->last_modified) >= MODIFF)
+      && !noninteractive)
     {
       struct text_pos startp;
       struct it it;