Synch to No Gnus 200407031838.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0c48b1..80c1ac1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2004-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnheader.el (nnheader-uniquify-message-id): New experimental
+       variable. 
+       (nnheader-nov-read-message-id): Use it.
+
        * spam-report.el (spam-report-gmane): Add interactive.
 
 2004-07-02  Katsumi Yamaoka  <yamaoka@jpl.org>

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index d02d25f..141fce0 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -788,10 +788,17 @@ given, the return value will not contain the last newline."
               out)))
      out))
 
+(defvar nnheader-uniquify-message-id nil)
+
 (defmacro nnheader-nov-read-message-id (&optional number)
   `(let ((id (nnheader-nov-field)))
      (if (string-match "^<[^>]+>$" id)
-        id
+        ,(if nnheader-uniquify-message-id
+             `(if (string-match "__[^@]+@" id)
+                  (concat (substring id 0 (match-beginning 0))
+                          (substring id (1- (match-end 0))))
+                id)
+           'id)
        (nnheader-generate-fake-message-id ,number))))
 
 (defun nnheader-parse-nov ()