summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2005-09-11 22:02:04 +0000
committerMiles Bader <miles@gnu.org>2005-09-11 22:02:04 +0000
commita8f6d239d2d541ec874a22000e0542c20fd55a67 (patch)
tree635393624d268364017bff37688fab3eb1983cd0 /lisp
parent945a75f8b050d91308a7ee4d7e24d2cb5dce0f28 (diff)
downloademacs-a8f6d239d2d541ec874a22000e0542c20fd55a67.tar.gz
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>.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog11
-rw-r--r--lisp/gnus/gnus-agent.el2
-rw-r--r--lisp/gnus/spam-report.el4
3 files changed, 15 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ac4dc382907..96052e04c12 100644
--- 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 ea45a139ab0..47d1dfd7364 100644
--- 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 302cafbb19b..173306ec55e 100644
--- 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