(kbd_buffer_get_event): Follow the non-interactive

case when running as a daemon before detaching.

(kbd_buffer_get_event): Follow the non-interactive
case when running as a daemon before detaching.
a3b1a468 · Dan Nicolaescu · c8d6b4bc · a3b1a468 · a3b1a468
Commit a3b1a468 authored Dec 04, 2008 by Dan Nicolaescu
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/keyboard.c src/keyboard.c +4 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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.

--- 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);