Mercurial > emacs
comparison lisp/isearch.el @ 108902:1f795f817d05
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 06 Jun 2010 22:46:17 +0000 |
| parents | cc0a50e33241 |
| children | df8e0cd18128 |
comparison
equal
deleted
inserted
replaced
| 108901:10652acf752a | 108902:1f795f817d05 |
|---|---|
| 2665 (setq success (isearch-search-string | 2665 (setq success (isearch-search-string |
| 2666 isearch-lazy-highlight-last-string bound t)) | 2666 isearch-lazy-highlight-last-string bound t)) |
| 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))) |
| 2673 success) | 2675 success) |
| 2674 (error nil))) | 2676 (error nil))) |