comparison src/event-stream.c @ 82:6a378aca36af r20-0b91

Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 1ce6082ce73f
children 364816949b59
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
2427 time when one calls accept-process-output with a nil argument 2427 time when one calls accept-process-output with a nil argument
2428 and really need the processes to be handled. */ 2428 and really need the processes to be handled. */
2429 || (!EQ (result, Qt) && event_stream_event_pending_p (0))) 2429 || (!EQ (result, Qt) && event_stream_event_pending_p (0)))
2430 { 2430 {
2431 /* If our timeout has arrived, we move along. */ 2431 /* If our timeout has arrived, we move along. */
2432 if (!event_stream_wakeup_pending_p (timeout_id, 0)) 2432 if (timeout_enabled && !event_stream_wakeup_pending_p (timeout_id, 0))
2433 { 2433 {
2434 timeout_enabled = 0; 2434 timeout_enabled = 0;
2435 process = Qnil; /* We're done. */ 2435 process = Qnil; /* We're done. */
2436 } 2436 }
2437 2437