From f5783df3a76e578791965f852b9190235507556c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 28 May 2010 16:57:11 +0200 Subject: [PATCH] * fileio.c (Fdelete_file): Pass TRASH arg to handler call. --- src/ChangeLog | 4 ++++ src/fileio.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index eeee6540e68..18e0aab2a6d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-28 Michael Albinus + + * fileio.c (Fdelete_file): Pass TRASH arg to handler call. + 2010-05-28 Kenichi Handa * font.c (font_delete_unmatched): Check Vface_ignored_fonts. diff --git a/src/fileio.c b/src/fileio.c index d3aea0f1e91..dc5ca37ff2f 100644 --- 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); -- 2.39.2