procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Qdelete_by_moving_to_trash): New Lisp_Object.

Browse source 
(syms_of_fileio): Add Qdelete_by_moving_to_trash.
This commit is contained in:
Glenn Morris 2008-09-20 23:37:47 +00:00
parent 11041c992f
commit d2b66acf53
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -5,7 +5,9 @@
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).
2008-09-20 Eli Zaretskii <eliz@gnu.org>

5
src/fileio.c
View file

@ -201,6 +201,8 @@ int write_region_inhibit_fsync;
Fdelete_directory. */
int delete_by_moving_to_trash;
Lisp_Object Qdelete_by_moving_to_trash;
/* Lisp function for moving files to trash. */
Lisp_Object Qmove_file_to_trash;
@ -2246,7 +2248,7 @@ This is what happens in interactive use with M-x. */)
Qt, Qt);
count = SPECPDL_INDEX ();
specbind (intern ("delete-by-moving-to-trash"), Qnil);
specbind (Qdelete_by_moving_to_trash, Qnil);
Fdelete_file (file);
unbind_to (count, Qnil);
}
@ -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
`delete-file' and `delete-directory'. */);
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");
staticpro (&Qmove_file_to_trash);