Mercurial > emacs
diff src/xdisp.c @ 99178:8af0a96bf7da
* xdisp.c (pos_visible_p, redisplay_internal, message3_nolog)
(message2_nolog): Check FRAME_INITIAL_P instead of noninteractively.
* emacs.c (is_daemon): Remove.
(main): Don't set is_daemon.
(IS_DAEMON): New macro.
(Fdaemonp, Fdaemon_initialized): Use it.
(Fdaemon_initialized): Wrtie a char into the pipe to make sure the
parent exits.
(syms_of_emacs): Explicitly initialize daemon_pipe[1].
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 28 Oct 2008 01:02:44 +0000 |
parents | 299572dfe42e |
children | 9ddf901895dd |
line wrap: on
line diff
--- a/src/xdisp.c Tue Oct 28 00:42:34 2008 +0000 +++ b/src/xdisp.c Tue Oct 28 01:02:44 2008 +0000 @@ -1323,7 +1323,7 @@ int visible_p = 0; struct buffer *old_buffer = NULL; - if (noninteractive) + if (FRAME_INITIAL_P (XFRAME (WINDOW_FRAME (w)))) return visible_p; if (XBUFFER (w->buffer) != current_buffer) @@ -7891,7 +7891,7 @@ struct frame *sf = SELECTED_FRAME (); message_enable_multibyte = multibyte; - if (noninteractive) + if (FRAME_INITIAL_P (sf)) { if (noninteractive_need_newline) putc ('\n', stderr); @@ -7990,7 +7990,7 @@ struct frame *sf = SELECTED_FRAME (); message_enable_multibyte = multibyte; - if (noninteractive) + if (FRAME_INITIAL_P (sf)) { if (noninteractive_need_newline) putc ('\n', stderr); @@ -8088,7 +8088,7 @@ putc ('\n', stderr); noninteractive_need_newline = 0; fprintf (stderr, m, SDATA (string)); - if (cursor_in_echo_area == 0) + if (!cursor_in_echo_area) fprintf (stderr, "\n"); fflush (stderr); } @@ -11300,7 +11300,7 @@ /* No redisplay if running in batch mode or frame is not yet fully initialized, or redisplay is explicitly turned off by setting Vinhibit_redisplay. */ - if (noninteractive + if (FRAME_INITIAL_P (SELECTED_FRAME ()) || !NILP (Vinhibit_redisplay)) return;