* fileio.c (Fdelete_file): Pass TRASH arg to handler call.

diff --git a/src/ChangeLog b/src/ChangeLog
index eeee6540e686189b9925a00b68ee5014eb80b787..18e0aab2a6dea1255aa2c3772a93a08f7a81ae20 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-28  Michael Albinus  <michael.albinus@gmx.de>
+
+       * fileio.c (Fdelete_file): Pass TRASH arg to handler call.
+
 2010-05-28  Kenichi Handa  <handa@m17n.org>
 
        * font.c (font_delete_unmatched): Check Vface_ignored_fonts.

diff --git a/src/fileio.c b/src/fileio.c
index d3aea0f1e913e81af28c909dcdb76e8f10198b48..dc5ca37ff2fa21a5a869ddd2f4cb7a4a8f352f0f 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1925,7 +1925,7 @@ A prefix arg makes KEEP-TIME non-nil.
 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 @@ With a prefix argument, TRASH is nil.  */)
 
   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);