(mail-source-delete-old-incoming-confirm): Change

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e51d8ef..d50277a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * 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  <yamaoka@jpl.org>
 
        * lpath.el: Rearrange.

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 499d250..3a90990 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/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)