[Emacs-diffs] emacs/src ChangeLog lisp.h w32fns.c

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/10/01 23:17:41

Modified files:
        src            : ChangeLog lisp.h w32fns.c 

Log message:
        * lisp.h (Qdelete_directory_internal):
          Declare, instead of Qdelete_directory.
        
        * w32fns.c (Fsystem_move_file_to_trash): Use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7777&r2=1.7778
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.664&r2=1.665
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32fns.c?cvsroot=emacs&r1=1.360&r2=1.361

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7777
retrieving revision 1.7778
diff -u -b -r1.7777 -r1.7778
--- ChangeLog   1 Oct 2009 17:47:43 -0000       1.7777
+++ ChangeLog   1 Oct 2009 23:17:39 -0000       1.7778
@@ -1,3 +1,10 @@
+2009-10-01  Juanma Barranquero  <address@hidden>
+
+       * lisp.h (Qdelete_directory_internal):
+       Declare, instead of Qdelete_directory.
+
+       * w32fns.c (Fsystem_move_file_to_trash): Use it.
+
 2009-10-01  Stefan Monnier  <address@hidden>
 
        * eval.c (Fcalled_interactively_p): Add `kind' argument.

Index: lisp.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/lisp.h,v
retrieving revision 1.664
retrieving revision 1.665
diff -u -b -r1.664 -r1.665
--- lisp.h      17 Sep 2009 23:04:47 -0000      1.664
+++ lisp.h      1 Oct 2009 23:17:40 -0000       1.665
@@ -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 */

Index: w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -b -r1.360 -r1.361
--- w32fns.c    22 Jul 2009 16:03:41 -0000      1.360
+++ w32fns.c    1 Oct 2009 23:17:40 -0000       1.361
@@ -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);