aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMark Oteiza2016-11-07 22:11:39 -0500
committerMark Oteiza2016-11-07 22:11:39 -0500
commitd3e22a1210e2a054f6f6aed44a3b98f6bbcd4546 (patch)
treee9ae0567d480dde4d4efca81f6849131f4611b12 /lisp
parent73d47d22197175f08b2dd62e76d7138872e611d2 (diff)
downloademacs-d3e22a1210e2a054f6f6aed44a3b98f6bbcd4546.tar.gz
emacs-d3e22a1210e2a054f6f6aed44a3b98f6bbcd4546.zip
Prescribe history for read-regexp in query-replace
In the fix for bug#24580, the history argument for read-regexp was removed erroneously; read-regexp's history argument defaults to regexp-history, not minibuffer-history. * lisp/replace.el (query-replace-read-from): Tell read-regexp to use minibuffer-history. Fixes bug#24873.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/replace.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/replace.el b/lisp/replace.el
index 4fc48d4c7a8..60948efeea6 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -198,7 +198,7 @@ wants to replace FROM with TO."
198 (setq-local text-property-default-nonsticky 198 (setq-local text-property-default-nonsticky
199 (cons '(separator . t) text-property-default-nonsticky))) 199 (cons '(separator . t) text-property-default-nonsticky)))
200 (if regexp-flag 200 (if regexp-flag
201 (read-regexp prompt) 201 (read-regexp prompt nil 'minibuffer-history)
202 (read-from-minibuffer 202 (read-from-minibuffer
203 prompt nil nil nil nil 203 prompt nil nil nil nil
204 (car (if regexp-flag regexp-search-ring search-ring)) t))))) 204 (car (if regexp-flag regexp-search-ring search-ring)) t)))))