diff options
| author | Juri Linkov | 2010-06-06 12:52:13 +0300 |
|---|---|---|
| committer | Juri Linkov | 2010-06-06 12:52:13 +0300 |
| commit | 27dd3c11582fc8a0446fe4d1e26d6f5754322fae (patch) | |
| tree | 147d09ca90336bab5c7ce3f1a7737b23e7802c32 | |
| parent | 3085237cdc02088dc5ffbdda813b768970592d1e (diff) | |
| download | emacs-27dd3c11582fc8a0446fe4d1e26d6f5754322fae.tar.gz emacs-27dd3c11582fc8a0446fe4d1e26d6f5754322fae.zip | |
* lisp/isearch.el (isearch-lazy-highlight-search): Fix looping
by checking for empty match. This syncs this loop with the
similar loop in `isearch-search'. (Bug#6362)
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/isearch.el | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8cd1cd39739..1ab291709f1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-06-06 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * isearch.el (isearch-lazy-highlight-search): Fix looping | ||
| 4 | by checking for empty match. This syncs this loop with the | ||
| 5 | similar loop in `isearch-search'. (Bug#6362) | ||
| 6 | |||
| 1 | 2010-06-05 Dan Nicolaescu <dann@ics.uci.edu> | 7 | 2010-06-05 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 8 | ||
| 3 | vc-log-incoming/vc-log-outgoing fixes for Git. | 9 | vc-log-incoming/vc-log-outgoing fixes for Git. |
diff --git a/lisp/isearch.el b/lisp/isearch.el index ea5836edc4d..89d50d66c76 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -2667,6 +2667,8 @@ Attempt to do the search exactly the way the pending Isearch would." | |||
| 2667 | ;; Clear RETRY unless the search predicate says | 2667 | ;; Clear RETRY unless the search predicate says |
| 2668 | ;; to skip this search hit. | 2668 | ;; to skip this search hit. |
| 2669 | (if (or (not success) | 2669 | (if (or (not success) |
| 2670 | (= (point) bound) ; like (bobp) (eobp) in `isearch-search'. | ||
| 2671 | (= (match-beginning 0) (match-end 0)) | ||
| 2670 | (funcall isearch-filter-predicate | 2672 | (funcall isearch-filter-predicate |
| 2671 | (match-beginning 0) (match-end 0))) | 2673 | (match-beginning 0) (match-end 0))) |
| 2672 | (setq retry nil))) | 2674 | (setq retry nil))) |