comparison src/process.c @ 77647:73b045a7fa70

(Faccept_process_output): Revert 2006-03-22 change so that the third argument once again is in microseconds (not milliseconds). This makes it compatible with Emacs 21 and earlier. Problem found by Henrik Rindl���w.

77646:6187b5730b6e

       doc: /* Allow any pending output from subprocesses to be read by Emacs.
It is read into the process' buffers or given to their filter functions.
Non-nil arg PROCESS means do not return until some output has been received
from PROCESS.

Non-nil second arg SECONDS and third arg MILLISEC are number of
seconds and milliseconds to wait; return after that much time whether
or not there is input.  If SECONDS is a floating point number,
it specifies a fractional number of seconds to wait.

If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
from PROCESS, suspending reading output from other processes.
If JUST-THIS-ONE is an integer, don't run any timers either.
Return non-nil iff we received any output before the timeout expired.  */)
     (process, seconds, millisec, just_this_one)
     register Lisp_Object process, seconds, millisec, just_this_one;
{
  int secs, usecs = 0;

  if (! NILP (process))
    CHECK_PROCESS (process);

	  usecs = (int) ((timeout - (double) secs) * 1000000);
	}
      else
	wrong_type_argument (Qnumberp, seconds);

      if (INTEGERP (millisec))
	{
	  int carry;
	  usecs += XINT (millisec) * 1000;
	  carry = usecs / 1000000;
	  secs += carry;
	  if ((usecs -= carry * 1000000) < 0)
	    {
	      secs--;

77647:73b045a7fa70

       doc: /* Allow any pending output from subprocesses to be read by Emacs.
It is read into the process' buffers or given to their filter functions.
Non-nil arg PROCESS means do not return until some output has been received
from PROCESS.

Non-nil second arg SECONDS and third arg MICROSEC are number of
seconds and microseconds to wait; return after that much time whether
or not there is input.  If SECONDS is a floating point number,
it specifies a fractional number of seconds to wait.

If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
from PROCESS, suspending reading output from other processes.
If JUST-THIS-ONE is an integer, don't run any timers either.
Return non-nil iff we received any output before the timeout expired.  */)
     (process, seconds, microsec, just_this_one)
     register Lisp_Object process, seconds, microsec, just_this_one;
{
  int secs, usecs = 0;

  if (! NILP (process))
    CHECK_PROCESS (process);

	  usecs = (int) ((timeout - (double) secs) * 1000000);
	}
      else
	wrong_type_argument (Qnumberp, seconds);

      if (INTEGERP (microsec))
	{
	  int carry;
	  usecs += XINT (microsec);
	  carry = usecs / 1000000;
	  secs += carry;
	  if ((usecs -= carry * 1000000) < 0)
	    {
	      secs--;