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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ac4dc382907675a3e512508527526f34d6e3c9e1..96052e04c12a34644d52153efc9ef1ef14513063 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index ea45a139ab04ecb97835e1ed841ca4c61ecac12b..47d1dfd73644dfa014420189fd21a22fe4bdd0bc 100644 (file)
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -115,7 +115,7 @@ If nil, only read articles will be expired."
   :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 --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 302cafbb19b5adf6570edd1c559aeab1145700b2..173306ec55e7f6e4dfacebcdad0207f17ea2543a 100644 (file)
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -116,7 +116,9 @@ undo that change.")
                         (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