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

* lisp.h (Qdelete_directory_internal):

Browse source 
Declare, instead of Qdelete_directory.

* w32fns.c (Fsystem_move_file_to_trash): Use it.
This commit is contained in:
Juanma Barranquero 2009-10-01 23:17:39 +00:00
parent b938bbde4d
commit 64eb2b561c
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2009-10-01 Juanma Barranquero <lekktu@gmail.com>
* lisp.h (Qdelete_directory_internal):
Declare, instead of Qdelete_directory.
* w32fns.c (Fsystem_move_file_to_trash): Use it.
2009-10-01 Stefan Monnier <monnier@iro.umontreal.ca>
* eval.c (Fcalled_interactively_p): Add `kind' argument.

2
src/lisp.h
View file

@ -2952,7 +2952,7 @@ extern void syms_of_fileio P_ ((void));
extern void init_fileio_once P_ ((void));
extern Lisp_Object make_temp_name P_ ((Lisp_Object, int));
EXFUN (Fmake_symbolic_link, 3);
extern Lisp_Object Qdelete_directory;
extern Lisp_Object Qdelete_directory_internal;
extern Lisp_Object Qdelete_file;
/* Defined in abbrev.c */

2
src/w32fns.c
View file

@ -6218,7 +6218,7 @@ DEFUN ("system-move-file-to-trash", Fsystem_move_file_to_trash,
if (!NILP (Ffile_directory_p (filename))
&& NILP (Ffile_symlink_p (filename)))
{
operation = Qdelete_directory;
operation = Qdelete_directory_internal;
filename = Fdirectory_file_name (filename);
}
filename = Fexpand_file_name (filename, Qnil);