diff options
| author | Glenn Morris | 2011-10-28 20:12:02 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-10-28 20:12:02 -0400 |
| commit | 83ed7b5c7e24b3e47000014e4865522fe85d1091 (patch) | |
| tree | 8a9851b6cf9e38016aad7b076d2f96231e231724 /src | |
| parent | 5a7a728bb736ee9beea6c30514e0dc95c966de13 (diff) | |
| download | emacs-83ed7b5c7e24b3e47000014e4865522fe85d1091.tar.gz emacs-83ed7b5c7e24b3e47000014e4865522fe85d1091.zip | |
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')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fad9b4f9e46..5ebd288710a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-10-29 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * process.c (wait_reading_process_output): Revert 2009-08-30 change. | ||
| 4 | Not clear what it was for, and it causes various bugs. (Bug#9839) | ||
| 5 | |||
| 1 | 2011-10-28 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-10-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a | 8 | * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a |
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 |