[Emacs-diffs] /srv/bzr/emacs/trunk r100388: * replace.el (replace-highlight): Fix lazy-highlighting

[Juri Linkov]

------------------------------------------------------------
revno: 100388
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-21 01:49:53 +0300
message:
  * replace.el (replace-highlight): Fix lazy-highlighting
  for `M-s w str M-% str RET'.
modified:
  lisp/ChangeLog
  lisp/replace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-20 22:33:09 +0000
+++ b/lisp/ChangeLog    2010-05-20 22:49:53 +0000
@@ -1,3 +1,8 @@
+2010-05-20  Juri Linkov  <address@hidden>
+
+       * replace.el (replace-highlight): Fix lazy-highlighting
+       for `M-s w str M-% str RET'.
+
 2009-12-15  Masatake YAMATO  <address@hidden>
 
        * isearch.el (isearch-yank-word-or-char): Pull next subword

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2010-03-30 16:38:45 +0000
+++ b/lisp/replace.el   2010-05-20 22:49:53 +0000
@@ -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 ()