[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/process.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/process.c [lexbind] |
Date: |
Sat, 04 Sep 2004 05:44:37 -0400 |
Index: emacs/src/process.c
diff -c emacs/src/process.c:1.373.2.11 emacs/src/process.c:1.373.2.12
*** emacs/src/process.c:1.373.2.11 Fri Jul 23 04:42:23 2004
--- emacs/src/process.c Sat Sep 4 09:19:27 2004
***************
*** 4195,4201 ****
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
--- 4195,4201 ----
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
***************
*** 4762,4777 ****
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)
--- 4762,4777 ----
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)
***************
*** 4783,4789 ****
delay += READ_OUTPUT_DELAY_INCREMENT * 2;
}
}
! else if (delay > 0 && (nbytes == readmax - carryover))
{
delay -= READ_OUTPUT_DELAY_INCREMENT;
if (delay == 0)
--- 4783,4789 ----
delay += READ_OUTPUT_DELAY_INCREMENT * 2;
}
}
! else if (delay > 0 && (nbytes == readmax))
{
delay -= READ_OUTPUT_DELAY_INCREMENT;
if (delay == 0)
***************
*** 4802,4808 ****
{
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
--- 4802,4808 ----
{
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