* replace.el (replace-highlight): Fix lazy-highlighting

for `M-s w str M-% str RET'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4735ee6000bdf93f88ae93e4d6493a5d350eb6e9..1f2d78e92c868616e1cb1a19a052ac9518a7416c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+       * replace.el (replace-highlight): Fix lazy-highlighting
+       for `M-s w str M-% str RET'.
+
 2009-12-15  Masatake YAMATO  <yamato@redhat.com>
 
        * isearch.el (isearch-yank-word-or-char): Pull next subword

diff --git a/lisp/replace.el b/lisp/replace.el
index 487974073aa7768817584e803b0da5b3b976fdef..d73692ccc200212978c96ab7181dd8162703955c 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1980,6 +1980,9 @@ make, or the user didn't cancel the call."
            (isearch-regexp regexp)
            (search-whitespace-regexp nil)
            (isearch-case-fold-search case-fold))
+       ;; 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 ()