# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1274395793 -10800
# Node ID c465f7b922649709217079cc1c5a822c1e09bd4f
# Parent  762db3570fa8a1f561aba3c15901513f65402440
* replace.el (replace-highlight): Fix lazy-highlighting
for `M-s w str M-% str RET'.

diff -r 762db3570fa8 -r c465f7b92264 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 21 01:33:09 2010 +0300
+++ b/lisp/ChangeLog	Fri May 21 01:49:53 2010 +0300
@@ -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 -r 762db3570fa8 -r c465f7b92264 lisp/replace.el
--- 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 ()