diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/dired.el | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07778c2f73..ecb858b461 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-05-31 Richard Stallman <[email protected]> + + * dired.el (dired-do-flagged-delete, dired-do-delete): Doc fix. + 2007-05-31 Stefan Monnier <[email protected]> * textmodes/css-mode.el: New file. diff --git a/lisp/dired.el b/lisp/dired.el index 4244954d46..7f6e919a10 100644 --- 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") |