diff options
| author | Michael Albinus | 2009-10-02 06:01:32 +0000 |
|---|---|---|
| committer | Michael Albinus | 2009-10-02 06:01:32 +0000 |
| commit | e9a0aef83c8176a32bc29ef342c68b91b73c64f5 (patch) | |
| tree | 2100a778d69f21eaeaa4de6e755b3653f4e540bb | |
| parent | c5c21b70c11e8ebe8d989f4c92265949f3691f85 (diff) | |
| download | emacs-e9a0aef83c8176a32bc29ef342c68b91b73c64f5.tar.gz emacs-e9a0aef83c8176a32bc29ef342c68b91b73c64f5.zip | |
* w32fns.c (Fsystem_move_file_to_trash): Use delete-directory.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/w32fns.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cde4eb9dc9c..4226e20fd1b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2009-10-02 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * lisp.h (Qdelete_directory_internal): Removed, because it is not | ||
| 4 | used anymore outside fileio.c. | ||
| 5 | |||
| 6 | * w32fns.c (Fsystem_move_file_to_trash): Use delete-directory. | ||
| 7 | |||
| 1 | 2009-10-01 Juanma Barranquero <lekktu@gmail.com> | 8 | 2009-10-01 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 9 | ||
| 3 | * lisp.h (Qdelete_directory_internal): | 10 | * lisp.h (Qdelete_directory_internal): |
diff --git a/src/w32fns.c b/src/w32fns.c index 2b6b12e671c..8003d791719 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -6218,7 +6218,7 @@ DEFUN ("system-move-file-to-trash", Fsystem_move_file_to_trash, | |||
| 6218 | if (!NILP (Ffile_directory_p (filename)) | 6218 | if (!NILP (Ffile_directory_p (filename)) |
| 6219 | && NILP (Ffile_symlink_p (filename))) | 6219 | && NILP (Ffile_symlink_p (filename))) |
| 6220 | { | 6220 | { |
| 6221 | operation = Qdelete_directory_internal; | 6221 | operation = intern ("delete-directory"); |
| 6222 | filename = Fdirectory_file_name (filename); | 6222 | filename = Fdirectory_file_name (filename); |
| 6223 | } | 6223 | } |
| 6224 | filename = Fexpand_file_name (filename, Qnil); | 6224 | filename = Fexpand_file_name (filename, Qnil); |