From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 1 Oct 2009 23:17:39 +0000 (+0000)
Subject: * lisp.h (Qdelete_directory_internal):
X-Git-Tag: emacs-pretest-23.1.90~1001
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64eb2b561c8e35a3a272a875193903ce709a7a6a;p=emacs.git

* 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 afdfff07562..cde4eb9dc9c 100644
--- 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 f837708fea5..079a33e5fb5 100644
--- 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 8b6c6c21cd2..2b6b12e671c 100644
--- 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);