aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-10 01:09:30 +0100
committerJuanma Barranquero2014-03-10 01:09:30 +0100
commitf11352e68b53f0c9dc810124664691f4b73b8ca3 (patch)
treeb7e4b2a6ddf009828239f0f52f036cd062ea42eb /lib-src
parent8cf07e5a55cfb5d8b12e6a2be87144c6f19a6f65 (diff)
downloademacs-f11352e68b53f0c9dc810124664691f4b73b8ca3.tar.gz
emacs-f11352e68b53f0c9dc810124664691f4b73b8ca3.zip
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 0c3d7d723c5..7e7f6bf3771 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12014-03-10 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacsclient.c (main): #ifdef out previous change on Windows.
4
12014-03-09 Paul Eggert <eggert@cs.ucla.edu> 52014-03-09 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix emacsclient terminal corruption when in background (Bug#16892). 7 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)
1556 exit (EXIT_FAILURE); 1556 exit (EXIT_FAILURE);
1557 } 1557 }
1558 1558
1559#ifndef WINDOWSNT
1559 if (tty) 1560 if (tty)
1560 { 1561 {
1561 pid_t pgrp = getpgrp (); 1562 pid_t pgrp = getpgrp ();
@@ -1563,6 +1564,7 @@ main (int argc, char **argv)
1563 if (0 <= tcpgrp && tcpgrp != pgrp) 1564 if (0 <= tcpgrp && tcpgrp != pgrp)
1564 kill (-pgrp, SIGTTIN); 1565 kill (-pgrp, SIGTTIN);
1565 } 1566 }
1567#endif /* !WINDOWSNT */
1566 1568
1567 /* If alternate_editor is the empty string, start the emacs daemon 1569 /* If alternate_editor is the empty string, start the emacs daemon
1568 in case of failure to connect. */ 1570 in case of failure to connect. */