diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-13 13:44:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-13 13:44:55 +0000 |
| commit | 3b807f0d2dfdd28895e3b998bce2c06955faf030 (patch) | |
| tree | 11b94bbbc294e99e230cc5c8346029d2ac065240 /lisp/gnus/nntp.el | |
| parent | 9d2db4c6637fe37d75f947063bcb2ecce319a1bc (diff) | |
| download | emacs-3b807f0d2dfdd28895e3b998bce2c06955faf030.tar.gz emacs-3b807f0d2dfdd28895e3b998bce2c06955faf030.tar.bz2 emacs-3b807f0d2dfdd28895e3b998bce2c06955faf030.zip | |
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
Diffstat (limited to 'lisp/gnus/nntp.el')
| -rw-r--r-- | lisp/gnus/nntp.el | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 869213c9ae5..2623df58e4d 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -183,6 +183,14 @@ by one.") If the gap between two consecutive articles is bigger than this variable, split the XOVER request into two requests.") +(defvoo nntp-xref-number-is-evil nil + "*If non-nil, Gnus never trusts article numbers in the Xref header. +Some news servers, e.g., ones running Diablo, run multiple engines +having the same articles but article numbers are not kept synchronized +between them. If you connect to such a server, set this to a non-nil +value, and Gnus never uses article numbers (that appear in the Xref +header and vary by which engine is chosen) to refer to articles.") + (defvoo nntp-prepare-server-hook nil "*Hook run before a server is opened. If can be used to set up a server remotely, for instance. Say you @@ -1632,7 +1640,8 @@ password contained in '~/.nntp-authinfo'." (match-string 1 xref)) (t ""))) (cond - ((and (setq xref (mail-fetch-field "xref")) + ((and (not nntp-xref-number-is-evil) + (setq xref (mail-fetch-field "xref")) (string-match (if group (concat "\\(" (regexp-quote group) "\\):\\([0-9]+\\)") |