[Emacs-diffs] Changes to emacs/src/process.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/process.c
diff -c emacs/src/process.c:1.408.2.6 emacs/src/process.c:1.408.2.7
*** emacs/src/process.c:1.408.2.6       Fri Jul 23 04:30:43 2004
--- emacs/src/process.c Tue Aug  3 00:03:00 2004
***************
*** 4196,4202 ****
               present (for reading) at stdin, even when none is.  This
               causes the call to SELECT below to return 1 and
               status_notify not to be called.  As a result output of
!              subprocesses are incorrectly discarded.  
          */
            FD_CLR (0, &Atemp);
  #endif
--- 4196,4202 ----
               present (for reading) at stdin, even when none is.  This
               causes the call to SELECT below to return 1 and
               status_notify not to be called.  As a result output of
!              subprocesses are incorrectly discarded.
          */
            FD_CLR (0, &Atemp);
  #endif
***************
*** 4763,4778 ****
    if (DATAGRAM_CHAN_P (channel))
      {
        int len = datagram_address[channel].len;
!       nbytes = recvfrom (channel, chars + carryover, readmax - carryover,
                         0, datagram_address[channel].sa, &len);
      }
    else
  #endif
    if (proc_buffered_char[channel] < 0)
      {
!       nbytes = emacs_read (channel, chars + carryover, readmax - carryover);
  #ifdef ADAPTIVE_READ_BUFFERING
!       if (!NILP (p->adaptive_read_buffering))
        {
          int delay = XINT (p->read_output_delay);
          if (nbytes < 256)
--- 4763,4778 ----
    if (DATAGRAM_CHAN_P (channel))
      {
        int len = datagram_address[channel].len;
!       nbytes = recvfrom (channel, chars + carryover, readmax,
                         0, datagram_address[channel].sa, &len);
      }
    else
  #endif
    if (proc_buffered_char[channel] < 0)
      {
!       nbytes = emacs_read (channel, chars + carryover, readmax);
  #ifdef ADAPTIVE_READ_BUFFERING
!       if (nbytes > 0 && !NILP (p->adaptive_read_buffering))
        {
          int delay = XINT (p->read_output_delay);
          if (nbytes < 256)
***************
*** 4784,4790 ****
                  delay += READ_OUTPUT_DELAY_INCREMENT * 2;
                }
            }
!         else if (delay > 0 && (nbytes == readmax - carryover))
            {
              delay -= READ_OUTPUT_DELAY_INCREMENT;
              if (delay == 0)
--- 4784,4790 ----
                  delay += READ_OUTPUT_DELAY_INCREMENT * 2;
                }
            }
!         else if (delay > 0 && (nbytes == readmax))
            {
              delay -= READ_OUTPUT_DELAY_INCREMENT;
              if (delay == 0)
***************
*** 4803,4809 ****
      {
        chars[carryover] = proc_buffered_char[channel];
        proc_buffered_char[channel] = -1;
!       nbytes = emacs_read (channel, chars + carryover + 1,  readmax - 1 - 
carryover);
        if (nbytes < 0)
        nbytes = 1;
        else
--- 4803,4809 ----
      {
        chars[carryover] = proc_buffered_char[channel];
        proc_buffered_char[channel] = -1;
!       nbytes = emacs_read (channel, chars + carryover + 1,  readmax - 1);
        if (nbytes < 0)
        nbytes = 1;
        else