lisp/dired.el (dired-delete-file): Doc fix. (Bug#20021)

This commit is contained in:
Eli Zaretskii 2015-03-07 11:55:58 +02:00
parent 69204d5a8a
commit eb62887e97
2 changed files with 14 additions and 5 deletions

View file

@ -1,3 +1,7 @@
2015-03-07 Eli Zaretskii <eliz@gnu.org>
* dired.el (dired-delete-file): Doc fix. (Bug#20021)
2015-03-03 Agustín Martín Domingo <agustin6martin@gmail.com>
* textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure

View file

@ -2850,11 +2850,16 @@ Any other value means to ask for each directory."
;; to e.g. recursive-delete-file and put it somewhere else.
(defun dired-delete-file (file &optional recursive trash) "\
Delete FILE or directory (possibly recursively if optional RECURSIVE is true.)
RECURSIVE determines what to do with a non-empty directory. If RECURSIVE is:
nil, do not delete.
`always', delete recursively without asking.
`top', ask for each directory at top level.
Anything else, ask for each sub-directory."
RECURSIVE determines what to do with a non-empty directory. The effect of
its possible values is:
nil -- do not delete.
`always' -- delete recursively without asking.
`top' -- ask for each directory at top level.
Anything else -- ask for each sub-directory.
TRASH non-nil means to trash the file instead of deleting, provided
`delete-by-moving-to-trash' (which see) is non-nil."
;; This test is equivalent to
;; (and (file-directory-p fn) (not (file-symlink-p fn)))
;; but more efficient