/[emacs]/emacs/src/process.c
ViewVC logotype

Diff of /emacs/src/process.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.373.2.6 by miles, Tue May 11 02:38:46 2004 UTC revision 1.373.2.7 by miles, Tue Jul 6 09:14:37 2004 UTC
# Line 4018  wait_reading_process_input (time_limit, Line 4018  wait_reading_process_input (time_limit,
4018       int do_display;       int do_display;
4019  {  {
4020    register int channel, nfds;    register int channel, nfds;
4021    static SELECT_TYPE Available;    SELECT_TYPE Available;
4022    static SELECT_TYPE Connecting;    SELECT_TYPE Connecting;
4023    int check_connect, check_delay, no_avail;    int check_connect, check_delay, no_avail;
4024    int xerrno;    int xerrno;
4025    Lisp_Object proc;    Lisp_Object proc;
# Line 4030  wait_reading_process_input (time_limit, Line 4030  wait_reading_process_input (time_limit,
4030    /* Either nil or a cons cell, the car of which is of interest and    /* Either nil or a cons cell, the car of which is of interest and
4031       may be changed outside of this routine.  */       may be changed outside of this routine.  */
4032    Lisp_Object wait_for_cell = Qnil;    Lisp_Object wait_for_cell = Qnil;
4033      int saved_waiting_for_user_input_p = waiting_for_user_input_p;
4034    
4035    FD_ZERO (&Available);    FD_ZERO (&Available);
4036    FD_ZERO (&Connecting);    FD_ZERO (&Connecting);
# Line 4643  wait_reading_process_input (time_limit, Line 4644  wait_reading_process_input (time_limit,
4644          }                       /* end for each file descriptor */          }                       /* end for each file descriptor */
4645      }                           /* end while exit conditions not met */      }                           /* end while exit conditions not met */
4646    
4647    waiting_for_user_input_p = 0;    waiting_for_user_input_p = saved_waiting_for_user_input_p;
4648    
4649    /* If calling from keyboard input, do not quit    /* If calling from keyboard input, do not quit
4650       since we want to return C-g as an input character.       since we want to return C-g as an input character.
# Line 4894  read_process_output (proc, channel) Line 4895  read_process_output (proc, channel)
4895          }          }
4896    
4897        carryover = nbytes - coding->consumed;        carryover = nbytes - coding->consumed;
4898          if (SCHARS (p->decoding_buf) < carryover)
4899            p->decoding_buf = make_uninit_string (carryover);
4900        bcopy (chars + coding->consumed, SDATA (p->decoding_buf),        bcopy (chars + coding->consumed, SDATA (p->decoding_buf),
4901               carryover);               carryover);
4902        XSETINT (p->decoding_carryover, carryover);        XSETINT (p->decoding_carryover, carryover);
# Line 4998  read_process_output (proc, channel) Line 5001  read_process_output (proc, channel)
5001              }              }
5002          }          }
5003        carryover = nbytes - coding->consumed;        carryover = nbytes - coding->consumed;
5004          if (SCHARS (p->decoding_buf) < carryover)
5005            p->decoding_buf = make_uninit_string (carryover);
5006        bcopy (chars + coding->consumed, SDATA (p->decoding_buf),        bcopy (chars + coding->consumed, SDATA (p->decoding_buf),
5007               carryover);               carryover);
5008        XSETINT (p->decoding_carryover, carryover);        XSETINT (p->decoding_carryover, carryover);

Legend:
Removed from v.1.373.2.6  
changed lines
  Added in v.1.373.2.7

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26