[Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE]

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jason Rumney <jasonr>   07/10/30 22:48:28

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1149.2.12
retrieving revision 1.1149.2.13
diff -u -b -r1.1149.2.12 -r1.1149.2.13
--- xdisp.c     16 Oct 2007 08:59:25 -0000      1.1149.2.12
+++ xdisp.c     30 Oct 2007 22:48:26 -0000      1.1149.2.13
@@ -17368,7 +17368,9 @@
     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)