2 files changed, 15 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff3648d1824..41c42340c00 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dired.el (dired-no-confirm): Document value t and fix defcustom to
+        accept it (bug#6597).  Suggested by Drew Adams <drew.adams@oracle.com>.
+
 2010-07-22  Teemu Likonen  <tlikonen@iki.fi>  (tiny change)
 
         * dired.el (dired-mode-map): Use command remapping (bug#6632).
diff --git a/lisp/dired.el b/lisp/dired.el
index 15cb1b1facd..8184587b01b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2763,17 +2763,19 @@ name, or the marker and a count of marked files."
     (fit-window-to-buffer (get-buffer-window buf) nil 1)))
 
 (defcustom dired-no-confirm nil
-  "A list of symbols for commands Dired should not confirm.
+  "A list of symbols for commands Dired should not confirm, or t.
 Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress',
 `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink',
-`touch' and `uncompress'."
+`touch' and `uncompress'.
+If t, confirmation is never needed."
   :group 'dired
-  :type '(set (const byte-compile) (const chgrp)
-              (const chmod) (const chown) (const compress)
-              (const copy) (const delete) (const hardlink)
-              (const load) (const move) (const print)
-              (const shell) (const symlink) (const touch)
-              (const uncompress)))
+  :type '(choice (const :tag "Confirmation never needed" t)
+                 (set (const byte-compile) (const chgrp)
+                      (const chmod) (const chown) (const compress)
+                      (const copy) (const delete) (const hardlink)
+                      (const load) (const move) (const print)
+                      (const shell) (const symlink) (const touch)
+                      (const uncompress))))
 
 (defun dired-mark-pop-up (bufname op-symbol files function &rest args)
   "Return FUNCTION's result on ARGS after showing which files are marked.