From: Basil L. Contovounesios <contovob@tcd.ie>
Date: Sun, 17 Jan 2021 18:56:50 +0000 (+0000)
Subject: Use format-prompt in read-regexp.
X-Git-Tag: emacs-28.0.90~4232
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bdb9889f784dc6113a74c259a53cf0623e49ab2d;p=emacs.git

Use format-prompt in read-regexp.

* lisp/replace.el (read-regexp): Use format-prompt (bug#12443).
---

diff --git a/lisp/replace.el b/lisp/replace.el
index d41dc98a0d9..8f8cbfac542 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -866,13 +866,10 @@ If nil, uses `regexp-history'."
 	 ;; Do not automatically add default to the history for empty input.
 	 (history-add-new-input nil)
 	 (input (read-from-minibuffer
-		 (cond ((string-match-p ":[ \t]*\\'" prompt)
-			prompt)
-		       ((and default (> (length default) 0))
-			 (format "%s (default %s): " prompt
-				 (query-replace-descr default)))
-		       (t
-			(format "%s: " prompt)))
+                 (if (string-match-p ":[ \t]*\\'" prompt)
+                     prompt
+                   (format-prompt prompt (and (length> default 0)
+                                              (query-replace-descr default))))
 		 nil nil nil (or history 'regexp-history) suggestions t)))
     (if (equal input "")
 	;; Return the default value when the user enters empty input.