Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-232

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cd3c128c05d95eb003e6f50d730045ed55371b33..870b598ff7411828e7861cd858e11f1d00f5b1af 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,20 @@
+2008-02-16  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mail-source.el (mail-source-delete-incoming): Change default.
+       Supplement doc string.
+
+2008-02-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * nnmail.el (nnmail-message-id-cache-file): Derive from
+       `gnus-home-directory'.
+
+2008-02-11  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * 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  <Reiner.Steib@gmx.de>
 
        * 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 c671bcd997c33776d12701000b32e64c7ff6be4b..28cda1a99a60cfe8288bca0f38414936911a5832 100644 (file)
--- 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 4d264c3b7d06014f38e50f965471b9408d89d3da..e2f856226308f877b2eb6ba2ae255d6d8a628eda 100644 (file)
--- 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 e5d4618d0a1610b325020b2ed0d57842224fc0ff..4082f6761f1b5956f2018186e0db4f5d65224f8a 100644 (file)
--- 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 74d4e30ab809280c25bfac920a7a51c1d2409af1..9e46e4a316770e020e8b6b0edf7fb72281f1b5c4 100644 (file)
--- 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)