changeset 108893:cc0a50e33241

* 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)
author Juri Linkov <juri@jurta.org>
date Sun, 06 Jun 2010 12:52:13 +0300
parents d86e65007470
children ca3bfaa18e56 1f795f817d05
files lisp/ChangeLog lisp/isearch.el
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Jun 06 01:57:39 2010 -0700
+++ b/lisp/ChangeLog	Sun Jun 06 12:52:13 2010 +0300
@@ -1,3 +1,9 @@
+2010-06-06  Juri Linkov  <juri@jurta.org>
+
+	* 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)
+
 2010-06-05  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	vc-log-incoming/vc-log-outgoing fixes for Git.
--- a/lisp/isearch.el	Sun Jun 06 01:57:39 2010 -0700
+++ b/lisp/isearch.el	Sun Jun 06 12:52:13 2010 +0300
@@ -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)))