aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorGlenn Morris2011-10-28 20:12:02 -0400
committerGlenn Morris2011-10-28 20:12:02 -0400
commit83ed7b5c7e24b3e47000014e4865522fe85d1091 (patch)
tree8a9851b6cf9e38016aad7b076d2f96231e231724 /src/process.c
parent5a7a728bb736ee9beea6c30514e0dc95c966de13 (diff)
downloademacs-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/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