diff options
| author | Paul Eggert | 2011-10-29 10:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-29 10:33:13 -0700 |
| commit | 8d0eb4c275581847990b85dbb350caa3df9e653f (patch) | |
| tree | c161f977d59ac3103b04dc0f4aea57c83436a456 /src/process.c | |
| parent | 929bb973dd3faf1655f03ac758942d5b009354ad (diff) | |
| parent | 196e41e4aec1a44ec5b6e9bed485185ba872ae67 (diff) | |
| download | emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.tar.gz emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.zip | |
Merge from trunk.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/process.c b/src/process.c index 716e74758c4..de2edad07bd 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4842,16 +4842,11 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd, | |||
| 4842 | It can't hurt. */ | 4842 | It can't hurt. */ |
| 4843 | else if (nread == -1 && errno == EIO) | 4843 | else if (nread == -1 && errno == EIO) |
| 4844 | { | 4844 | { |
| 4845 | /* Clear the descriptor now, so we only raise the | 4845 | /* Clear the descriptor now, so we only raise the signal once. */ |
| 4846 | signal once. Don't do this if `process' is only | 4846 | FD_CLR (channel, &input_wait_mask); |
| 4847 | a pty. */ | 4847 | FD_CLR (channel, &non_keyboard_wait_mask); |
| 4848 | if (XPROCESS (proc)->pid != -2) | ||
| 4849 | { | ||
| 4850 | FD_CLR (channel, &input_wait_mask); | ||
| 4851 | FD_CLR (channel, &non_keyboard_wait_mask); | ||
| 4852 | 4848 | ||
| 4853 | kill (getpid (), SIGCHLD); | 4849 | kill (getpid (), SIGCHLD); |
| 4854 | } | ||
| 4855 | } | 4850 | } |
| 4856 | #endif /* HAVE_PTYS */ | 4851 | #endif /* HAVE_PTYS */ |
| 4857 | /* If we can detect process termination, don't consider the process | 4852 | /* If we can detect process termination, don't consider the process |