From: Mark Oteiza <mvoteiza@udel.edu>
Date: Tue, 8 Nov 2016 03:11:39 +0000 (-0500)
Subject: Prescribe history for read-regexp in query-replace
X-Git-Tag: emacs-26.0.90~1356
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d3e22a1210e2a054f6f6aed44a3b98f6bbcd4546;p=emacs.git

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.
---

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."
                     (setq-local text-property-default-nonsticky
                                 (cons '(separator . t) text-property-default-nonsticky)))
                 (if regexp-flag
-                    (read-regexp prompt)
+                    (read-regexp prompt nil 'minibuffer-history)
                   (read-from-minibuffer
                    prompt nil nil nil nil
                    (car (if regexp-flag regexp-search-ring search-ring)) t)))))