From: Glenn Morris Date: Sat, 20 Sep 2008 23:37:47 +0000 (+0000) Subject: (Qdelete_by_moving_to_trash): New Lisp_Object. X-Git-Tag: emacs-pretest-23.0.90~2820 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2b66acf531883c8805683ce893e5dbf9ad50fc0;p=emacs.git (Qdelete_by_moving_to_trash): New Lisp_Object. (syms_of_fileio): Add Qdelete_by_moving_to_trash. --- diff --git a/src/ChangeLog b/src/ChangeLog index abea2c4a2dc..9e855a4898b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5,7 +5,9 @@ 2008-09-20 Glenn Morris - * 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 diff --git a/src/fileio.c b/src/fileio.c index 6a9364d37bc..cf3ec5bc44f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -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);