(read_minibuf): Follow the non-interactive case when

running as a daemon, before detaching.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c7b327f274e681ea2849cba633f38a88df9a6f7..e7d44c35b51ed0dab77361a4af8a0589f35b5b9b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * minibuf.c (read_minibuf): Follow the non-interactive case when
+       running as a daemon, before detaching.
+
 2008-12-22  Andreas Schwab  <schwab@suse.de>
 
        * buffer.c (init_buffer): Use realloc instead of xrealloc.

diff --git a/src/minibuf.c b/src/minibuf.c
index e79c7455f3c414990720763504b5bad2c2c1315e..694cf4fa1a4be0c3b3efbb82df5b4ced01c8f942 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -525,7 +525,11 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
                build_string ("Command attempted to use minibuffer while in minibuffer"));
     }
 
-  if (noninteractive && NILP (Vexecuting_kbd_macro))
+  if ((noninteractive
+       /* In case we are running as a daemon, only do this before
+         detaching from the terminal.  */
+       || (IS_DAEMON && (daemon_pipe[1] >= 0)))
+      && NILP (Vexecuting_kbd_macro))
     {
       val = read_minibuf_noninteractive (map, initial, prompt,
                                         make_number (pos),