aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c
index 06e931af9b6..a62b13c3f38 100644
--- a/src/process.c
+++ b/src/process.c
@@ -137,6 +137,11 @@ extern Lisp_Object QCfamily, QCfilter;
137 137
138/* Qexit is declared and initialized in eval.c. */ 138/* Qexit is declared and initialized in eval.c. */
139 139
140/* QCfamily is defined in xfaces.c. */
141extern Lisp_Object QCfamily;
142/* QCfilter is defined in keyboard.c. */
143extern Lisp_Object QCfilter;
144
140/* a process object is a network connection when its childp field is neither 145/* a process object is a network connection when its childp field is neither
141 Qt nor Qnil but is instead a cons cell (HOSTNAME PORTNUM). */ 146 Qt nor Qnil but is instead a cons cell (HOSTNAME PORTNUM). */
142 147
@@ -3750,6 +3755,14 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
3750 SELECT_TYPE Atemp, Ctemp; 3755 SELECT_TYPE Atemp, Ctemp;
3751 3756
3752 Atemp = input_wait_mask; 3757 Atemp = input_wait_mask;
3758#ifdef MAC_OSX
3759 /* On Mac OS X, the SELECT system call always says input is
3760 present (for reading) at stdin, even when none is. This
3761 causes the the call to SELECT below to return 1 and
3762 status_notify not to be called. As a result output of
3763 subprocesses are incorrectly discarded. */
3764 FD_CLR (0, &Atemp);
3765#endif
3753 Ctemp = connect_wait_mask; 3766 Ctemp = connect_wait_mask;
3754 EMACS_SET_SECS_USECS (timeout, 0, 0); 3767 EMACS_SET_SECS_USECS (timeout, 0, 0);
3755 if ((select (max (max_process_desc, max_keyboard_desc) + 1, 3768 if ((select (max (max_process_desc, max_keyboard_desc) + 1,