# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1126476124 0
# Node ID eb0fd19f4e016ce3cdcef2c75bfc16003b708b34
# Parent  e4fa4fb219ebc3e53b1152a131ea73ff71ac5985
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-540

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/gnus/spam-report.el (spam-report-gmane): Fix generation of spam
   report URL.

2005-09-10  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags): Make the default
   t, based on discussion on the ding list with Robert Epprecht
   <epprecht@solnet.ch>.

diff -r e4fa4fb219eb -r eb0fd19f4e01 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sun Sep 11 20:34:04 2005 +0000
+++ b/lisp/gnus/ChangeLog	Sun Sep 11 22:02:04 2005 +0000
@@ -1,3 +1,14 @@
+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
+	t, based on discussion on the ding list with Robert Epprecht
+	<epprecht@solnet.ch>.
+
 2005-09-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* spam-report.el (spam-report-gmane): Make it work without
diff -r e4fa4fb219eb -r eb0fd19f4e01 lisp/gnus/gnus-agent.el
--- a/lisp/gnus/gnus-agent.el	Sun Sep 11 20:34:04 2005 +0000
+++ b/lisp/gnus/gnus-agent.el	Sun Sep 11 22:02:04 2005 +0000
@@ -115,7 +115,7 @@
   :group 'gnus-agent
   :type 'function)
 
-(defcustom gnus-agent-synchronize-flags nil
+(defcustom gnus-agent-synchronize-flags t
   "Indicate if flags are synchronized when you plug in.
 If this is `ask' the hook will query the user."
   :version "21.1"
diff -r e4fa4fb219eb -r eb0fd19f4e01 lisp/gnus/spam-report.el
--- a/lisp/gnus/spam-report.el	Sun Sep 11 20:34:04 2005 +0000
+++ b/lisp/gnus/spam-report.el	Sun Sep 11 22:02:04 2005 +0000
@@ -116,7 +116,9 @@
 			 (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