Mercurial > emacs
changeset 108818:6515310887ec
* fileio.c (Fdelete_file): Pass TRASH arg to handler call.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Fri, 28 May 2010 16:57:11 +0200 |
| parents | a90103f99eea |
| children | 55d24c1aa4ec |
| files | src/ChangeLog src/fileio.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri May 28 16:48:56 2010 +0200 +++ b/src/ChangeLog Fri May 28 16:57:11 2010 +0200 @@ -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.
--- a/src/fileio.c Fri May 28 16:48:56 2010 +0200 +++ b/src/fileio.c Fri May 28 16:57:11 2010 +0200 @@ -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);