Merge from gnus--rel--5.10

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

4 files changed, 19 insertions, 8 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 41f847cbaca..aa410f541bd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * message.el (message-ignored-supersedes-headers): Add "X-ID".
+
 2007-11-24  Glenn Morris  <rgm@gnu.org>
 
         * message.el (message-tool-bar-retro): Update for rename
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ae620c975d0..7e760427420 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -271,7 +271,7 @@ included.  Organization and User-Agent are optional."
   :link '(custom-manual "(message)Mail Headers")
   :type 'regexp)
 
-(defcustom message-ignored-supersedes-headers "^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|^Received:\\|^X-From-Line:\\|^X-Trace:\\|^X-Complaints-To:\\|Return-Path:\\|^Supersedes:\\|^NNTP-Posting-Date:\\|^X-Trace:\\|^X-Complaints-To:\\|^Cancel-Lock:\\|^Cancel-Key:\\|^X-Hashcash:\\|^X-Payment:"
+(defcustom message-ignored-supersedes-headers "^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|^Received:\\|^X-From-Line:\\|^X-Trace:\\|^X-ID:\\|^X-Complaints-To:\\|Return-Path:\\|^Supersedes:\\|^NNTP-Posting-Date:\\|^X-Trace:\\|^X-Complaints-To:\\|^Cancel-Lock:\\|^Cancel-Key:\\|^X-Hashcash:\\|^X-Payment:"
   "*Header lines matching this regexp will be deleted before posting.
 It's best to delete old Path and Date headers before posting to avoid
 any confusion."
diff --git a/man/ChangeLog b/man/ChangeLog
index b338c6e55d7..3393712ba0a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Fancy Mail Splitting): Fix description of splitting based
+        on body.
+
+2007-11-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Fetching Mail): Remove obsolete `nnmail-spool-file'.
+
 2007-11-22  Francesco Potort,Al(B  <pot@gnu.org>
 
         * maintaining.texi (Tag Syntax): Revert this change: "Now --members is
diff --git a/man/gnus.texi b/man/gnus.texi
index 3bce1de77b3..bcced071cc2 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -14123,14 +14123,12 @@ If non-@code{nil}, name of program for fetching new mail.  If
 @subsubsection Fetching Mail
 
 @vindex mail-sources
-@vindex nnmail-spool-file
 The way to actually tell Gnus where to get new mail from is to set
 @code{mail-sources} to a list of mail source specifiers
 (@pxref{Mail Source Specifiers}).
 
-If this variable (and the obsolescent @code{nnmail-spool-file}) is
-@code{nil}, the mail back ends will never attempt to fetch mail by
-themselves.
+If this variable is @code{nil}, the mail back ends will never attempt to
+fetch mail by themselves.
 
 If you want to fetch mail both from your local spool as well as a
 @acronym{POP} mail server, you'd say something like:
@@ -14339,9 +14337,9 @@ body of the messages:
         "string.group"))))
 @end lisp
 
-The buffer is narrowed to the message in question when @var{function}
-is run.  That's why @code{(widen)} needs to be called after
-@code{save-excursion} and @code{save-restriction} in the example
+The buffer is narrowed to the header of the message in question when
+@var{function} is run.  That's why @code{(widen)} needs to be called
+after @code{save-excursion} and @code{save-restriction} in the example
 above.  Also note that with the nnimap backend, message bodies will
 not be downloaded by default.  You need to set
 @code{nnimap-split-download-body} to @code{t} to do that