summaryrefslogtreecommitdiff
path: root/doc/emacs/files.texi
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2008-11-16 07:04:05 +0000
committerChong Yidong <cyd@stupidchicken.com>2008-11-16 07:04:05 +0000
commitd3d649743948ad177e47ff0c3937892419dc1c50 (patch)
treeccb99abd56b377c4d05da8939a25ff0c05af668e /doc/emacs/files.texi
parent122eb807fa06a918dbb0088bac99004da9780972 (diff)
downloademacs-d3d649743948ad177e47ff0c3937892419dc1c50.tar.gz
(Directories): Describe delete-directory in text.
(Misc File Ops): Document delete-by-moving-to-trash.
Diffstat (limited to 'doc/emacs/files.texi')
-rw-r--r--doc/emacs/files.texi17
1 files changed, 15 insertions, 2 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 10e240e8041..95204eda2e2 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1228,6 +1228,14 @@ this, it runs the program specified by
@code{directory-free-space-program} with arguments
@code{directory-free-space-args}.
+ The command @kbd{M-x delete-directory} prompts for a directory name
+using the minibuffer, and deletes the directory if it is empty. If
+the directory is not empty, this signals an error. On systems that
+have a ``Trash'' or ``Recycle Bin'' feature, you can make this command
+move the specified directory to the Trash or Recycle Bin, instead of
+deleting it outright; to do so, change the variable
+@code{delete-by-moving-to-trash} to @code{t}.
+
@node Comparing Files
@section Comparing Files
@cindex comparing files
@@ -1491,9 +1499,14 @@ as saving files; see @ref{Customize Save}.
@findex delete-file
@cindex deletion (of files)
+@vindex delete-by-moving-to-trash
@kbd{M-x delete-file} deletes the specified file, like the @code{rm}
-command in the shell. If you are deleting many files in one directory, it
-may be more convenient to use Dired (@pxref{Dired}).
+command in the shell. On systems that have a ``Trash'' or ``Recycle
+Bin'' feature, you can make this command move the specified file to
+the Trash or Recycle Bin, instead of deleting it outright; to do so,
+change the variable @code{delete-by-moving-to-trash} to @code{t}. If
+you are deleting many files in one directory, it may be more
+convenient to use Dired rather than @code{delete-file}. @xref{Dired}.
@findex rename-file
@kbd{M-x rename-file} reads two file names @var{old} and @var{new} using