2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index faa02a11786..8ee05c00808 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-30  Jason Rumney  <jasonr@gnu.org>
+
+        * xdisp.c (Fformat_mode_line): Do nothing when noninteractive.
+
 2007-10-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * unexmacosx.c (unexec_regions_recorder, unexec_regions_merge):
diff --git a/src/xdisp.c b/src/xdisp.c
index 92c0af8c5ed..9e3a3bade1f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17368,7 +17368,9 @@ are the selected window and the window's buffer).  */)
     buffer = w->buffer;
   CHECK_BUFFER (buffer);
 
-  if (NILP (format))
+  /* Make formatting the modeline a non-op when noninteractive, otherwise
+     there will be problems later caused by a partially initialized frame.  */
+  if (NILP (format) || noninteractive)
     return build_string ("");
 
   if (no_props)