Fix emacsclient's handling of SIGCONT.

* emacsclient.c (handle_sigcont): Cancel the continue only if tty.

Fixes: debbugs:16883

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fcdde8003bcb285c5f86bf54a733c141c2166798..3cbda8a770669d5e819bc58b32a2a3d07a95e834 100644 (file)
--- 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 6593b91e39ac14fd60f2e9a3f3f8d1bcea69bd0a..148182a6ccf33e057db8b12c8729c4aecbca766e 100644 (file)
--- 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);
     }