diff options
| author | Juri Linkov <[email protected]> | 2004-12-15 10:08:51 +0000 |
|---|---|---|
| committer | Juri Linkov <[email protected]> | 2004-12-15 10:08:51 +0000 |
| commit | da79720c9e2256e62b9dfb1436e8d83b40ab5045 (patch) | |
| tree | a6cd86fec2ede8c6dae1bbfad52c83398220ad0f /lisp/isearch.el | |
| parent | 6d4ebd71ee75278bd653cfc936d861d676e4995b (diff) | |
(isearch-update): Test isearch-lazy-highlight
before calling isearch-lazy-highlight-new-loop.
(isearch-lazy-highlight-new-loop):
Don't test isearch-lazy-highlight.
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 9ee9b4d852..f94590ded2 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -653,7 +653,7 @@ is treated as a regexp. See \\[isearch-forward] for more info." (setq ;; quit-flag nil not for isearch-mode isearch-adjusted nil isearch-yank-flag nil) - (isearch-lazy-highlight-new-loop) + (if isearch-lazy-highlight (isearch-lazy-highlight-new-loop)) ;; We must prevent the point moving to the end of composition when a ;; part of the composition has just been searched. (setq disable-point-adjustment t)) @@ -2333,8 +2333,7 @@ is nil. This function is called when exiting an incremental search if "Cleanup any previous `isearch-lazy-highlight' loop and begin a new one. This happens when `isearch-update' is invoked (which can cause the search string to change or the window to scroll)." - (when (and isearch-lazy-highlight - (null executing-kbd-macro) + (when (and (null executing-kbd-macro) (sit-for 0) ;make sure (window-start) is credible (or (not (equal isearch-string isearch-lazy-highlight-last-string)) |