# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1229978752 0
# Node ID c7b149d90f178c073a998dbd07494491b0303961
# Parent  7ad0cf8d61fbc1a780b6bdecbb143e7a762e6ecc
(read_minibuf): Follow the non-interactive case when
running as a daemon, before detaching.

diff -r 7ad0cf8d61fb -r c7b149d90f17 src/ChangeLog
--- a/src/ChangeLog	Mon Dec 22 20:20:25 2008 +0000
+++ b/src/ChangeLog	Mon Dec 22 20:45:52 2008 +0000
@@ -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 -r 7ad0cf8d61fb -r c7b149d90f17 src/minibuf.c
--- a/src/minibuf.c	Mon Dec 22 20:20:25 2008 +0000
+++ b/src/minibuf.c	Mon Dec 22 20:45:52 2008 +0000
@@ -525,7 +525,11 @@
 		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),