Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/lisp/isearch.el Thu Jun 03 23:18:01 2010 +0000 +++ b/lisp/isearch.el Sun Jun 06 22:46:17 2010 +0000 @@ -2667,6 +2667,8 @@ ;; Clear RETRY unless the search predicate says ;; to skip this search hit. (if (or (not success) + (= (point) bound) ; like (bobp) (eobp) in `isearch-search'. + (= (match-beginning 0) (match-end 0)) (funcall isearch-filter-predicate (match-beginning 0) (match-end 0))) (setq retry nil)))