Changes committed gnus/lisp (ChangeLog mail-source.el)

Modified: ChangeLog mail-source.el

(mail-source-delete-old-incoming-confirm): Change
default to nil.
(mail-source-delete-old-incoming): Make confirmation prompt more clear.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1783 gnus/lisp/ChangeLog:7.1784
--- ChangeLog:7.1783	Fri Mar  7 12:29:18 2008
+++ ChangeLog	Sat Mar  8 17:03:26 2008
@@ -1,3 +1,9 @@
+2008-03-08  Reiner Steib  <[email protected]>
+
+	* mail-source.el (mail-source-delete-old-incoming-confirm): Change
+	default to nil.
+	(mail-source-delete-old-incoming): Make confirmation prompt more clear.
+
 2008-03-07  Katsumi Yamaoka  <[email protected]>
 
 	* lpath.el: Rearrange.
Index: mail-source.el
diff -u gnus/lisp/mail-source.el:7.28 gnus/lisp/mail-source.el:7.29
--- mail-source.el:7.28	Sat Mar  1 02:48:13 2008
+++ mail-source.el	Sat Mar  8 17:03:26 2008
@@ -303,11 +303,11 @@
 		 (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 @@
 	     (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)