aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorAlan Mackenzie2011-11-03 22:03:18 +0000
committerAlan Mackenzie2011-11-03 22:03:18 +0000
commit85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b (patch)
tree2a207d6e9e906119087ad357c892414db01211cb /src/process.c
parenta6ba2ab9277496b66f6939766a3470c1f0a84287 (diff)
parent14e1d9eab9f4b7341f92397a0a9a2706f7b26ee9 (diff)
downloademacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.tar.gz
emacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.zip
Merge.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/process.c b/src/process.c
index dc37ec5f961..c316139a713 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4856,16 +4856,11 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
4856 It can't hurt. */ 4856 It can't hurt. */
4857 else if (nread == -1 && errno == EIO) 4857 else if (nread == -1 && errno == EIO)
4858 { 4858 {
4859 /* Clear the descriptor now, so we only raise the 4859 /* Clear the descriptor now, so we only raise the signal once. */
4860 signal once. Don't do this if `process' is only 4860 FD_CLR (channel, &input_wait_mask);
4861 a pty. */ 4861 FD_CLR (channel, &non_keyboard_wait_mask);
4862 if (XPROCESS (proc)->pid != -2)
4863 {
4864 FD_CLR (channel, &input_wait_mask);
4865 FD_CLR (channel, &non_keyboard_wait_mask);
4866 4862
4867 kill (getpid (), SIGCHLD); 4863 kill (getpid (), SIGCHLD);
4868 }
4869 } 4864 }
4870#endif /* HAVE_PTYS */ 4865#endif /* HAVE_PTYS */
4871 /* If we can detect process termination, don't consider the process 4866 /* If we can detect process termination, don't consider the process