upstream

1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 349e63d4201..9fbaa279079 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2116,13 +2116,13 @@ make, or the user didn't cancel the call."
   (if query-replace-lazy-highlight
       (let ((isearch-string string)
             (isearch-regexp regexp)
+            ;; Set isearch-word to nil because word-replace is regexp-based,
+            ;; so `isearch-search-fun' should not use `word-search-forward'.
+            (isearch-word nil)
             (search-whitespace-regexp nil)
             (isearch-case-fold-search case-fold)
             (isearch-forward t)
             (isearch-error nil))
-        ;; Set isearch-word to nil because word-replace is regexp-based,
-        ;; so `isearch-search-fun' should not use `word-search-forward'.
-        (if (and isearch-word isearch-regexp) (setq isearch-word nil))
         (isearch-lazy-highlight-new-loop range-beg range-end))))
 
 (defun replace-dehighlight ()