summaryrefslogtreecommitdiff
path: root/lisp/gnus/spam-report.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2016-02-12 18:24:30 +1100
committerLars Ingebrigtsen <larsi@gnus.org>2016-02-12 18:24:30 +1100
commitbd066f82903ac055109882189646d39c2a75e044 (patch)
treee44dd5c865325fdc74828bd30fabfff26b46444d /lisp/gnus/spam-report.el
parent2a342bda0af6c0bc168a190f368f0871ff31f7b1 (diff)
downloademacs-bd066f82903ac055109882189646d39c2a75e044.tar.gz
Revert the gnus-replace-in-string change, fix arguments, reapply
Diffstat (limited to 'lisp/gnus/spam-report.el')
-rw-r--r--lisp/gnus/spam-report.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index eb7d862e99c..0b58dc8c25b 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -163,12 +163,12 @@ submitted at once. Internal variable.")
(concat
"/"
(replace-regexp-in-string
+ "/" ":"
(replace-regexp-in-string
+ "^.*article.gmane.org/" ""
(replace-regexp-in-string
- (mail-header-xref (gnus-summary-article-header article))
- "/raw" ":silent")
- "^.*article.gmane.org/" "")
- "/" ":"))))
+ "/raw" ":silent"
+ (mail-header-xref (gnus-summary-article-header article))))))))
(spam-report-gmane-use-article-number
(spam-report-url-ping
rpt-host
@@ -207,8 +207,8 @@ submitted at once. Internal variable.")
(when host
(when (string-equal "permalink.gmane.org" host)
(setq host rpt-host)
- (setq report (replace-regexp-in-string
- report "/\\([0-9]+\\)$" ":\\1")))
+ (setq report (replace-regexp-in-string "/\\([0-9]+\\)$" ":\\1"
+ report)))
(setq url (format "http://%s%s" host report)))
(if (not (and host report url))
(gnus-message
@@ -227,7 +227,7 @@ the function specified by `spam-report-url-ping-function'."
(defcustom spam-report-user-mail-address
(and (stringp user-mail-address)
- (replace-regexp-in-string user-mail-address "@" "<at>"))
+ (replace-regexp-in-string "@" "<at>" user-mail-address))
"Mail address of this user used for spam reports to Gmane.
This is initialized based on `user-mail-address'."
:type '(choice string