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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/09/20 21:40:56

Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -b -r1.636 -r1.637
--- fileio.c    14 Sep 2008 05:58:52 -0000      1.636
+++ fileio.c    20 Sep 2008 21:40:54 -0000      1.637
@@ -2231,6 +2231,7 @@
     {
       if (errno == EXDEV)
        {
+          int count;
 #ifdef S_IFLNK
           symlink_target = Ffile_symlink_p (file);
           if (! NILP (symlink_target))
@@ -2244,7 +2245,10 @@
                        NILP (ok_if_already_exists) ? Qnil : Qt,
                        Qt, Qt);
 
+         count = SPECPDL_INDEX ();
+         specbind (intern ("delete-by-moving-to-trash"), Qnil);
          Fdelete_file (file);
+         unbind_to (count, Qnil);
        }
       else
        report_file_error ("Renaming", list2 (file, newname));