[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v |
Date: |
Wed, 02 Jul 2008 13:19:15 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Jason Rumney <jasonr> 08/07/02 13:19:09
Index: src/fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -b -r1.623 -r1.624
--- src/fileio.c 26 Jun 2008 04:24:36 -0000 1.623
+++ src/fileio.c 2 Jul 2008 13:19:06 -0000 1.624
@@ -213,6 +213,13 @@
int write_region_inhibit_fsync;
#endif
+/* Non-zero means call move-file-to-trash in Fdelete_file or
+ Fdelete_directory. */
+int delete_by_moving_to_trash;
+
+/* Lisp function for moving files to trash. */
+Lisp_Object Qmove_file_to_trash;
+
extern Lisp_Object Vuser_login_name;
#ifdef WINDOWSNT
@@ -2674,6 +2681,9 @@
if (!NILP (handler))
return call2 (handler, Qdelete_directory, directory);
+ if (delete_by_moving_to_trash)
+ return call1 (Qmove_file_to_trash, directory);
+
encoded_dir = ENCODE_FILE (directory);
dir = SDATA (encoded_dir);
@@ -2707,6 +2717,9 @@
if (!NILP (handler))
return call2 (handler, Qdelete_file, filename);
+ if (delete_by_moving_to_trash)
+ return call1 (Qmove_file_to_trash, filename);
+
encoded_file = ENCODE_FILE (filename);
if (0 > unlink (SDATA (encoded_file)))
@@ -6358,6 +6371,14 @@
write_region_inhibit_fsync = 0;
#endif
+ DEFVAR_BOOL ("delete-by-moving-to-trash", &delete_by_moving_to_trash,
+ doc: /* Specifies whether to use the system's trash can.
+When non-nil, the function `move-file-to-trash' will be used by
+`delete-file' and `delete-directory'. */);
+ delete_by_moving_to_trash = 0;
+ Qmove_file_to_trash = intern ("move-file-to-trash");
+ staticpro (&Qmove_file_to_trash);
+
defsubr (&Sfind_file_name_handler);
defsubr (&Sfile_name_directory);
defsubr (&Sfile_name_nondirectory);
- [Emacs-diffs] Changes to emacs/src/fileio.c,v,
Jason Rumney <=
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Dan Nicolaescu, 2008/07/10
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Andreas Schwab, 2008/07/24
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Dan Nicolaescu, 2008/07/27
- [Emacs-diffs] Changes to emacs/src/fileio.c,v, Dan Nicolaescu, 2008/07/31