[Emacs-diffs] Changes to emacs/src/dispnew.c

[Kim F . Storm]

Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.334 emacs/src/dispnew.c:1.335
*** emacs/src/dispnew.c:1.334   Thu Aug 19 13:59:28 2004
--- emacs/src/dispnew.c Fri Aug 20 10:33:05 2004
***************
*** 6331,6377 ****
    if (sec < 0 || (sec == 0 && usec == 0))
      return Qnil;
  
!   wait_reading_process_input (sec, usec, 0, 0, Qnil, NULL, 0);
! 
!   /* We should always have wait_reading_process_input; we have a dummy
!      implementation for systems which don't support subprocesses.  */
! #if 0
!   /* No wait_reading_process_input */
!   immediate_quit = 1;
!   QUIT;
! 
! #ifdef VMS
!   sys_sleep (sec);
! #else /* not VMS */
! /* The reason this is done this way
!     (rather than defined (H_S) && defined (H_T))
!    is because the VMS preprocessor doesn't grok `defined'.  */
! #ifdef HAVE_SELECT
!   EMACS_GET_TIME (end_time);
!   EMACS_SET_SECS_USECS (timeout, sec, usec);
!   EMACS_ADD_TIME (end_time, end_time, timeout);
! 
!   while (1)
!     {
!       EMACS_GET_TIME (timeout);
!       EMACS_SUB_TIME (timeout, end_time, timeout);
!       if (EMACS_TIME_NEG_P (timeout)
!         || !select (1, 0, 0, 0, &timeout))
!       break;
!     }
! #else /* not HAVE_SELECT */
!   sleep (sec);
! #endif /* HAVE_SELECT */
! #endif /* not VMS */
! 
!   immediate_quit = 0;
! #endif /* no subprocesses */
  
    return Qnil;
  }
  
  
! /* This is just like wait_reading_process_input, except that
     it does the redisplay.
  
     It's also much like Fsit_for, except that it can be used for
--- 6331,6343 ----
    if (sec < 0 || (sec == 0 && usec == 0))
      return Qnil;
  
!   wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0);
  
    return Qnil;
  }
  
  
! /* This is just like wait_reading_process_output, except that
     it does the redisplay.
  
     It's also much like Fsit_for, except that it can be used for
***************
*** 6396,6403 ****
    gobble_input (0);
  #endif
  
!   wait_reading_process_input (sec, usec, reading ? -1 : 1, display,
!                             Qnil, NULL, 0);
  
    return detect_input_pending () ? Qnil : Qt;
  }
--- 6362,6369 ----
    gobble_input (0);
  #endif
  
!   wait_reading_process_output (sec, usec, reading ? -1 : 1, display,
!                              Qnil, NULL, 0);
  
    return detect_input_pending () ? Qnil : Qt;
  }