Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

2007-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nntp.el (nntp-xref-number-is-evil): New server variable.
   (nntp-find-group-and-number): If it is non-nil, don't trust article
   numbers in the Xref header.

2007-08-06  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-ems.el (gnus-x-splash): Bind inhibit-read-only to t.

2007-08-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-art.el (article-hide-headers): Bind inhibit-read-only to t.

2007-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (NNTP): Mention nntp-xref-number-is-evil.

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

2 files changed, 32 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 39895247477..479f25e7267 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (NNTP): Mention nntp-xref-number-is-evil.
+
 2007-08-08  Glenn Morris  <rgm@gnu.org>
 
 	* glossary.texi (Glossary): Deprecate `iff'.
diff --git a/man/gnus.texi b/man/gnus.texi
index ff8371df46c..94144b65e3f 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -12945,6 +12945,34 @@ network is fast, setting this variable to a really small number means
 that fetching will probably be slower.  If this variable is @code{nil},
 @code{nntp} will never split requests.  The default is 5.
 
+@item nntp-xref-number-is-evil
+@vindex nntp-xref-number-is-evil
+When Gnus refers to an article having the @code{Message-ID} that a user
+specifies or having the @code{Message-ID} of the parent article of the
+current one (@pxref{Finding the Parent}), Gnus sends a @code{HEAD}
+command to the @acronym{NNTP} server to know where it is, and the server
+returns the data containing the pairs of a group and an article number
+in the @code{Xref} header.  Gnus normally uses the article number to
+refer to the article if the data shows that that article is in the
+current group, while it uses the @code{Message-ID} otherwise.  However,
+some news servers, e.g., ones running Diablo, run multiple engines
+having the same articles but article numbers are not kept synchronized
+between them.  In that case, the article number that appears in the
+@code{Xref} header varies by which engine is chosen, so you cannot refer
+to the parent article that is in the current group, for instance.  If
+you connect to such a server, set this variable to a non-@code{nil}
+value, and Gnus never uses article numbers.  For example:
+
+@lisp
+(setq gnus-select-method
+      '(nntp "newszilla"
+             (nntp-address "newszilla.example.com")
+             (nntp-xref-number-is-evil t)
+             @dots{}))
+@end lisp
+
+The default value of this server variable is @code{nil}.
+
 @item nntp-prepare-server-hook
 @vindex nntp-prepare-server-hook
 A hook run before attempting to connect to an @acronym{NNTP} server.