Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1099

1 files changed, 10 insertions, 7 deletions

diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 499d250f4cd..3a90990d5d8 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -303,11 +303,11 @@ You may also set this variable to nil and call
 		 (const :tag "never" nil)
 		 (integer :tag "days")))
 
-(defcustom mail-source-delete-old-incoming-confirm t
-  "*If non-nil, ask for confirmation before deleting old incoming files.
+(defcustom mail-source-delete-old-incoming-confirm nil
+  "If non-nil, ask for confirmation before deleting old incoming files.
 This variable only applies when `mail-source-delete-incoming' is a positive
 number."
-  :version "22.1"
+  :version "22.2" ;; No Gnus / Gnus 5.10.10 (default changed)
   :group 'mail-source
   :type 'boolean)
 
@@ -567,10 +567,13 @@ If CONFIRM is non-nil, ask for confirmation before removing a file."
 	     (fileday (+ fileday (* low2days (nth 1 filetime)))))
 	(setq files (cdr files))
 	(when (and (> (- currday fileday) diff)
-		   (gnus-message 8 "File `%s' is older than %s day(s)"
-				 bfile diff)
-		   (or (not confirm)
-		       (y-or-n-p (concat "Remove file `" bfile "'? "))))
+		   (if confirm
+		       (y-or-n-p
+			(format "\
+Delete old (> %s day(s)) incoming mail file `%s'? " diff bfile))
+		     (gnus-message 8 "\
+Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
+		     t))
 	  (delete-file ffile))))))
 
 (defun mail-source-callback (callback info)