gnus-replace-in-string -> replace-regexp-in-string

* lisp/gnus/gnus-util.el (gnus-replace-in-string): Declare
obsolete.  Transform all usages of it into
replace-regexp-in-string.

* lisp/gnus/mailcap.el (mailcap-replace-in-string): Remove.

17 files changed, 90 insertions, 110 deletions

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5a27bf8be69..f16a4c66ab6 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7522,7 +7522,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 (gnus-replace-in-string mid-or-mail "^\\(.*\\)@.*$" "\\1")))
+	  (length (replace-regexp-in-string mid-or-mail "^\\(.*\\)@.*$" "\\1")))
     (gnus-message 8 "`%s', length of local part=`%s'." mid-or-mail lpartlen)
     ;; Certain special cases...
     (when (string-match
@@ -7593,7 +7593,7 @@ address, `ask' if unsure and `invalid' if the string is invalid."
       (setq guessed
 	    ;; get rid of surrounding angles...
 	    (funcall pref
-		     (gnus-replace-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)))
@@ -7625,13 +7625,13 @@ as a symbol to FUN."
   "Call `describe-function' when pushing the corresponding URL button."
   (describe-function
    (intern
-    (gnus-replace-in-string url gnus-button-handle-describe-prefix ""))))
+    (replace-regexp-in-string url gnus-button-handle-describe-prefix ""))))
 
 (defun gnus-button-handle-describe-variable (url)
   "Call `describe-variable' when pushing the corresponding URL button."
   (describe-variable
    (intern
-    (gnus-replace-in-string url gnus-button-handle-describe-prefix ""))))
+    (replace-regexp-in-string url gnus-button-handle-describe-prefix ""))))
 
 (defun gnus-button-handle-symbol (url)
 "Display help on variable or function.
@@ -7645,7 +7645,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
-	  (gnus-replace-in-string url gnus-button-handle-describe-prefix ""))
+	  (replace-regexp-in-string url gnus-button-handle-describe-prefix ""))
 	 (keys (ignore-errors (eval `(kbd ,key-string)))))
     (if keys
 	(describe-key keys)
@@ -7653,30 +7653,31 @@ Calls `describe-variable' or `describe-function'."
 
 (defun gnus-button-handle-apropos (url)
   "Call `apropos' when pushing the corresponding URL button."
-  (apropos (gnus-replace-in-string url gnus-button-handle-describe-prefix "")))
+  (apropos (replace-regexp-in-string
+	    url gnus-button-handle-describe-prefix "")))
 
 (defun gnus-button-handle-apropos-command (url)
   "Call `apropos' when pushing the corresponding URL button."
   (apropos-command
-   (gnus-replace-in-string url gnus-button-handle-describe-prefix "")))
+   (replace-regexp-in-string url gnus-button-handle-describe-prefix "")))
 
 (defun gnus-button-handle-apropos-variable (url)
   "Call `apropos' when pushing the corresponding URL button."
   (funcall
    (if (fboundp 'apropos-variable) 'apropos-variable 'apropos)
-   (gnus-replace-in-string url gnus-button-handle-describe-prefix "")))
+   (replace-regexp-in-string url gnus-button-handle-describe-prefix "")))
 
 (defun gnus-button-handle-apropos-documentation (url)
   "Call `apropos' when pushing the corresponding URL button."
   (funcall
    (if (fboundp 'apropos-documentation) 'apropos-documentation 'apropos)
-   (gnus-replace-in-string url gnus-button-handle-describe-prefix "")))
+   (replace-regexp-in-string url gnus-button-handle-describe-prefix "")))
 
 (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 (gnus-replace-in-string (or lib "") "\\.elc" ".el")))
+	 (file (replace-regexp-in-string (or lib "") "\\.elc" ".el")))
     (if (not lib)
 	(gnus-message 1 "Cannot locale library `%s'." url)
       (find-file-read-only file))))
@@ -8274,7 +8275,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 (gnus-replace-in-string url "([1-9][X1a-z]*).*\\'" "")))
+    (setq url (replace-regexp-in-string url "([1-9][X1a-z]*).*\\'" "")))
   (gnus-message 9 "`%s' `%s'" gnus-button-man-handler url)
   (funcall gnus-button-man-handler url))
 
