From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 10 Mar 2014 00:09:30 +0000 (+0100)
Subject: lib-src/emacsclient.c (main): #ifdef out previous change on Windows.
X-Git-Tag: emacs-24.3.90~237
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f11352e68b53f0c9dc810124664691f4b73b8ca3;p=emacs.git

lib-src/emacsclient.c (main): #ifdef out previous change on Windows.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0c3d7d723c5..7e7f6bf3771 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (main): #ifdef out previous change on Windows.
+
 2014-03-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix emacsclient terminal corruption when in background (Bug#16892).
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index cf16874589d..bd0aa121836 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1556,6 +1556,7 @@ main (int argc, char **argv)
       exit (EXIT_FAILURE);
     }
 
+#ifndef WINDOWSNT
   if (tty)
     {
       pid_t pgrp = getpgrp ();
@@ -1563,6 +1564,7 @@ main (int argc, char **argv)
       if (0 <= tcpgrp && tcpgrp != pgrp)
 	kill (-pgrp, SIGTTIN);
     }
+#endif /* !WINDOWSNT */
 
   /* If alternate_editor is the empty string, start the emacs daemon
      in case of failure to connect.  */