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

[Stefan Monnier]

Index: emacs/src/lread.c
diff -c emacs/src/lread.c:1.342 emacs/src/lread.c:1.343
*** emacs/src/lread.c:1.342     Tue Nov  1 19:46:16 2005
--- emacs/src/lread.c   Wed Nov 16 18:39:15 2005
***************
*** 1316,1322 ****
    register int c;
    register Lisp_Object val;
    int count = SPECPDL_INDEX ();
!   struct gcpro gcpro1;
    struct buffer *b = 0;
    int continue_reading_p;
  
--- 1316,1322 ----
    register int c;
    register Lisp_Object val;
    int count = SPECPDL_INDEX ();
!   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
    struct buffer *b = 0;
    int continue_reading_p;
  
***************
*** 1325,1338 ****
    else if (MARKERP (readcharfun))
      b = XMARKER (readcharfun)->buffer;
  
!   specbind (Qstandard_input, readcharfun);
    specbind (Qcurrent_load_list, Qnil);
    record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil);
    load_convert_to_unibyte = !NILP (unibyte);
  
    readchar_backlog = -1;
  
!   GCPRO1 (sourcename);
  
    LOADHIST_ATTACH (sourcename);
  
--- 1325,1338 ----
    else if (MARKERP (readcharfun))
      b = XMARKER (readcharfun)->buffer;
  
!   specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun.  */
    specbind (Qcurrent_load_list, Qnil);
    record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil);
    load_convert_to_unibyte = !NILP (unibyte);
  
    readchar_backlog = -1;
  
!   GCPRO4 (sourcename, readfun, start, end);
  
    LOADHIST_ATTACH (sourcename);