diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-10-28 20:12:02 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-10-28 20:12:02 -0400 |
| commit | 83ed7b5c7e24b3e47000014e4865522fe85d1091 (patch) | |
| tree | 8a9851b6cf9e38016aad7b076d2f96231e231724 /src/process.c | |
| parent | 5a7a728bb736ee9beea6c30514e0dc95c966de13 (diff) | |
| download | emacs-83ed7b5c7e24b3e47000014e4865522fe85d1091.tar.gz | |
Revert problematic change to wait_reading_process_output.
* src/process.c (wait_reading_process_output): Revert 2009-08-30 change.
Not clear what it was for, and it causes various bugs. (Bug#9839)
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 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, It can't hurt. */ else if (nread == -1 && errno == EIO) { - /* Clear the descriptor now, so we only raise the - signal once. Don't do this if `process' is only - a pty. */ - if (XPROCESS (proc)->pid != -2) - { - FD_CLR (channel, &input_wait_mask); - FD_CLR (channel, &non_keyboard_wait_mask); + /* Clear the descriptor now, so we only raise the signal once. */ + FD_CLR (channel, &input_wait_mask); + FD_CLR (channel, &non_keyboard_wait_mask); - kill (getpid (), SIGCHLD); - } + kill (getpid (), SIGCHLD); } #endif /* HAVE_PTYS */ /* If we can detect process termination, don't consider the process |