summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBasil L. Contovounesios <contovob@tcd.ie>2021-01-17 18:56:50 +0000
committerBasil L. Contovounesios <contovob@tcd.ie>2021-01-18 17:58:42 +0000
commitbdb9889f784dc6113a74c259a53cf0623e49ab2d (patch)
tree2602f1fa151070d8a08ca89fa98ca9879d66cbd3
parent92144027915bc2fc9c222d87a8e2e5da3df46c82 (diff)
downloademacs-bdb9889f784dc6113a74c259a53cf0623e49ab2d.tar.gz
Use format-prompt in read-regexp.
* lisp/replace.el (read-regexp): Use format-prompt (bug#12443).
-rw-r--r--lisp/replace.el11
1 files changed, 4 insertions, 7 deletions
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.