# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1254439059 0
# Node ID 9cce4a353df7a83f73a702b0483e603eeb8cc7c7
# Parent  36bb5f76f23f43c9abf2ce3255546465a037528c
* lisp.h (Qdelete_directory_internal):
  Declare, instead of Qdelete_directory.

* w32fns.c (Fsystem_move_file_to_trash): Use it.

diff -r 36bb5f76f23f -r 9cce4a353df7 src/ChangeLog
--- a/src/ChangeLog	Thu Oct 01 17:52:36 2009 +0000
+++ b/src/ChangeLog	Thu Oct 01 23:17:39 2009 +0000
@@ -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 -r 36bb5f76f23f -r 9cce4a353df7 src/lisp.h
--- a/src/lisp.h	Thu Oct 01 17:52:36 2009 +0000
+++ b/src/lisp.h	Thu Oct 01 23:17:39 2009 +0000
@@ -2952,7 +2952,7 @@
 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 -r 36bb5f76f23f -r 9cce4a353df7 src/w32fns.c
--- a/src/w32fns.c	Thu Oct 01 17:52:36 2009 +0000
+++ b/src/w32fns.c	Thu Oct 01 23:17:39 2009 +0000
@@ -6218,7 +6218,7 @@
   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);