* lisp.h (Qdelete_directory_internal):

  Declare, instead of Qdelete_directory.

* w32fns.c (Fsystem_move_file_to_trash): Use it.

diff --git a/src/ChangeLog b/src/ChangeLog
index afdfff075627adaa367bfe6d5f9665ba56d5ddcf..cde4eb9dc9cb3a160d5447888ba2fe7ef42c71f8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/lisp.h b/src/lisp.h
index f837708fea5917b37557b8c3e71bb2cb50413f7c..079a33e5fb54b1b9db938d6afb351ec246ee3808 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -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 */

diff --git a/src/w32fns.c b/src/w32fns.c
index 8b6c6c21cd2684d0d7c5e1af0c00e96cf3380fa5..2b6b12e671ca5f19d2aa9e4aa709f2b796bf52b8 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -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);