aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-05-31 21:10:49 +0000
committerRichard M. Stallman2007-05-31 21:10:49 +0000
commitbce1acc35747aae549ac75d4ef236391389013da (patch)
tree9e426a74859666eb8dbdd858935db0a8ad9dda3a
parentd500a09264ee5f33f73d9af010cf9aca80549f13 (diff)
downloademacs-bce1acc35747aae549ac75d4ef236391389013da.tar.gz
emacs-bce1acc35747aae549ac75d4ef236391389013da.zip
(dired-do-flagged-delete, dired-do-delete): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dired.el8
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07778c2f734..ecb858b4617 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-05-31 Richard Stallman <rms@gnu.org>
2
3 * dired.el (dired-do-flagged-delete, dired-do-delete): Doc fix.
4
12007-05-31 Stefan Monnier <monnier@iro.umontreal.ca> 52007-05-31 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * textmodes/css-mode.el: New file. 7 * textmodes/css-mode.el: New file.
diff --git a/lisp/dired.el b/lisp/dired.el
index 4244954d467..7f6e919a109 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2410,7 +2410,9 @@ Anything else, ask for each sub-directory."
2410(defun dired-do-flagged-delete (&optional nomessage) 2410(defun dired-do-flagged-delete (&optional nomessage)
2411 "In Dired, delete the files flagged for deletion. 2411 "In Dired, delete the files flagged for deletion.
2412If NOMESSAGE is non-nil, we don't display any message 2412If NOMESSAGE is non-nil, we don't display any message
2413if there are no flagged files." 2413if there are no flagged files.
2414`dired-recursive-deletes' controls whether
2415deletion of non-empty directories is allowed."
2414 (interactive) 2416 (interactive)
2415 (let* ((dired-marker-char dired-del-marker) 2417 (let* ((dired-marker-char dired-del-marker)
2416 (regexp (dired-marker-regexp)) 2418 (regexp (dired-marker-regexp))
@@ -2426,7 +2428,9 @@ if there are no flagged files."
2426 (message "(No deletions requested)"))))) 2428 (message "(No deletions requested)")))))
2427 2429
2428(defun dired-do-delete (&optional arg) 2430(defun dired-do-delete (&optional arg)
2429 "Delete all marked (or next ARG) files." 2431 "Delete all marked (or next ARG) files.
2432`dired-recursive-deletes' controls whether
2433deletion of non-empty directories is allowed."
2430 ;; This is more consistent with the file marking feature than 2434 ;; This is more consistent with the file marking feature than
2431 ;; dired-do-flagged-delete. 2435 ;; dired-do-flagged-delete.
2432 (interactive "P") 2436 (interactive "P")