From: Juri Linkov <juri@jurta.org>
Date: Sun, 11 Mar 2012 10:27:53 +0000 (+0200)
Subject: * lisp/replace.el (replace-highlight): Set isearch-word to nil unconditionally.
X-Git-Tag: emacs-pretest-24.0.05~109
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=300e8fa5624c0670553c1215409c9d31075901d1;p=emacs.git

* lisp/replace.el (replace-highlight): Set isearch-word to nil unconditionally.

Fixes: debbugs:10887
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 338a8668e56..56ebb5fc948 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-11  Juri Linkov  <juri@jurta.org>
+
+	* replace.el (replace-highlight): Set isearch-word to nil
+	unconditionally.  (Bug#10887)
+
 2012-03-10  Eli Zaretskii  <eliz@gnu.org>
 
 	* net/mairix.el (mairix-replace-invalid-chars): Rename from
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 ()