[Emacs-diffs] Changes to emacs/lisp/dired.el,v [EMACS_22_BASE]

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Richard M. Stallman <rms>       07/05/31 21:11:41

Index: dired.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired.el,v
retrieving revision 1.359.2.1
retrieving revision 1.359.2.2
diff -u -b -r1.359.2.1 -r1.359.2.2
--- dired.el    16 May 2007 10:51:25 -0000      1.359.2.1
+++ dired.el    31 May 2007 21:11:40 -0000      1.359.2.2
@@ -2410,7 +2410,9 @@
 (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 @@
          (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")