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

[Juanma Barranquero]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.451 emacs/src/fileio.c:1.452
*** emacs/src/fileio.c:1.451    Wed Jul 10 04:45:04 2002
--- emacs/src/fileio.c  Thu Jul 11 10:11:25 2002
***************
*** 2371,2377 ****
    struct stat st, out_st;
    Lisp_Object handler;
    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
!   int count = specpdl_ptr - specpdl;
    int input_file_statable_p;
    Lisp_Object encoded_file, encoded_newname;
  
--- 2371,2377 ----
    struct stat st, out_st;
    Lisp_Object handler;
    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
!   int count = SPECPDL_INDEX ();
    int input_file_statable_p;
    Lisp_Object encoded_file, encoded_newname;
  
***************
*** 4395,4401 ****
             this way, we can run Lisp program safely before decoding
             the inserted text.  */
          Lisp_Object unwind_data;
!             int count = specpdl_ptr - specpdl;
  
          unwind_data = Fcons (current_buffer->enable_multibyte_characters,
                               Fcons (current_buffer->undo_list,
--- 4395,4401 ----
             this way, we can run Lisp program safely before decoding
             the inserted text.  */
          Lisp_Object unwind_data;
!             int count = SPECPDL_INDEX ();
  
          unwind_data = Fcons (current_buffer->enable_multibyte_characters,
                               Fcons (current_buffer->undo_list,
***************
*** 4753,4759 ****
    unsigned char *fn;
    struct stat st;
    int tem;
!   int count = specpdl_ptr - specpdl;
    int count1;
  #ifdef VMS
    unsigned char *fname = 0;     /* If non-0, original filename (must rename) 
*/
--- 4753,4759 ----
    unsigned char *fn;
    struct stat st;
    int tem;
!   int count = SPECPDL_INDEX ();
    int count1;
  #ifdef VMS
    unsigned char *fname = 0;     /* If non-0, original filename (must rename) 
*/
***************
*** 4825,4831 ****
      }
  
    record_unwind_protect (build_annotations_unwind, Fcurrent_buffer ());
!   count1 = specpdl_ptr - specpdl;
  
    given_buffer = current_buffer;
  
--- 4825,4831 ----
      }
  
    record_unwind_protect (build_annotations_unwind, Fcurrent_buffer ());
!   count1 = SPECPDL_INDEX ();
  
    given_buffer = current_buffer;
  
***************
*** 5594,5600 ****
    Lisp_Object oquit;
    FILE *stream;
    Lisp_Object lispstream;
!   int count = specpdl_ptr - specpdl;
    int orig_minibuffer_auto_raise = minibuffer_auto_raise;
    int message_p = 0;
  
--- 5594,5600 ----
    Lisp_Object oquit;
    FILE *stream;
    Lisp_Object lispstream;
!   int count = SPECPDL_INDEX ();
    int orig_minibuffer_auto_raise = minibuffer_auto_raise;
    int message_p = 0;
  
***************
*** 5941,5947 ****
        {
          /* Must do it the hard (and slow) way.  */
          GCPRO3 (all, comp, specdir);
!         count = specpdl_ptr - specpdl;
          record_unwind_protect (read_file_name_cleanup, 
current_buffer->directory);
          current_buffer->directory = realdir;
          for (comp = Qnil; CONSP (all); all = XCDR (all))
--- 5941,5947 ----
        {
          /* Must do it the hard (and slow) way.  */
          GCPRO3 (all, comp, specdir);
!         count = SPECPDL_INDEX ();
          record_unwind_protect (read_file_name_cleanup, 
current_buffer->directory);
          current_buffer->directory = realdir;
          for (comp = Qnil; CONSP (all); all = XCDR (all))
***************
*** 6074,6080 ****
        RETURN_UNGCPRO (Ffuncall (7, args));
      }
  
!   count = specpdl_ptr - specpdl;
  #ifdef VMS
    specbind (intern ("completion-ignore-case"), Qt);
  #endif
--- 6074,6080 ----
        RETURN_UNGCPRO (Ffuncall (7, args));
      }
  
!   count = SPECPDL_INDEX ();
  #ifdef VMS
    specbind (intern ("completion-ignore-case"), Qt);
  #endif