[Emacs-diffs] /srv/bzr/emacs/trunk r107563: * lisp/replace.el (replace-highlight): Set isearch-word to nil unconditionally.

[Juri Linkov]

------------------------------------------------------------
revno: 107563
fixes bug(s): http://debbugs.gnu.org/10887
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sun 2012-03-11 12:27:53 +0200
message:
  * lisp/replace.el (replace-highlight): Set isearch-word to nil 
unconditionally.
modified:
  lisp/ChangeLog
  lisp/replace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-10 14:36:42 +0000
+++ b/lisp/ChangeLog    2012-03-11 10:27:53 +0000
@@ -1,3 +1,8 @@
+2012-03-11  Juri Linkov  <address@hidden>
+
+       * replace.el (replace-highlight): Set isearch-word to nil
+       unconditionally.  (Bug#10887)
+
 2012-03-10  Eli Zaretskii  <address@hidden>
 
        * net/mairix.el (mairix-replace-invalid-chars): Rename from

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2012-02-23 00:55:30 +0000
+++ b/lisp/replace.el   2012-03-11 10:27:53 +0000
@@ -2116,13 +2116,13 @@
   (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 ()