[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bd066f8 2/2: Revert the gnus-replace-in-string chan
|
From: |
Lars Ingebrigtsen |
|
Subject: |
[Emacs-diffs] master bd066f8 2/2: Revert the gnus-replace-in-string change, fix arguments, reapply |
|
Date: |
Fri, 12 Feb 2016 07:27:53 +0000 |
branch: master
commit bd066f82903ac055109882189646d39c2a75e044
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Revert the gnus-replace-in-string change, fix arguments, reapply
---
lisp/gnus/gnus-art.el | 29 ++++++++++++++---------------
lisp/gnus/gnus-bookmark.el | 2 +-
lisp/gnus/gnus-gravatar.el | 3 ++-
lisp/gnus/gnus-group.el | 6 +++---
lisp/gnus/gnus-msg.el | 4 ++--
lisp/gnus/gnus-sum.el | 8 ++++----
lisp/gnus/gnus-util.el | 2 +-
lisp/gnus/mail-source.el | 4 ++--
lisp/gnus/mailcap.el | 7 ++++---
lisp/gnus/message.el | 3 ++-
lisp/gnus/mm-decode.el | 6 +++---
lisp/gnus/nnir.el | 30 ++++++++++++++++--------------
lisp/gnus/nnmaildir.el | 19 ++++++++++---------
lisp/gnus/nnml.el | 4 ++--
lisp/gnus/nnrss.el | 9 +++++----
lisp/gnus/spam-report.el | 14 +++++++-------
lisp/gnus/spam.el | 10 +++++-----
17 files changed, 83 insertions(+), 77 deletions(-)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 68d07c7..920544d 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7521,7 +7521,7 @@ address, `ask' if unsure and `invalid' if the string is
invalid."
(list gnus-button-mid-or-mail-heuristic-alist)
(result 0) rate regexp lpartlen elem)
(setq lpartlen
- (length (replace-regexp-in-string mid-or-mail "^\\(.*\\)@.*$" "\\1")))
+ (length (replace-regexp-in-string "^\\(.*\\)@.*$" "\\1" mid-or-mail)))
(gnus-message 8 "`%s', length of local part=`%s'." mid-or-mail lpartlen)
;; Certain special cases...
(when (string-match
@@ -7592,7 +7592,7 @@ address, `ask' if unsure and `invalid' if the string is
invalid."
(setq guessed
;; get rid of surrounding angles...
(funcall pref
- (replace-regexp-in-string mid-or-mail "^<\\|>$" "")))
+ (replace-regexp-in-string "^<\\|>$" "" mid-or-mail)))
(if (or (eq 'mid guessed) (eq 'mail guessed))
(setq pref guessed)
(setq pref 'ask)))
@@ -7624,13 +7624,13 @@ as a symbol to FUN."
"Call `describe-function' when pushing the corresponding URL button."
(describe-function
(intern
- (replace-regexp-in-string url gnus-button-handle-describe-prefix ""))))
+ (replace-regexp-in-string gnus-button-handle-describe-prefix "" url))))
(defun gnus-button-handle-describe-variable (url)
"Call `describe-variable' when pushing the corresponding URL button."
(describe-variable
(intern
- (replace-regexp-in-string url gnus-button-handle-describe-prefix ""))))
+ (replace-regexp-in-string gnus-button-handle-describe-prefix "" url))))
(defun gnus-button-handle-symbol (url)
"Display help on variable or function.
@@ -7644,7 +7644,7 @@ Calls `describe-variable' or `describe-function'."
(defun gnus-button-handle-describe-key (url)
"Call `describe-key' when pushing the corresponding URL button."
(let* ((key-string
- (replace-regexp-in-string url gnus-button-handle-describe-prefix ""))
+ (replace-regexp-in-string gnus-button-handle-describe-prefix "" url))
(keys (ignore-errors (eval `(kbd ,key-string)))))
(if keys
(describe-key keys)
@@ -7652,31 +7652,30 @@ Calls `describe-variable' or `describe-function'."
(defun gnus-button-handle-apropos (url)
"Call `apropos' when pushing the corresponding URL button."
- (apropos (replace-regexp-in-string
- url gnus-button-handle-describe-prefix "")))
+ (apropos (replace-regexp-in-string gnus-button-handle-describe-prefix ""
url)))
(defun gnus-button-handle-apropos-command (url)
"Call `apropos' when pushing the corresponding URL button."
(apropos-command
- (replace-regexp-in-string url gnus-button-handle-describe-prefix "")))
+ (replace-regexp-in-string gnus-button-handle-describe-prefix "" url)))
(defun gnus-button-handle-apropos-variable (url)
"Call `apropos' when pushing the corresponding URL button."
(funcall
(if (fboundp 'apropos-variable) 'apropos-variable 'apropos)
- (replace-regexp-in-string url gnus-button-handle-describe-prefix "")))
+ (replace-regexp-in-string gnus-button-handle-describe-prefix "" url)))
(defun gnus-button-handle-apropos-documentation (url)
"Call `apropos' when pushing the corresponding URL button."
(funcall
(if (fboundp 'apropos-documentation) 'apropos-documentation 'apropos)
- (replace-regexp-in-string url gnus-button-handle-describe-prefix "")))
+ (replace-regexp-in-string gnus-button-handle-describe-prefix "" url)))
(defun gnus-button-handle-library (url)
"Call `locate-library' when pushing the corresponding URL button."
(gnus-message 9 "url=`%s'" url)
(let* ((lib (locate-library url))
- (file (replace-regexp-in-string (or lib "") "\\.elc" ".el")))
+ (file (replace-regexp-in-string "\\.elc" ".el" (or lib ""))))
(if (not lib)
(gnus-message 1 "Cannot locale library `%s'." url)
(find-file-read-only file))))
@@ -8274,7 +8273,7 @@ url is put as the `gnus-button-url' overlay property on
the button."
"Fetch a man page."
(gnus-message 9 "`%s' `%s'" gnus-button-man-handler url)
(when (eq gnus-button-man-handler 'woman)
- (setq url (replace-regexp-in-string url "([1-9][X1a-z]*).*\\'" "")))
+ (setq url (replace-regexp-in-string "([1-9][X1a-z]*).*\\'" "" url)))
(gnus-message 9 "`%s' `%s'" gnus-button-man-handler url)
(funcall gnus-button-man-handler url))
@@ -8290,7 +8289,7 @@ url is put as the `gnus-button-url' overlay property on
the button."
((string-match "([^)\"]+)[^\"]+" url)
(setq url
(replace-regexp-in-string
- (replace-regexp-in-string url "[\n\t ]+" " ") "\"" ""))
+ "\"" "" (replace-regexp-in-string "[\n\t ]+" " " url)))
(gnus-info-find-node url))
(t (error "Can't parse %s" url))))
@@ -8429,8 +8428,8 @@ url is put as the `gnus-button-url' overlay property on
the button."
(funcall func)
(message-position-on-field (caar args)))
(insert (replace-regexp-in-string
- (mapconcat 'identity (reverse (cdar args)) ", ")
- "\r\n" "\n" t))
+ "\r\n" "\n"
+ (mapconcat 'identity (reverse (cdar args)) ", ") nil t))
(setq args (cdr args)))
(if subject
(message-goto-body)
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index cb3de92..66fc610 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -226,7 +226,7 @@ So the cdr of each bookmark is an alist too.")
"-" (car subject) "-" (cadr subject)))
(default-name-1
;; Strip "[]" chars from the bookmark name:
- (replace-regexp-in-string default-name-0 "[]_[]" ""))
+ (replace-regexp-in-string "[]_[]" "" default-name-0))
(name (read-from-minibuffer
(format "Set bookmark (%s): " default-name-1)
nil nil nil nil
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index 28caed2..89be864 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -95,7 +95,8 @@ Set image category to CATEGORY."
(when (if real-name
(re-search-forward
(concat (replace-regexp-in-string
- (regexp-quote real-name) "[\t ]+" "[\t\n ]+")
+ "[\t ]+" "[\t\n ]+"
+ (regexp-quote real-name))
"\\|"
(regexp-quote mail-address))
nil t)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 18e899b..b702e2f 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2197,7 +2197,7 @@ if it is not a list."
(setq group
(encode-coding-string
group (gnus-group-name-charset nil group))))
- (replace-regexp-in-string group "\n" "")))
+ (replace-regexp-in-string "\n" "" group)))
;;;###autoload
(defun gnus-fetch-group (group &optional articles)
@@ -2456,8 +2456,8 @@ the bug number, and browsing the URL must return mbox
output."
(end-of-line)
(insert (format ", address@hidden" (car ids)
(replace-regexp-in-string
- (replace-regexp-in-string mbox-url "^http://"; "")
- "/.*$" ""))))))
+ "/.*$" ""
+ (replace-regexp-in-string "^http://"; ""
mbox-url)))))))
(gnus-group-read-ephemeral-group
(format "nndoc+ephemeral:bug#%s"
(mapconcat 'number-to-string ids ","))
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index dec0e4e..43a4969 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1135,8 +1135,8 @@ See the variable `gnus-user-agent'."
(when (memq 'gnus gnus-user-agent)
(concat "Gnus/"
(replace-regexp-in-string
- (format "%1.8f" (gnus-continuum-version gnus-version))
- "0+\\'" "")
+ "0+\\'" ""
+ (format "%1.8f" (gnus-continuum-version gnus-version)))
" (" gnus-version ")")))
(emacs-v (gnus-emacs-version)))
(concat gnus-v (when (and gnus-v emacs-v) " ")
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index dfdf8e1..688646f 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9085,7 +9085,7 @@ non-numeric or nil fetch the number specified by the
(gnus-warp-to-article)
(when (and (stringp message-id)
(not (zerop (length message-id))))
- (setq message-id (replace-regexp-in-string message-id " " ""))
+ (setq message-id (replace-regexp-in-string " " "" message-id))
;; Construct the correct Message-ID if necessary.
;; Suggested by address@hidden
(unless (string-match "^<" message-id)
@@ -9563,10 +9563,10 @@ article. If BACKWARD (the prefix) is non-nil, search
backward instead."
(defun gnus-summary-print-truncate-and-quote (string &optional len)
"Truncate to LEN and quote all \"(\"'s in STRING."
- (replace-regexp-in-string (if (and len (> (length string) len))
+ (replace-regexp-in-string "[()]" "\\\\\\&"
+ (if (and len (> (length string) len))
(substring string 0 len)
- string)
- "[()]" "\\\\\\&"))
+ string)))
(defun gnus-summary-print-article (&optional filename n)
"Generate and print a PostScript image of the process-marked (mail) articles.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index eee80fd..284f094 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -407,7 +407,7 @@ Cache the result as a text property stored in DATE."
(defun gnus-mode-string-quote (string)
"Quote all \"%\"'s in STRING."
- (replace-regexp-in-string string "%" "%%"))
+ (replace-regexp-in-string "%" "%%" string))
;; Make a hash table (default and minimum size is 256).
;; Optional argument HASHSIZE specifies the table size.
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index d360f5f..2388a1a 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -603,8 +603,8 @@ If CONFIRM is non-nil, ask for confirmation before removing
a file."
currday (+ currday (* low2days (nth 1 (current-time)))))
(while files
(let* ((ffile (car files))
- (bfile (replace-regexp-in-string
- ffile "\\`.*/\\([^/]+\\)\\'" "\\1"))
+ (bfile (replace-regexp-in-string "\\`.*/\\([^/]+\\)\\'" "\\1"
+ ffile))
(filetime (nth 5 (file-attributes ffile)))
(fileday (* (car filetime) high2days))
(fileday (+ fileday (* low2days (nth 1 filetime)))))
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index a82768f..609a8f4 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -1028,11 +1028,12 @@ If FORCE, re-parse even if already parsed."
(replace-regexp-in-string
;; Replace mailcap's `%s' placeholder
;; with dired's `?' placeholder
+ "%s" "?"
(replace-regexp-in-string
;; Remove the final filename placeholder
- command "[ \t\n]*\\('\\)?%s\\1?[ \t\n]*\\'" ""
- nil t)
- "%s" "?" nil t))))
+ "[ \t\n]*\\('\\)?%s\\1?[ \t\n]*\\'" ""
+ command nil t)
+ nil t))))
common-mime-info)))))
commands))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 540736c..0a80646 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8309,7 +8309,8 @@ From headers in the original article."
(dolist (string (mail-header-parse-addresses value 'raw))
(setq string
(replace-regexp-in-string
- (replace-regexp-in-string string "^ +\\| +$" "") "\n" ""))
+ "\n" ""
+ (replace-regexp-in-string "^ +\\| +$" "" string)))
(ecomplete-add-item 'mail (car (mail-header-parse-address string))
string))))
(ecomplete-save))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index c861b9a..383aede 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1353,12 +1353,12 @@ string if you do not like underscores."
(defun mm-file-name-delete-control (filename)
"Delete control characters from FILENAME."
- (replace-regexp-in-string filename "[\x00-\x1f\x7f]" ""))
+ (replace-regexp-in-string "[\x00-\x1f\x7f]" "" filename))
(defun mm-file-name-delete-gotchas (filename)
"Delete shell gotchas from FILENAME."
- (setq filename (replace-regexp-in-string filename "[<>|]" ""))
- (replace-regexp-in-string filename "^[.-]+" ""))
+ (setq filename (replace-regexp-in-string "[<>|]" "" filename))
+ (replace-regexp-in-string "^[.-]+" "" filename))
(defun mm-save-part (handle &optional prompt)
"Write HANDLE to a file.
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index a36dba4..7614002 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -929,16 +929,17 @@ ready to be added to the list of search results."
;; Set group to dirnam without any leading dots or slashes,
;; and with all subsequent slashes replaced by dots
(let ((group (replace-regexp-in-string
- (replace-regexp-in-string dirnam "^[./\\]" "" nil t)
- "[/\\]" "." nil t)))
-
- (vector (gnus-group-full-name group server)
- (if (string-match "\\`nnmaildir:" (gnus-group-server server))
- (nnmaildir-base-name-to-article-number
- (substring article 0 (string-match ":" article))
- group nil)
- (string-to-number article))
- (string-to-number score)))))
+ "[/\\]" "."
+ (replace-regexp-in-string "^[./\\]" "" dirnam nil t)
+ nil t)))
+
+ (vector (gnus-group-full-name group server)
+ (if (string-match "\\`nnmaildir:" (gnus-group-server server))
+ (nnmaildir-base-name-to-article-number
+ (substring article 0 (string-match ":" article))
+ group nil)
+ (string-to-number article))
+ (string-to-number score)))))
;;; Search Engine Interfaces:
@@ -1341,9 +1342,9 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
(string-match "^[./\\]*\\(.*\\)$" dirnam)
;; "/" -> "."
(setq group (replace-regexp-in-string
- (match-string 1 dirnam) "/" "."))
+ "/" "." (match-string 1 dirnam)))
;; Windows "\\" -> "."
- (setq group (replace-regexp-in-string group "\\\\" "."))
+ (setq group (replace-regexp-in-string "\\\\" "." group))
(push (vector (gnus-group-full-name group server)
(string-to-number artno)
@@ -1415,7 +1416,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
(when (string-match prefix dirnam)
(setq dirnam (replace-match "" t t dirnam)))
(push (vector (gnus-group-full-name
- (replace-regexp-in-string dirnam "/" ".") server)
+ (replace-regexp-in-string "/" "." dirnam) server)
(string-to-number artno)
(string-to-number score))
artlist))
@@ -1614,7 +1615,8 @@ actually)."
(if (file-directory-p
(setq group
(replace-regexp-in-string
- group "\\." "/" nil t)))
+ "\\." "/"
+ group nil t)))
group))))))
(unless group
(error "Cannot locate directory for group"))
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 4b15443..e34a13b 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -657,12 +657,12 @@ by nnmaildir-request-article.")
(defun nnmaildir--system-name ()
(replace-regexp-in-string
+ ":" "\\072"
(replace-regexp-in-string
- (replace-regexp-in-string
- (system-name)
- "\\\\" "\\134" nil 'literal)
- "/" "\\057" nil 'literal)
- ":" "\\072" nil 'literal))
+ "/" "\\057"
+ (replace-regexp-in-string "\\\\" "\\134" (system-name) nil 'literal)
+ nil 'literal)
+ nil 'literal))
(defun nnmaildir-request-type (_group &optional _article)
'mail)
@@ -956,7 +956,8 @@ by nnmaildir-request-article.")
group (symbol-value group)
ro (nnmaildir--param pgname 'read-only))
(insert (replace-regexp-in-string
- (nnmaildir--grp-name group) " " "\\ " nil t)
+ " " "\\ "
+ (nnmaildir--grp-name group) nil t)
" ")
(princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
nntp-server-buffer)
@@ -985,7 +986,7 @@ by nnmaildir-request-article.")
(princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
nntp-server-buffer)
(insert " "
- (replace-regexp-in-string gname " " "\\ " nil t)
+ (replace-regexp-in-string " " "\\ " gname nil t)
"\n")))))
'group)
@@ -1116,7 +1117,7 @@ by nnmaildir-request-article.")
(insert " ")
(princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
nntp-server-buffer)
- (insert " " (replace-regexp-in-string gname " " "\\ " nil t) "\n")
+ (insert " " (replace-regexp-in-string " " "\\ " gname nil t) "\n")
t))))
(defun nnmaildir-request-create-group (gname &optional server _args)
@@ -1278,7 +1279,7 @@ by nnmaildir-request-article.")
(insert "\t" (nnmaildir--nov-get-beg nov) "\t"
(nnmaildir--art-msgid article) "\t"
(nnmaildir--nov-get-mid nov) "\tXref: nnmaildir "
- (replace-regexp-in-string gname " " "\\ " nil t) ":")
+ (replace-regexp-in-string " " "\\ " gname nil t) ":")
(princ num nntp-server-buffer)
(insert "\t" (nnmaildir--nov-get-end nov) "\n"))))
(catch 'return
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 5b471e8..4976f25 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1078,7 +1078,6 @@ Use the nov database for the current group if available."
(let* ((oldfile (nnml-article-to-file old-number))
(newfile
(replace-regexp-in-string
- oldfile
;; nnml-use-compressed-files might be any string, but
;; probably it's sufficient to take into account only
;; "\\.[a-z0-9]+". Note that we can't only use the
@@ -1087,7 +1086,8 @@ Use the nov database for the current group if available."
;; value.
(concat
"\\(" old-number-string
"\\)\\(\\(\\.[a-z0-9]+\\)?\\)$")
- (concat new-number-string "\\2"))))
+ (concat new-number-string "\\2")
+ oldfile)))
(with-current-buffer nntp-server-buffer
(nnmail-find-file oldfile)
;; Update the Xref header in the article itself:
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 6d2d16a..6168e5a 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -111,7 +111,7 @@ for decoding when the cdr that the data specify is not
available.")
;;; Interface functions
(defsubst nnrss-format-string (string)
- (replace-regexp-in-string string " *\n *" " "))
+ (replace-regexp-in-string " *\n *" " " string))
(defun nnrss-decode-group-name (group)
(if (and group (mm-coding-system-p 'utf-8))
@@ -291,7 +291,7 @@ for decoding when the cdr that the data specify is not
available.")
(let ((rfc2047-encoding-type 'mime)
rfc2047-encode-max-chars)
(rfc2047-encode-string
- (replace-regexp-in-string group "[\t\n ]+" "_")))))
+ (replace-regexp-in-string "[\t\n ]+" "_" group)))))
(when nnrss-content-function
(funcall nnrss-content-function e group article))))
(cond
@@ -804,9 +804,10 @@ It is useful when `(setq nnrss-use-local t)'."
node))
(cleaned-text (if text
(replace-regexp-in-string
+ "\r\n" "\n"
(replace-regexp-in-string
- text "^[\000-\037\177]+\\|^ +\\| +$" "")
- "\r\n" "\n"))))
+ "^[\000-\037\177]+\\|^ +\\| +$" ""
+ text)))))
(if (string-equal "" cleaned-text)
nil
cleaned-text)))
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index eb7d862..0b58dc8 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
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 39181ea..d322400 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1200,18 +1200,18 @@ Note this has to be fast."
(cond
((eq header 'X-Spam-Status)
(string-to-number (replace-regexp-in-string
- header-content
spam-spamassassin-score-regexp
- "\\1")))
+ "\\1"
+ header-content)))
;; for CRM checking, it's probably faster to just do the string match
((string-match "( pR: \\([0-9.-]+\\)" header-content)
(- (string-to-number (match-string 1 header-content))))
((eq header 'X-Bogosity)
(string-to-number (replace-regexp-in-string
+ ",.*" ""
(replace-regexp-in-string
- header-content
- ".*spamicity=" "")
- ",.*" "")))
+ ".*spamicity=" ""
+ header-content))))
(t nil))
nil)))