Mercurial > emacs
changeset 108721:c465f7b92264
* replace.el (replace-highlight): Fix lazy-highlighting
for `M-s w str M-% str RET'.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Fri, 21 May 2010 01:49:53 +0300 |
| parents | 762db3570fa8 |
| children | 0d6255a71f15 |
| files | lisp/ChangeLog lisp/replace.el |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 ()