diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-10-30 22:49:26 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-10-30 22:49:26 +0000 |
| commit | 63eb134d1eeee0d69eff1fa38005876335f28e1e (patch) | |
| tree | aec0cf6904d3db7929b6c7d45601d9fa74abeeb1 | |
| parent | 5553835fc4d71fb927e8c37cb76e27334457e1e2 (diff) | |
| download | emacs-63eb134d1eeee0d69eff1fa38005876335f28e1e.tar.gz | |
(Fformat_mode_line): Do nothing when noninteractive.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
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) |