Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-198

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 115)

   - Update from CVS

2005-09-10  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/spam-report.el (spam-report-gmane): Fix generation of spam
   report URL.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 415c98a..a83192a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -23,6 +23,11 @@
        * gnus-uu.el (gnus-message-process-mark): Use gnus-message.
        (gnus-uu-mark-series): Likewise.
 
+2005-09-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * spam-report.el (spam-report-gmane): Fix generation of spam
+       report URL.
+
 2005-09-10  Simon Josefsson  <jas@extundo.com>
 
        * gnus-agent.el (gnus-agent-synchronize-flags): Make the default

diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index 145a30b..d8609a1 100644 (file)
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -150,7 +150,9 @@ Reports is as ham when HAM is set."
                         (match-string 1 field)))
            (setq report (match-string 2 field))
            (when (string-equal "permalink.gmane.org" host)
-             (setq host "spam.gmane.org"))
+             (setq host "spam.gmane.org")
+             (setq report (gnus-replace-in-string
+                           report "/\\([0-9]+\\)$" ":\\1")))
            (setq url (format "http://%s%s" host report))
            (if (not (and host report url))
                (gnus-message