744 |
isearch-adjusted nil |
isearch-adjusted nil |
745 |
isearch-yank-flag nil) |
isearch-yank-flag nil) |
746 |
(when isearch-lazy-highlight |
(when isearch-lazy-highlight |
747 |
(isearch-lazy-highlight-new-loop nil nil)) |
(isearch-lazy-highlight-new-loop)) |
748 |
;; We must prevent the point moving to the end of composition when a |
;; We must prevent the point moving to the end of composition when a |
749 |
;; part of the composition has just been searched. |
;; part of the composition has just been searched. |
750 |
(setq disable-point-adjustment t)) |
(setq disable-point-adjustment t)) |
2347 |
(defalias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup) |
(defalias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup) |
2348 |
(make-obsolete 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup "22.1") |
(make-obsolete 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup "22.1") |
2349 |
|
|
2350 |
(defun isearch-lazy-highlight-new-loop (beg end) |
(defun isearch-lazy-highlight-new-loop (&optional beg end) |
2351 |
"Cleanup any previous `lazy-highlight' loop and begin a new one. |
"Cleanup any previous `lazy-highlight' loop and begin a new one. |
2352 |
BEG and END specify the bounds within which highlighting should occur. |
BEG and END specify the bounds within which highlighting should occur. |
2353 |
This is called when `isearch-update' is invoked (which can cause the |
This is called when `isearch-update' is invoked (which can cause the |
2389 |
(defun isearch-lazy-highlight-search () |
(defun isearch-lazy-highlight-search () |
2390 |
"Search ahead for the next or previous match, for lazy highlighting. |
"Search ahead for the next or previous match, for lazy highlighting. |
2391 |
Attempt to do the search exactly the way the pending isearch would." |
Attempt to do the search exactly the way the pending isearch would." |
2392 |
(let ((case-fold-search isearch-case-fold-search) |
(let ((case-fold-search isearch-lazy-highlight-case-fold-search) |
2393 |
|
(isearch-regexp isearch-lazy-highlight-regexp) |
2394 |
(search-spaces-regexp search-whitespace-regexp)) |
(search-spaces-regexp search-whitespace-regexp)) |
2395 |
(condition-case nil |
(condition-case nil |
2396 |
(funcall (isearch-search-fun) |
(funcall (isearch-search-fun) |
2397 |
isearch-string |
isearch-lazy-highlight-last-string |
2398 |
(if isearch-forward |
(if isearch-forward |
2399 |
(min (or isearch-lazy-highlight-end-limit (point-max)) |
(min (or isearch-lazy-highlight-end-limit (point-max)) |
2400 |
(if isearch-lazy-highlight-wrapped |
(if isearch-lazy-highlight-wrapped |