Mercurial > emacs
changeset 92695:59b897c894c7
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1099
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 10 Mar 2008 02:39:21 +0000 |
| parents | d3767aa9ae49 |
| children | f656dd57b318 |
| files | doc/misc/ChangeLog doc/misc/gnus-news.texi doc/misc/gnus.texi lisp/gnus/ChangeLog lisp/gnus/mail-source.el |
| diffstat | 5 files changed, 52 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Mon Mar 10 00:50:22 2008 +0000 +++ b/doc/misc/ChangeLog Mon Mar 10 02:39:21 2008 +0000 @@ -1,3 +1,10 @@ +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
--- a/doc/misc/gnus-news.texi Mon Mar 10 00:50:22 2008 +0000 +++ b/doc/misc/gnus-news.texi Mon Mar 10 02:39:21 2008 +0000 @@ -77,6 +77,19 @@ 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
--- a/doc/misc/gnus.texi Mon Mar 10 00:50:22 2008 +0000 +++ b/doc/misc/gnus.texi Mon Mar 10 02:39:21 2008 +0000 @@ -14622,14 +14622,17 @@ 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 @@ @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 @@ 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 @@ ("^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
--- a/lisp/gnus/ChangeLog Mon Mar 10 00:50:22 2008 +0000 +++ b/lisp/gnus/ChangeLog Mon Mar 10 02:39:21 2008 +0000 @@ -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.
--- a/lisp/gnus/mail-source.el Mon Mar 10 00:50:22 2008 +0000 +++ b/lisp/gnus/mail-source.el Mon Mar 10 02:39:21 2008 +0000 @@ -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)