From: Kim F. Storm <storm@cua.dk>
Date: Fri, 20 Aug 2004 10:33:05 +0000 (+0000)
Subject: (Fsleep_for): Remove obsolete code.
X-Git-Tag: ttn-vms-21-2-B4~5234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dcd1ca45ed1d3e07390ca976f5026006ccae4444;p=emacs.git

(Fsleep_for): Remove obsolete code.
Rename wait_reading_process_input to wait_reading_process_output.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 0d2ce118e0f..903bdaabf3b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6331,47 +6331,13 @@ Emacs was built without floating point support.
   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 */
+  wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0);
 
   return Qnil;
 }
 
 
-/* This is just like wait_reading_process_input, except that
+/* 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,8 +6362,8 @@ sit_for (sec, usec, reading, display, initial_display)
   gobble_input (0);
 #endif
 
-  wait_reading_process_input (sec, usec, reading ? -1 : 1, display,
-			      Qnil, NULL, 0);
+  wait_reading_process_output (sec, usec, reading ? -1 : 1, display,
+			       Qnil, NULL, 0);
 
   return detect_input_pending () ? Qnil : Qt;
 }