Commit d2b66acf authored by Glenn Morris's avatar Glenn Morris

(Qdelete_by_moving_to_trash): New Lisp_Object.

(syms_of_fileio): Add Qdelete_by_moving_to_trash.
parent 11041c99
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
2008-09-20 Glenn Morris <rgm@gnu.org> 2008-09-20 Glenn Morris <rgm@gnu.org>
* fileio.c (Frename_file): Avoid copying to trash if a rename involves * fileio.c (Qdelete_by_moving_to_trash): New Lisp_Object.
(syms_of_fileio): Add Qdelete_by_moving_to_trash.
(Frename_file): Avoid copying to trash if a rename involves
a delete. (Bug#964). a delete. (Bug#964).
2008-09-20 Eli Zaretskii <eliz@gnu.org> 2008-09-20 Eli Zaretskii <eliz@gnu.org>
......
...@@ -201,6 +201,8 @@ int write_region_inhibit_fsync; ...@@ -201,6 +201,8 @@ int write_region_inhibit_fsync;
Fdelete_directory. */ Fdelete_directory. */
int delete_by_moving_to_trash; int delete_by_moving_to_trash;
Lisp_Object Qdelete_by_moving_to_trash;
/* Lisp function for moving files to trash. */ /* Lisp function for moving files to trash. */
Lisp_Object Qmove_file_to_trash; Lisp_Object Qmove_file_to_trash;
...@@ -2246,7 +2248,7 @@ This is what happens in interactive use with M-x. */) ...@@ -2246,7 +2248,7 @@ This is what happens in interactive use with M-x. */)
Qt, Qt); Qt, Qt);
count = SPECPDL_INDEX (); count = SPECPDL_INDEX ();
specbind (intern ("delete-by-moving-to-trash"), Qnil); specbind (Qdelete_by_moving_to_trash, Qnil);
Fdelete_file (file); Fdelete_file (file);
unbind_to (count, Qnil); unbind_to (count, Qnil);
} }
...@@ -5669,6 +5671,7 @@ A non-nil value may result in data loss! */); ...@@ -5669,6 +5671,7 @@ A non-nil value may result in data loss! */);
When non-nil, the function `move-file-to-trash' will be used by When non-nil, the function `move-file-to-trash' will be used by
`delete-file' and `delete-directory'. */); `delete-file' and `delete-directory'. */);
delete_by_moving_to_trash = 0; delete_by_moving_to_trash = 0;
Qdelete_by_moving_to_trash = intern ("delete-by-moving-to-trash");
Qmove_file_to_trash = intern ("move-file-to-trash"); Qmove_file_to_trash = intern ("move-file-to-trash");
staticpro (&Qmove_file_to_trash); staticpro (&Qmove_file_to_trash);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment