diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/gnus/spam-report.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/gnus/spam-report.el')
-rw-r--r-- | lisp/gnus/spam-report.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el index d87a6c2af0d..5fa280ea058 100644 --- a/lisp/gnus/spam-report.el +++ b/lisp/gnus/spam-report.el @@ -120,7 +120,8 @@ submitted at once. Internal variable.") (defun spam-report-gmane-ham (&rest articles) "Report ARTICLES as ham (unregister) through Gmane." - (interactive (gnus-summary-work-articles current-prefix-arg)) + (interactive (gnus-summary-work-articles current-prefix-arg) + gnus-summary-mode) (let ((count 0)) (dolist (article articles) (setq count (1+ count)) @@ -130,7 +131,8 @@ submitted at once. Internal variable.") (defun spam-report-gmane-spam (&rest articles) "Report ARTICLES as spam through Gmane." - (interactive (gnus-summary-work-articles current-prefix-arg)) + (interactive (gnus-summary-work-articles current-prefix-arg) + gnus-summary-mode) (let ((count 0)) (dolist (article articles) (setq count (1+ count)) @@ -157,7 +159,7 @@ submitted at once. Internal variable.") rpt-host (concat "/" - (replace-regexp-in-string + (string-replace "/" ":" (replace-regexp-in-string "^.*article.gmane.org/" "" @@ -222,7 +224,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 "@" "<at>" user-mail-address)) + (string-replace "@" "<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 @@ -376,4 +378,4 @@ Process queued spam reports." (provide 'spam-report) -;;; spam-report.el ends here. +;;; spam-report.el ends here |