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

[Ken Raeburn]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.558 emacs/src/fileio.c:1.559
*** emacs/src/fileio.c:1.558    Thu Nov 10 11:57:15 2005
--- emacs/src/fileio.c  Tue Dec  6 07:39:37 2005
***************
*** 2730,2737 ****
  internal_delete_file (filename)
       Lisp_Object filename;
  {
!   return NILP (internal_condition_case_1 (Fdelete_file, filename,
!                                         Qt, internal_delete_file_1));
  }
  
  DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,
--- 2730,2739 ----
  internal_delete_file (filename)
       Lisp_Object filename;
  {
!   Lisp_Object tem;
!   tem = internal_condition_case_1 (Fdelete_file, filename,
!                                  Qt, internal_delete_file_1);
!   return NILP (tem);
  }
  
  DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,
***************
*** 6234,6246 ****
  #endif
        {
          /* 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))
!           if (!NILP (call1 (Vread_file_name_predicate, XCAR (all))))
!             comp = Fcons (XCAR (all), comp);
          unbind_to (count, Qnil);
          UNGCPRO;
        }
--- 6236,6252 ----
  #endif
        {
          /* Must do it the hard (and slow) way.  */
+         Lisp_Object tem;
          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))
!           {
!             tem = call1 (Vread_file_name_predicate, XCAR (all));
!             if (!NILP (tem))
!               comp = Fcons (XCAR (all), comp);
!           }
          unbind_to (count, Qnil);
          UNGCPRO;
        }