From 20ca5ee4f7d897d79416a6fdd084db1eabb392b0 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 24 Feb 2008 06:09:16 +0000 Subject: [PATCH] Merge from gnus--rel--5.10 Revision: emacs@sv.gnu.org/emacs--rel--22--patch-232 --- lisp/gnus/ChangeLog | 17 +++++++++++++++++ lisp/gnus/gnus-group.el | 13 +++++++++---- lisp/gnus/gnus-topic.el | 18 +++++++++++++----- lisp/gnus/mail-source.el | 19 +++++++++++-------- lisp/gnus/nnmail.el | 5 +++-- 5 files changed, 53 insertions(+), 19 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index cd3c128c05d..870b598ff74 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,20 @@ +2008-02-16 Reiner Steib + + * mail-source.el (mail-source-delete-incoming): Change default. + Supplement doc string. + +2008-02-14 Reiner Steib + + * nnmail.el (nnmail-message-id-cache-file): Derive from + `gnus-home-directory'. + +2008-02-11 Reiner Steib + + * gnus-topic.el (gnus-topic-select-group, gnus-topic-read-group): + Document negativ prefix. + + * gnus-group.el (gnus-group-read-group): Document negativ prefix. + 2008-02-03 Reiner Steib * gnus.el (gnus-group-startup-message): Add `find-image' call before diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index c671bcd997c..28cda1a99a6 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2008,10 +2008,15 @@ and with point over the group in question." (defun gnus-group-read-group (&optional all no-article group select-articles) "Read news in this newsgroup. If the prefix argument ALL is non-nil, already read articles become -readable. IF ALL is a number, fetch this number of articles. If the -optional argument NO-ARTICLE is non-nil, no article will be -auto-selected upon group entry. If GROUP is non-nil, fetch that -group." +readable. + +If ALL is a positive number, fetch this number of the latest +articles in the group. If ALL is a negative number, fetch this +number of the earliest articles in the group. + +If the optional argument NO-ARTICLE is non-nil, no article will +be auto-selected upon group entry. If GROUP is non-nil, fetch +that group." (interactive "P") (let ((no-display (eq all 0)) (group (or group (gnus-group-group-name))) diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index 4d264c3b7d0..e2f85622630 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -1181,7 +1181,10 @@ articles in the topic and its subtopics." No article is selected automatically. If the group is opened, just switch the summary buffer. If ALL is non-nil, already read articles become readable. -If ALL is a number, fetch this number of articles. + +If ALL is a positive number, fetch this number of the latest +articles in the group. If ALL is a negative number, fetch this +number of the earliest articles in the group. If performed over a topic line, toggle folding the topic." (interactive "P") @@ -1233,10 +1236,15 @@ Also see `gnus-group-catchup'." (defun gnus-topic-read-group (&optional all no-article group) "Read news in this newsgroup. If the prefix argument ALL is non-nil, already read articles become -readable. IF ALL is a number, fetch this number of articles. If the -optional argument NO-ARTICLE is non-nil, no article will be -auto-selected upon group entry. If GROUP is non-nil, fetch that -group. +readable. + +If ALL is a positive number, fetch this number of the latest +articles in the group. If ALL is a negative number, fetch this +number of the earliest articles in the group. + +If the optional argument NO-ARTICLE is non-nil, no article will +be auto-selected upon group entry. If GROUP is non-nil, fetch +that group. If performed over a topic line, toggle folding the topic." (interactive "P") diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index e5d4618d0a1..4082f6761f1 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -269,16 +269,19 @@ If non-nil, this maildrop will be checked periodically for new mail." :group 'mail-source :type 'integer) -(defcustom mail-source-delete-incoming t - "*If non-nil, delete incoming files after handling. +(defcustom mail-source-delete-incoming + ;; 10 ;; development versions + 2 ;; released versions + "If non-nil, delete incoming files after handling. If t, delete immediately, if nil, never delete. If a positive number, delete -files older than number of days." - ;; Note: The removing happens in `mail-source-callback', i.e. no old - ;; incoming files will be deleted, unless you receive new mail. - ;; - ;; You may also set this to `nil' and call `mail-source-delete-old-incoming' - ;; from a hook or interactively. +files older than number of days. + +Removing of old files happens in `mail-source-callback', i.e. no +old incoming files will be deleted unless you receive new mail. +You may also set this variable to nil and call +`mail-source-delete-old-incoming' interactively." :group 'mail-source + :version "22.2" ;; No Gnus / Gnus 5.10.10 (default changed) :type '(choice (const :tag "immediately" t) (const :tag "never" nil) (integer :tag "days"))) diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 74d4e30ab80..9e46e4a3167 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -532,8 +532,9 @@ performed." :type '(choice (const :tag "disable" nil) (integer :format "%v"))) -(defcustom nnmail-message-id-cache-file "~/.nnmail-cache" - "*The file name of the nnmail Message-ID cache." +(defcustom nnmail-message-id-cache-file + (nnheader-concat gnus-home-directory ".nnmail-cache") + "The file name of the nnmail Message-ID cache." :group 'nnmail-duplicate :group 'nnmail-files :type 'file) -- 2.11.4.GIT