(query-replace-read-from): Set the value of

query-replace-from-history-variable to handle the case of an empty
string entered to accept the suggested default.

1 files changed, 5 insertions, 2 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index de3577913c1..eb9f592f01d 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -115,8 +115,11 @@ wants to replace FROM with TO."
                query-replace-from-history-variable
                nil t t))))
       (if (and (zerop (length from)) lastto lastfrom)
-          (cons lastfrom
-                (query-replace-compile-replacement lastto regexp-flag))
+          (progn
+            (cons lastfrom
+                  (query-replace-compile-replacement lastto regexp-flag))
+            (set query-replace-from-history-variable
+                 (cdr (symbol-value query-replace-from-history-variable))))
         ;; Warn if user types \n or \t, but don't reject the input.
         (and regexp-flag
              (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from)