diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-25 11:06:53 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-25 11:06:53 -0800 |
| commit | 591debed68a04fe88e4c0225fd53272d2045f327 (patch) | |
| tree | 53f1c8cb49d91238004036921e8f86d5e0b4104f /lib-src | |
| parent | 9a89cfa29d9ec1db1be81e3adef28ff703fddaa5 (diff) | |
| download | emacs-591debed68a04fe88e4c0225fd53272d2045f327.tar.gz | |
Fix emacsclient's handling of SIGCONT.
* emacsclient.c (handle_sigcont): Cancel the continue only if tty.
Fixes: debbugs:16883
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 6 |
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); } |