(kbd_buffer_get_event): Follow the non-interactive

case when running as a daemon before detaching.

diff --git a/src/ChangeLog b/src/ChangeLog
index c410c70ae3f7469d4cb562e2d28fd3f7eea7c9f7..016bba73911a26825b76abb2249db6cf9f28cacf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * keyboard.c (kbd_buffer_get_event): Follow the non-interactive
+       case when running as a daemon before detaching.
+
 2008-12-03  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32.c (init_environment): Don't unload library shell32.dll.

diff --git a/src/keyboard.c b/src/keyboard.c
index f04ab9cf2e9e850853ef44d6ab52231089343e1f..1d2f4eb7a9af92f4c1fb19f568554a88c3162708 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3978,7 +3978,10 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
   register int c;
   Lisp_Object obj;
 
-  if (noninteractive)
+  if (noninteractive
+      /* In case we are running as a daemon, only do this before
+        detaching from the terminal.  */
+      || (IS_DAEMON && daemon_pipe[1] >= 0))
     {
       c = getchar ();
       XSETINT (obj, c);