Mercurial > emacs
comparison lisp/isearch.el @ 58972:71d0bc7835fb
(isearch-update): Test isearch-lazy-highlight
before calling isearch-lazy-highlight-new-loop.
(isearch-lazy-highlight-new-loop):
Don't test isearch-lazy-highlight.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Wed, 15 Dec 2004 10:08:51 +0000 |
| parents | 50c8d5bb29a0 |
| children | eb4a4bdb4f0f eac554634bfa |
comparison
equal
deleted
inserted
replaced
| 58971:042f31a6be01 | 58972:71d0bc7835fb |
|---|---|
| 651 (isearch-dehighlight nil)) | 651 (isearch-dehighlight nil)) |
| 652 )) | 652 )) |
| 653 (setq ;; quit-flag nil not for isearch-mode | 653 (setq ;; quit-flag nil not for isearch-mode |
| 654 isearch-adjusted nil | 654 isearch-adjusted nil |
| 655 isearch-yank-flag nil) | 655 isearch-yank-flag nil) |
| 656 (isearch-lazy-highlight-new-loop) | 656 (if isearch-lazy-highlight (isearch-lazy-highlight-new-loop)) |
| 657 ;; We must prevent the point moving to the end of composition when a | 657 ;; We must prevent the point moving to the end of composition when a |
| 658 ;; part of the composition has just been searched. | 658 ;; part of the composition has just been searched. |
| 659 (setq disable-point-adjustment t)) | 659 (setq disable-point-adjustment t)) |
| 660 | 660 |
| 661 (defun isearch-done (&optional nopush edit) | 661 (defun isearch-done (&optional nopush edit) |
| 2331 | 2331 |
| 2332 (defun isearch-lazy-highlight-new-loop () | 2332 (defun isearch-lazy-highlight-new-loop () |
| 2333 "Cleanup any previous `isearch-lazy-highlight' loop and begin a new one. | 2333 "Cleanup any previous `isearch-lazy-highlight' loop and begin a new one. |
| 2334 This happens when `isearch-update' is invoked (which can cause the | 2334 This happens when `isearch-update' is invoked (which can cause the |
| 2335 search string to change or the window to scroll)." | 2335 search string to change or the window to scroll)." |
| 2336 (when (and isearch-lazy-highlight | 2336 (when (and (null executing-kbd-macro) |
| 2337 (null executing-kbd-macro) | |
| 2338 (sit-for 0) ;make sure (window-start) is credible | 2337 (sit-for 0) ;make sure (window-start) is credible |
| 2339 (or (not (equal isearch-string | 2338 (or (not (equal isearch-string |
| 2340 isearch-lazy-highlight-last-string)) | 2339 isearch-lazy-highlight-last-string)) |
| 2341 (not (eq (selected-window) | 2340 (not (eq (selected-window) |
| 2342 isearch-lazy-highlight-window)) | 2341 isearch-lazy-highlight-window)) |