[Emacs-diffs] /srv/bzr/emacs/trunk r100472: * fileio.c (Fdelete_file): Pass TRASH arg to handler call.

[Michael Albinus]

------------------------------------------------------------
revno: 100472
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-28 16:57:11 +0200
message:
  * fileio.c (Fdelete_file): Pass TRASH arg to handler call.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-28 06:45:43 +0000
+++ b/src/ChangeLog     2010-05-28 14:57:11 +0000
@@ -1,3 +1,7 @@
+2010-05-28  Michael Albinus  <address@hidden>
+
+       * fileio.c (Fdelete_file): Pass TRASH arg to handler call.
+
 2010-05-28  Kenichi Handa  <address@hidden>
 
        * font.c (font_delete_unmatched): Check Vface_ignored_fonts.

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-05-27 23:30:11 +0000
+++ b/src/fileio.c      2010-05-28 14:57:11 +0000
@@ -1925,7 +1925,7 @@
 If PRESERVE-UID-GID is non-nil, we try to transfer the
 uid and gid of FILE to NEWNAME.
 
-If PRESERVE-SELINUX-CONTEXT is non-nil and SELinux is enabled 
+If PRESERVE-SELINUX-CONTEXT is non-nil and SELinux is enabled
 on the system, we copy the SELinux context of FILE to NEWNAME.  */)
      (file, newname, ok_if_already_exists, keep_time, preserve_uid_gid, 
preserve_selinux_context)
      Lisp_Object file, newname, ok_if_already_exists, keep_time;
@@ -2221,7 +2221,7 @@
 
   handler = Ffind_file_name_handler (filename, Qdelete_file);
   if (!NILP (handler))
-    return call2 (handler, Qdelete_file, filename);
+    return call3 (handler, Qdelete_file, filename, trash);
 
   if (delete_by_moving_to_trash && !NILP (trash))
     return call1 (Qmove_file_to_trash, filename);