@@ -8289,8 +8290,8 @@ url is put as the `gnus-button-url' overlay property on the button."
 	     ")" (gnus-url-unhex-string (match-string 2 url)))))
    ((string-match "([^)\"]+)[^\"]+" url)
     (setq url
-	  (gnus-replace-in-string
-	   (gnus-replace-in-string url "[\n\t ]+" " ") "\"" ""))
+	  (replace-regexp-in-string
+	   (replace-regexp-in-string url "[\n\t ]+" " ") "\"" ""))
     (gnus-info-find-node url))
    (t (error "Can't parse %s" url))))
 
@@ -8428,7 +8429,7 @@ url is put as the `gnus-button-url' overlay property on the button."
       (if (fboundp func)
 	  (funcall func)
 	(message-position-on-field (caar args)))
-      (insert (gnus-replace-in-string
+      (insert (replace-regexp-in-string
 	       (mapconcat 'identity (reverse (cdar args)) ", ")
 	       "\r\n" "\n" t))
       (setq args (cdr args)))
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index a16ac531ba0..cb3de92a2ae 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:
-	   (gnus-replace-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 77fce259b4b..28caed2e80d 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -94,7 +94,7 @@ Set image category to CATEGORY."
 		  (mail-address (cadr address)))
 	      (when (if real-name
 			(re-search-forward
-			 (concat (gnus-replace-in-string
+			 (concat (replace-regexp-in-string
 				  (regexp-quote real-name) "[\t ]+" "[\t\n ]+")
 				 "\\|"
 				 (regexp-quote mail-address))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 838e7470856..190acf13870 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2218,7 +2218,7 @@ if it is not a list."
       (setq group
 	    (mm-encode-coding-string
 	     group (gnus-group-name-charset nil group))))
-    (gnus-replace-in-string group "\n" "")))
+    (replace-regexp-in-string group "\n" "")))
 
 ;;;###autoload
 (defun gnus-fetch-group (group &optional articles)
@@ -2476,8 +2476,8 @@ the bug number, and browsing the URL must return mbox output."
 	(while (re-search-forward "^To: " nil t)
 	  (end-of-line)
 	  (insert (format ", %s@%s" (car ids)
-			  (gnus-replace-in-string
-			   (gnus-replace-in-string mbox-url "^http://" "")
+			  (replace-regexp-in-string
+			   (replace-regexp-in-string mbox-url "^http://" "")
 			   "/.*$" ""))))))
     (gnus-group-read-ephemeral-group
      (format "nndoc+ephemeral:bug#%s"
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 8f0dbfdc205..5bf0f7cb0bf 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1138,7 +1138,7 @@ See the variable `gnus-user-agent'."
 	   (gnus-v
 	    (when (memq 'gnus gnus-user-agent)
 	      (concat "Gnus/"
-		      (gnus-replace-in-string
+		      (replace-regexp-in-string
 		       (format "%1.8f" (gnus-continuum-version gnus-version))
 		       "0+\\'" "")
 		      " (" gnus-version ")")))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b85a4034cd1..a8a4c3faebc 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9086,7 +9086,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 (gnus-replace-in-string message-id " " ""))
+    (setq message-id (replace-regexp-in-string message-id " " ""))
     ;; Construct the correct Message-ID if necessary.
     ;; Suggested by tale@pawl.rpi.edu.
     (unless (string-match "^<" message-id)
@@ -9564,10 +9564,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."
-  (gnus-replace-in-string (if (and len (> (length string) len))
-			      (substring string 0 len)
-			    string)
-			  "[()]" "\\\\\\&"))
+  (replace-regexp-in-string (if (and len (> (length string) len))
+				(substring string 0 len)
+			      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 a883de9b083..950bb7feb95 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -78,23 +78,14 @@
 (autoload 'nnheader-replace-chars-in-string "nnheader")
 (autoload 'mail-header-remove-comments "mail-parse")
 
-(eval-and-compile
-  (cond
-   ;; Prefer `replace-regexp-in-string' (present in Emacs, XEmacs 21.5,
-   ;; SXEmacs 22.1.4) over `replace-in-string'.  The latter leads to inf-loops
-   ;; on empty matches:
-   ;;   (replace-in-string "foo" "/*$" "/")
-   ;;   (replace-in-string "xe" "\\(x\\)?" "")
-   ((fboundp 'replace-regexp-in-string)
-    (defun gnus-replace-in-string  (string regexp newtext &optional literal)
-      "Replace all matches for REGEXP with NEWTEXT in STRING.
+(defun gnus-replace-in-string  (string regexp newtext &optional literal)
+  "Replace all matches for REGEXP with NEWTEXT in STRING.
 If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
 string containing the replacements.
 
 This is a compatibility function for different Emacsen."
-      (replace-regexp-in-string regexp newtext string nil literal)))
-   ((fboundp 'replace-in-string)
-    (defalias 'gnus-replace-in-string 'replace-in-string))))
+  (declare (obsolete replace-regexp-in-string "25.2"))
+  (replace-regexp-in-string regexp newtext string nil literal))
 
 (defun gnus-boundp (variable)
   "Return non-nil if VARIABLE is bound and non-nil."
@@ -431,7 +422,7 @@ Cache the result as a text property stored in DATE."
 
 (defun gnus-mode-string-quote (string)
   "Quote all \"%\"'s in STRING."
-  (gnus-replace-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 f4a9e191010..f9c89f52cb7 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -603,7 +603,7 @@ 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 (gnus-replace-in-string
+	     (bfile (replace-regexp-in-string
 		     ffile "\\`.*/\\([^/]+\\)\\'" "\\1"))
 	     (filetime (nth 5 (file-attributes ffile)))
 	     (fileday (* (car filetime) high2days))
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index bf7ba0817ea..85d0411a1e3 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -39,19 +39,6 @@
     (autoload 'mm-delete-duplicates "mm-util")
     'mm-delete-duplicates))
 
-;; `mailcap-replace-in-string' is an alias like `gnus-replace-in-string'.
-(eval-and-compile
-  (cond
-   ((fboundp 'replace-regexp-in-string)
-    (defun mailcap-replace-in-string  (string regexp newtext &optional literal)
-      "Replace all matches for REGEXP with NEWTEXT in STRING.
-If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
-string containing the replacements.
-This is a compatibility function for different Emacsen."
-      (replace-regexp-in-string regexp newtext string nil literal)))
-   ((fboundp 'replace-in-string)
-    (defalias 'mailcap-replace-in-string 'replace-in-string))))
-
 (defgroup mailcap nil
   "Definition of viewers for MIME types."
   :version "21.1"
@@ -1047,16 +1034,18 @@ If FORCE, re-parse even if already parsed."
 	 (commands
 	  ;; Command strings from `viewer' field of the MIME info
 	  (mailcap-delete-duplicates
-	   (delq nil (mapcar (lambda (mime-info)
-			       (let ((command (cdr (assoc 'viewer mime-info))))
-				 (if (stringp command)
-				     (mailcap-replace-in-string
-				      ;; Replace mailcap's `%s' placeholder
-				      ;; with dired's `?' placeholder
-				      (mailcap-replace-in-string
-				       ;; Remove the final filename placeholder
-				       command "[ \t\n]*\\('\\)?%s\\1?[ \t\n]*\\'" "" t)
-				      "%s" "?" t))))
+	   (delq nil (mapcar
+		      (lambda (mime-info)
+			(let ((command (cdr (assoc 'viewer mime-info))))
+			  (if (stringp command)
+			      (replace-regexp-in-string
+			       ;; Replace mailcap's `%s' placeholder
+			       ;; with dired's `?' placeholder
+			       (replace-regexp-in-string
+				;; Remove the final filename placeholder
+				command "[ \t\n]*\\('\\)?%s\\1?[ \t\n]*\\'" ""
+				nil t)
+			       "%s" "?" nil t))))
 			     common-mime-info)))))
     commands))
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3c3105649ed..11c10126378 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8373,8 +8373,8 @@ From headers in the original article."
     (let ((value (message-field-value header)))
       (dolist (string (mail-header-parse-addresses value 'raw))
 	(setq string
-	      (gnus-replace-in-string
-	       (gnus-replace-in-string string "^ +\\| +$" "") "\n" ""))
+	      (replace-regexp-in-string
+	       (replace-regexp-in-string string "^ +\\| +$" "") "\n" ""))
 	(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 06159bcdd93..4df653c6009 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -28,7 +28,6 @@
 (eval-when-compile (require 'cl))
 
 (autoload 'gnus-map-function "gnus-util")
-(autoload 'gnus-replace-in-string "gnus-util")
 (autoload 'gnus-read-shell-command "gnus-util")
 
 (autoload 'mm-inline-partial "mm-partial")
@@ -1360,12 +1359,12 @@ string if you do not like underscores."
 
 (defun mm-file-name-delete-control (filename)
   "Delete control characters from FILENAME."
-  (gnus-replace-in-string filename "[\x00-\x1f\x7f]" ""))
+  (replace-regexp-in-string filename "[\x00-\x1f\x7f]" ""))
 
 (defun mm-file-name-delete-gotchas (filename)
   "Delete shell gotchas from FILENAME."
-  (setq filename (gnus-replace-in-string filename "[<>|]" ""))
-  (gnus-replace-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 560ba8ad2e5..eb436f51df5 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -928,17 +928,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 (gnus-replace-in-string
-                 (gnus-replace-in-string dirnam "^[./\\]" "" t)
-                 "[/\\]" "." 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)))))
+    (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)))))
 
 ;;; Search Engine Interfaces:
 
@@ -1340,9 +1340,10 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
 	    ;; eliminate all ".", "/", "\" from beginning. Always matches.
             (string-match "^[./\\]*\\(.*\\)$" dirnam)
             ;; "/" -> "."
-            (setq group (gnus-replace-in-string (match-string 1 dirnam) "/" "."))
+            (setq group (replace-regexp-in-string
+			 (match-string 1 dirnam) "/" "."))
             ;; Windows "\\" -> "."
-            (setq group (gnus-replace-in-string group "\\\\" "."))
+            (setq group (replace-regexp-in-string group "\\\\" "."))
 
             (push (vector (gnus-group-full-name group server)
                           (string-to-number artno)
@@ -1414,7 +1415,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
-                       (gnus-replace-in-string dirnam "/" ".") server)
+                       (replace-regexp-in-string dirnam "/" ".") server)
 		      (string-to-number artno)
 		      (string-to-number score))
 	      artlist))
@@ -1612,9 +1613,8 @@ actually)."
 				  group
 				(if (file-directory-p
 				     (setq group
-					   (gnus-replace-in-string
-					    group
-					    "\\." "/" t)))
+					   (replace-regexp-in-string
+					    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 70a3dd99be7..4b154432c7e 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -656,13 +656,13 @@ by nnmaildir-request-article.")
   (if (zerop n) 1 (1- (lsh 1 (1+ (logb n))))))
 
 (defun nnmaildir--system-name ()
-  (gnus-replace-in-string
-   (gnus-replace-in-string
-    (gnus-replace-in-string
+  (replace-regexp-in-string
+   (replace-regexp-in-string
+    (replace-regexp-in-string
      (system-name)
-     "\\\\" "\\134" 'literal)
-    "/" "\\057" 'literal)
-   ":" "\\072" 'literal))
+     "\\\\" "\\134" nil 'literal)
+    "/" "\\057" nil 'literal)
+   ":" "\\072" nil 'literal))
 
 (defun nnmaildir-request-type (_group &optional _article)
   'mail)
@@ -955,8 +955,8 @@ by nnmaildir-request-article.")
 			pgname (nnmaildir--pgname nnmaildir--cur-server pgname)
 			group (symbol-value group)
 			ro (nnmaildir--param pgname 'read-only))
-		  (insert (gnus-replace-in-string
-			   (nnmaildir--grp-name group) " " "\\ " t)
+		  (insert (replace-regexp-in-string
+			   (nnmaildir--grp-name group) " " "\\ " nil t)
 			  " ")
                   (princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
 			 nntp-server-buffer)
@@ -985,7 +985,7 @@ by nnmaildir-request-article.")
 	  (princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
 		 nntp-server-buffer)
 	  (insert " "
-		  (gnus-replace-in-string gname " " "\\ " t)
+		  (replace-regexp-in-string gname " " "\\ " nil t)
 		  "\n")))))
   'group)
 
@@ -1116,7 +1116,7 @@ by nnmaildir-request-article.")
 	(insert " ")
 	(princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
 	       nntp-server-buffer)
-	(insert " " (gnus-replace-in-string gname " " "\\ " t) "\n")
+	(insert " " (replace-regexp-in-string gname " " "\\ " nil t) "\n")
 	t))))
 
 (defun nnmaildir-request-create-group (gname &optional server _args)
@@ -1278,7 +1278,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 "
-		      (gnus-replace-in-string gname " " "\\ " 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 3350933f949..28dcd9aad4a 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1077,7 +1077,7 @@ Use the nov database for the current group if available."
 		;; 1/ Move the article to a new file:
 		(let* ((oldfile (nnml-article-to-file old-number))
 		       (newfile
-			(gnus-replace-in-string
+			(replace-regexp-in-string
 			 oldfile
 			 ;; nnml-use-compressed-files might be any string, but
 			 ;; probably it's sufficient to take into account only
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index bef8203ef27..857c58a478e 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)
-  (gnus-replace-in-string string " *\n *" " "))
+  (replace-regexp-in-string string " *\n *" " "))
 
 (defun nnrss-decode-group-name (group)
   (if (and group (mm-coding-system-p 'utf-8))
@@ -292,7 +292,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
-			   (gnus-replace-in-string group "[\t\n ]+" "_")))))
+			   (replace-regexp-in-string group "[\t\n ]+" "_")))))
 	(when nnrss-content-function
 	  (funcall nnrss-content-function e group article))))
     (cond
@@ -805,8 +805,8 @@ It is useful when `(setq nnrss-use-local t)'."
 		   (nnrss-node-just-text node)
 		 node))
 	 (cleaned-text (if text
-			   (gnus-replace-in-string
-			    (gnus-replace-in-string
+			   (replace-regexp-in-string
+			    (replace-regexp-in-string
 			     text "^[\000-\037\177]+\\|^ +\\| +$" "")
 			    "\r\n" "\n"))))
     (if (string-equal "" cleaned-text)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 0086dd14792..7ebff197b2b 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -162,9 +162,9 @@ submitted at once.  Internal variable.")
 	 rpt-host
 	 (concat
 	  "/"
-	  (gnus-replace-in-string
-	   (gnus-replace-in-string
-	    (gnus-replace-in-string
+	  (replace-regexp-in-string
+	   (replace-regexp-in-string
+	    (replace-regexp-in-string
 	     (mail-header-xref (gnus-summary-article-header article))
 	     "/raw" ":silent")
 	    "^.*article.gmane.org/" "")
@@ -207,7 +207,7 @@ submitted at once.  Internal variable.")
 	    (when host
 	      (when (string-equal "permalink.gmane.org" host)
 		(setq host rpt-host)
-		(setq report (gnus-replace-in-string
+		(setq report (replace-regexp-in-string
 			      report "/\\([0-9]+\\)$" ":\\1")))
 	      (setq url (format "http://%s%s" host report)))
 	    (if (not (and host report url))
@@ -227,7 +227,7 @@ the function specified by `spam-report-url-ping-function'."
 
 (defcustom spam-report-user-mail-address
   (and (stringp user-mail-address)
-       (gnus-replace-in-string user-mail-address "@" "<at>"))
+       (replace-regexp-in-string user-mail-address "@" "<at>"))
   "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 ab0584fdcf6..39181eaa62f 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1199,7 +1199,7 @@ Note this has to be fast."
     (if header-content
         (cond
          ((eq header 'X-Spam-Status)
-          (string-to-number (gnus-replace-in-string
+          (string-to-number (replace-regexp-in-string
                              header-content
                              spam-spamassassin-score-regexp
                              "\\1")))
@@ -1207,8 +1207,8 @@ Note this has to be fast."
          ((string-match "( pR: \\([0-9.-]+\\)" header-content)
           (- (string-to-number (match-string 1 header-content))))
          ((eq header 'X-Bogosity)
-          (string-to-number (gnus-replace-in-string
-                             (gnus-replace-in-string
+          (string-to-number (replace-regexp-in-string
+                             (replace-regexp-in-string
                               header-content
                               ".*spamicity=" "")
                              ",.*" "")))