From: Jason Rumney <jasonr@gnu.org>
Date: Tue, 30 Oct 2007 22:49:26 +0000 (+0000)
Subject: (Fformat_mode_line): Do nothing when noninteractive.
X-Git-Tag: emacs-pretest-22.1.90~468
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63eb134d1eeee0d69eff1fa38005876335f28e1e;p=emacs.git

(Fformat_mode_line): Do nothing when noninteractive.
---

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)