aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2014-03-10 01:09:30 +0100
committerJuanma Barranquero <[email protected]>2014-03-10 01:09:30 +0100
commitf11352e68b53f0c9dc810124664691f4b73b8ca3 (patch)
treeb7e4b2a6ddf009828239f0f52f036cd062ea42eb /lib-src
parent8cf07e5a55cfb5d8b12e6a2be87144c6f19a6f65 (diff)
lib-src/emacsclient.c (main): #ifdef out previous change on Windows.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/emacsclient.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0c3d7d723c..7e7f6bf377 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-10 Juanma Barranquero <[email protected]>
+
+ * emacsclient.c (main): #ifdef out previous change on Windows.
+
2014-03-09 Paul Eggert <[email protected]>
Fix emacsclient terminal corruption when in background (Bug#16892).
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index cf16874589..bd0aa12183 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. */