(dired-do-flagged-delete, dired-do-delete): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07778c2f73479d04170041faa7a3c9d529ce7d49..ecb858b4617ce7bbce7b66b244ea86777015003f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-31  Richard Stallman  <rms@gnu.org>
+
+       * dired.el (dired-do-flagged-delete, dired-do-delete): Doc fix.
+
 2007-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/css-mode.el: New file.

diff --git a/lisp/dired.el b/lisp/dired.el
index 4244954d467443a77e0d1e13292163998cadf5df..7f6e919a1096115e7669797455ec4a6c2e64b8a3 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2410,7 +2410,9 @@ Anything else, ask for each sub-directory."
 (defun dired-do-flagged-delete (&optional nomessage)
   "In Dired, delete the files flagged for deletion.
 If NOMESSAGE is non-nil, we don't display any message
-if there are no flagged files."
+if there are no flagged files.
+`dired-recursive-deletes' controls whether 
+deletion of non-empty directories is allowed."
   (interactive)
   (let* ((dired-marker-char dired-del-marker)
         (regexp (dired-marker-regexp))
@@ -2426,7 +2428,9 @@ if there are no flagged files."
          (message "(No deletions requested)")))))
 
 (defun dired-do-delete (&optional arg)
-  "Delete all marked (or next ARG) files."
+  "Delete all marked (or next ARG) files.
+`dired-recursive-deletes' controls whether 
+deletion of non-empty directories is allowed."
   ;; This is more consistent with the file marking feature than
   ;; dired-do-flagged-delete.
   (interactive "P")