diff lisp/replace.el @ 108721:c465f7b92264

* replace.el (replace-highlight): Fix lazy-highlighting for `M-s w str M-% str RET'.

--- a/lisp/replace.el	Fri May 21 01:33:09 2010 +0300
+++ b/lisp/replace.el	Fri May 21 01:49:53 2010 +0300
@@ -1980,6 +1980,9 @@
 	    (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 ()