diff options
| author | Karoly Lorentey | 2004-05-27 17:24:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-05-27 17:24:17 +0000 |
| commit | 4e1bb54039da0e3d5c84e231104703d62ace938d (patch) | |
| tree | f5bfbeec2c631db3e1a8de4aa3bfe37220580cad /src/process.c | |
| parent | f76e7db651b005bb697a188e4fe684fe25e29601 (diff) | |
| parent | 6c0afe12c98f63cc694e9fae5a05e5fd18afa636 (diff) | |
| download | emacs-4e1bb54039da0e3d5c84e231104703d62ace938d.tar.gz emacs-4e1bb54039da0e3d5c84e231104703d62ace938d.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-342
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-343
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-178
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index d5e76b29b98..9d76b5bd1f9 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4581,7 +4581,8 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 4581 | } | 4581 | } |
| 4582 | } | 4582 | } |
| 4583 | #ifdef NON_BLOCKING_CONNECT | 4583 | #ifdef NON_BLOCKING_CONNECT |
| 4584 | if (check_connect && FD_ISSET (channel, &Connecting)) | 4584 | if (check_connect && FD_ISSET (channel, &Connecting) |
| 4585 | && FD_ISSET (channel, &connect_wait_mask)) | ||
| 4585 | { | 4586 | { |
| 4586 | struct Lisp_Process *p; | 4587 | struct Lisp_Process *p; |
| 4587 | 4588 | ||