[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src fileio.c
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs/src fileio.c |
Date: |
Thu, 01 Oct 2009 15:07:32 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 09/10/01 15:07:32
Modified files:
src : fileio.c
Log message:
* fileio.c (Fdelete_directory_internal): Renamed from
Fdelete_directory. It is not a command anymore. It has no file
name handler.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fileio.c?cvsroot=emacs&r1=1.657&r2=1.658
Patches:
Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -b -r1.657 -r1.658
--- fileio.c 21 Jul 2009 23:34:04 -0000 1.657
+++ fileio.c 1 Oct 2009 15:07:32 -0000 1.658
@@ -206,7 +206,7 @@
#endif
/* Non-zero means call move-file-to-trash in Fdelete_file or
- Fdelete_directory. */
+ Fdelete_directory_internal. */
int delete_by_moving_to_trash;
Lisp_Object Qdelete_by_moving_to_trash;
@@ -315,7 +315,7 @@
Lisp_Object Qcopy_file;
Lisp_Object Qmake_directory_internal;
Lisp_Object Qmake_directory;
-Lisp_Object Qdelete_directory;
+Lisp_Object Qdelete_directory_internal;
Lisp_Object Qdelete_file;
Lisp_Object Qrename_file;
Lisp_Object Qadd_name_to_file;
@@ -2134,7 +2134,8 @@
return Qnil;
}
-DEFUN ("delete-directory", Fdelete_directory, Sdelete_directory, 1, 1,
"FDelete directory: ",
+DEFUN ("delete-directory-internal", Fdelete_directory_internal,
+ Sdelete_directory_internal, 1, 1, 0,
doc: /* Delete the directory named DIRECTORY. Does not follow
symlinks. */)
(directory)
Lisp_Object directory;
@@ -2146,10 +2147,6 @@
CHECK_STRING (directory);
directory = Fdirectory_file_name (Fexpand_file_name (directory, Qnil));
- handler = Ffind_file_name_handler (directory, Qdelete_directory);
- if (!NILP (handler))
- return call2 (handler, Qdelete_directory, directory);
-
if (delete_by_moving_to_trash)
return call1 (Qmove_file_to_trash, directory);
@@ -5481,7 +5478,7 @@
Qcopy_file = intern ("copy-file");
Qmake_directory_internal = intern ("make-directory-internal");
Qmake_directory = intern ("make-directory");
- Qdelete_directory = intern ("delete-directory");
+ Qdelete_directory_internal = intern ("delete-directory-internal");
Qdelete_file = intern ("delete-file");
Qrename_file = intern ("rename-file");
Qadd_name_to_file = intern ("add-name-to-file");
@@ -5516,7 +5513,7 @@
staticpro (&Qcopy_file);
staticpro (&Qmake_directory_internal);
staticpro (&Qmake_directory);
- staticpro (&Qdelete_directory);
+ staticpro (&Qdelete_directory_internal);
staticpro (&Qdelete_file);
staticpro (&Qrename_file);
staticpro (&Qadd_name_to_file);
@@ -5743,7 +5740,7 @@
defsubr (&Ssubstitute_in_file_name);
defsubr (&Scopy_file);
defsubr (&Smake_directory_internal);
- defsubr (&Sdelete_directory);
+ defsubr (&Sdelete_directory_internal);
defsubr (&Sdelete_file);
defsubr (&Srename_file);
defsubr (&Sadd_name_to_file);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src fileio.c,
Michael Albinus <=