Merge from gnus--devo--0

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

5 files changed, 52 insertions, 12 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 65f8a57c4fd..b6837862a97 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,12 @@
 2008-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
+        * gnus.texi (Mail Source Customization, Gnus Development, Oort Gnus):
+        Update for change of `mail-source-delete-incoming'.
+
+        * gnus-news.texi: Ditto.
+
+2008-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
         * gnus-coding.texi (Gnus Maintainance Guide): Update conventions for
         custom versions.
 
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index b3b06520b58..3e0a47dd7d8 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -77,6 +77,19 @@ connections are managed by this mechanism, after querying the user
 about whether to do so.
 @end itemize
 
+@item Changes in group mode
+@c ************************
+
+@itemize @bullet
+@item
+Old intermediate incoming mail files (@file{Incoming*}) are deleted
+after a couple of days, not immediately.  @xref{Mail Source
+Customization}.
+@c New in Gnus 5.10.10 / No Gnus 0.8
+@c This entry is also present in the node "Oort Gnus".
+
+@end itemize
+
 @item Changes in summary and article mode
 
 @itemize @bullet
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index f90b0f96847..28dd6a1da3f 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14622,14 +14622,17 @@ variables.
 File where mail will be stored while processing it.  The default is@*
 @file{~/.emacs-mail-crash-box}.
 
+@cindex Incoming*
 @item mail-source-delete-incoming
 @vindex mail-source-delete-incoming
 If non-@code{nil}, delete incoming files after handling them.  If
 @code{t}, delete the files immediately, if @code{nil}, never delete any
 files.  If a positive number, delete files older than number of days
-(This will only happen, when receiving new mail).  You may also set
-@code{mail-source-delete-incoming} to @code{nil} and call
+(the deletion will only happen when receiving new mail).  You may also
+set @code{mail-source-delete-incoming} to @code{nil} and call
 @code{mail-source-delete-old-incoming} from a hook or interactively.
+@code{mail-source-delete-incoming} defaults to @code{2} in alpha Gnusae
+and @code{10} in released Gnusae.  @xref{Gnus Development}.
 
 @item mail-source-delete-old-incoming-confirm
 @vindex mail-source-delete-old-incoming-confirm
@@ -26198,10 +26201,10 @@ supposed to be able to use these, and these are mostly discussed on the
 
 @cindex Incoming*
 @vindex mail-source-delete-incoming
-Some variable defaults differ between alpha Gnusae and released Gnusae.
-In particular, @code{mail-source-delete-incoming} defaults to @code{nil} in
-alpha Gnusae and @code{t} in released Gnusae.  This is to prevent
+Some variable defaults differ between alpha Gnusae and released Gnusae,
+in particular, @code{mail-source-delete-incoming}.  This is to prevent
 lossage of mail if an alpha release hiccups while handling the mail.
+@xref{Mail Source Customization}.
 
 The division of discussion between the ding mailing list and the Gnus
 newsgroup is not purely based on publicity concerns.  It's true that
@@ -26214,6 +26217,9 @@ either discarded or totally rewritten.  People reading the mailing list
 usually keep up with these rapid changes, while people on the newsgroup
 can't be assumed to do so.
 
+@c FIXME:
+@c ding = gmane.emacs.gnus.general
+@c newsgroup = gnu.emacs.gnus = gmane.emacs.gnus.user = info-gnus-english
 
 
 @node Contributors
@@ -27445,6 +27451,11 @@ variables should change those regexps accordingly.  For example:
 ("^han\\>" euc-kr) -> ("\\(^\\|:\\)han\\>" euc-kr)
 @end lisp
 
+@item
+Old intermediate incoming mail files (@file{Incoming*}) are deleted
+after a couple of days, not immediately.  @xref{Mail Source
+Customization}.  (New in Gnus 5.10.10)
+
 @end itemize
 
 @item Changes in summary and article mode
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e86ac06e974..afc9d768143 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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>
 
         * gnus-art.el (gnus-narrow-to-page): Position point properly.
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)