diff options
| author | Miles Bader | 2004-07-23 04:30:44 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-07-23 04:30:44 +0000 |
| commit | 6bb4a8bf9aaa63141ad7c12ab6b6ba9939050178 (patch) | |
| tree | ffe1b6fc55a6ef858938f3e80a9fd79ae096ad10 /src/process.c | |
| parent | cd9fc52e16bd2c780919c927bbf734039dd9a7dc (diff) | |
| parent | 9586e1d3a4255c58bf827400ab7c038a3ee988a3 (diff) | |
| download | emacs-6bb4a8bf9aaa63141ad7c12ab6b6ba9939050178.tar.gz emacs-6bb4a8bf9aaa63141ad7c12ab6b6ba9939050178.zip | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-25
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-459
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-463
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464
Update from CVS: lisp/progmodes/make-mode.el: Fix comments.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-465
Update from CVS
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index b810b027737..0b3f6bfbbd2 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4191,12 +4191,13 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 4191 | SELECT_TYPE Atemp, Ctemp; | 4191 | SELECT_TYPE Atemp, Ctemp; |
| 4192 | 4192 | ||
| 4193 | Atemp = input_wait_mask; | 4193 | Atemp = input_wait_mask; |
| 4194 | #ifdef MAC_OSX | 4194 | #if 0 |
| 4195 | /* On Mac OS X, the SELECT system call always says input is | 4195 | /* On Mac OS X 10.0, the SELECT system call always says input is |
| 4196 | present (for reading) at stdin, even when none is. This | 4196 | present (for reading) at stdin, even when none is. This |
| 4197 | causes the call to SELECT below to return 1 and | 4197 | causes the call to SELECT below to return 1 and |
| 4198 | status_notify not to be called. As a result output of | 4198 | status_notify not to be called. As a result output of |
| 4199 | subprocesses are incorrectly discarded. */ | 4199 | subprocesses are incorrectly discarded. |
| 4200 | */ | ||
| 4200 | FD_CLR (0, &Atemp); | 4201 | FD_CLR (0, &Atemp); |
| 4201 | #endif | 4202 | #endif |
| 4202 | Ctemp = connect_wait_mask; | 4203 | Ctemp = connect_wait_mask; |