aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kastrup2007-06-01 05:01:56 +0000
committerDavid Kastrup2007-06-01 05:01:56 +0000
commit773933d371315e101ad9d9ff5388df52bc3efeb3 (patch)
tree35d70cced9dbc16700fe798cf5f86cf13ca473cf
parentc2915ced359f105603ea8e627bd322febc9ca832 (diff)
downloademacs-773933d371315e101ad9d9ff5388df52bc3efeb3.tar.gz
emacs-773933d371315e101ad9d9ff5388df52bc3efeb3.zip
(dired-recursive-deletes, dired-recursive-copies):
Change default to `top'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ecb858b4617..baf1400232d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-06-01 David Kastrup <dak@gnu.org>
2
3 * dired.el (dired-recursive-deletes, dired-recursive-copies):
4 Change default to `top'.
5
12007-05-31 Richard Stallman <rms@gnu.org> 62007-05-31 Richard Stallman <rms@gnu.org>
2 7
3 * dired.el (dired-do-flagged-delete, dired-do-delete): Doc fix. 8 * dired.el (dired-do-flagged-delete, dired-do-delete): Doc fix.
diff --git a/lisp/dired.el b/lisp/dired.el
index 7f6e919a109..7dafd47c6e0 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2362,7 +2362,7 @@ Optional argument means return a file name relative to `default-directory'."
2362 2362
2363;; Deleting files 2363;; Deleting files
2364 2364
2365(defcustom dired-recursive-deletes nil ; Default only delete empty directories. 2365(defcustom dired-recursive-deletes 'top ; Default only delete empty directories.
2366 "*Decide whether recursive deletes are allowed. 2366 "*Decide whether recursive deletes are allowed.
2367A value of nil means no recursive deletes. 2367A value of nil means no recursive deletes.
2368`always' means delete recursively without asking. This is DANGEROUS! 2368`always' means delete recursively without asking. This is DANGEROUS!
@@ -3210,7 +3210,7 @@ To be called first in body of `dired-sort-other', etc."
3210 3210
3211;;;; Drag and drop support 3211;;;; Drag and drop support
3212 3212
3213(defcustom dired-recursive-copies nil 3213(defcustom dired-recursive-copies 'top
3214 "*Decide whether recursive copies are allowed. 3214 "*Decide whether recursive copies are allowed.
3215A value of nil means no recursive copies. 3215A value of nil means no recursive copies.
3216`always' means copy recursively without asking. 3216`always' means copy recursively without asking.