summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/emacsclient.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fcdde8003bc..3cbda8a7706 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-25 Andreas Amann <a.amann@ucc.ie> (tiny change)
+
+ Fix emacsclient's handling of SIGCONT (Bug#16883).
+ * emacsclient.c (handle_sigcont): Cancel the continue only if tty.
+
2014-01-22 Eli Zaretskii <eliz@gnu.org>
* update-game-score.c (write_scores) [WINDOWSNT]: Use chmod
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 6593b91e39a..148182a6ccf 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1108,12 +1108,12 @@ handle_sigcont (int signalnum)
if (tcgetpgrp (1) == getpgrp ())
{
- /* We are in the foreground. */
+ /* We are in the foreground. */
send_to_emacs (emacs_socket, "-resume \n");
}
- else
+ else if (tty)
{
- /* We are in the background; cancel the continue. */
+ /* We are in the background; cancel the continue. */
raise (SIGSTOP);
}