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

[Miles Bader]

Index: emacs/src/process.c
diff -c emacs/src/process.c:1.373.2.6 emacs/src/process.c:1.373.2.7
*** emacs/src/process.c:1.373.2.6       Tue May 11 02:38:46 2004
--- emacs/src/process.c Tue Jul  6 09:14:37 2004
***************
*** 4018,4025 ****
       int do_display;
  {
    register int channel, nfds;
!   static SELECT_TYPE Available;
!   static SELECT_TYPE Connecting;
    int check_connect, check_delay, no_avail;
    int xerrno;
    Lisp_Object proc;
--- 4018,4025 ----
       int do_display;
  {
    register int channel, nfds;
!   SELECT_TYPE Available;
!   SELECT_TYPE Connecting;
    int check_connect, check_delay, no_avail;
    int xerrno;
    Lisp_Object proc;
***************
*** 4030,4035 ****
--- 4030,4036 ----
    /* Either nil or a cons cell, the car of which is of interest and
       may be changed outside of this routine.  */
    Lisp_Object wait_for_cell = Qnil;
+   int saved_waiting_for_user_input_p = waiting_for_user_input_p;
  
    FD_ZERO (&Available);
    FD_ZERO (&Connecting);
***************
*** 4643,4649 ****
        }                       /* end for each file descriptor */
      }                         /* end while exit conditions not met */
  
!   waiting_for_user_input_p = 0;
  
    /* If calling from keyboard input, do not quit
       since we want to return C-g as an input character.
--- 4644,4650 ----
        }                       /* end for each file descriptor */
      }                         /* end while exit conditions not met */
  
!   waiting_for_user_input_p = saved_waiting_for_user_input_p;
  
    /* If calling from keyboard input, do not quit
       since we want to return C-g as an input character.
***************
*** 4894,4899 ****
--- 4895,4902 ----
        }
  
        carryover = nbytes - coding->consumed;
+       if (SCHARS (p->decoding_buf) < carryover)
+       p->decoding_buf = make_uninit_string (carryover);
        bcopy (chars + coding->consumed, SDATA (p->decoding_buf),
             carryover);
        XSETINT (p->decoding_carryover, carryover);
***************
*** 4998,5003 ****
--- 5001,5008 ----
            }
        }
        carryover = nbytes - coding->consumed;
+       if (SCHARS (p->decoding_buf) < carryover)
+       p->decoding_buf = make_uninit_string (carryover);
        bcopy (chars + coding->consumed, SDATA (p->decoding_buf),
             carryover);
        XSETINT (p->decoding_carryover, carryover);