From 10ec0468dfbc0815a772cc46a031aca298af0985 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 16 Dec 2014 01:45:12 +0200 Subject: [PATCH] Lazy-highlight the whole string at point * lisp/isearch.el (isearch-lazy-highlight-search): Extend the bound of the wrapped search by the length of the search string to be able to lazy-highlight the whole search string at point. Fixes: debbugs:19353 --- lisp/ChangeLog | 6 ++++++ lisp/isearch.el | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 364511c2c15..5a0a62fef68 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-12-15 Juri Linkov + + * isearch.el (isearch-lazy-highlight-search): Extend the bound of + the wrapped search by the length of the search string to be able + to lazy-highlight the whole search string at point (bug#19353). + 2014-12-15 Lars Magne Ingebrigtsen * net/shr.el (shr-fold-text): Don't bug out on zero-length text. diff --git a/lisp/isearch.el b/lisp/isearch.el index ef0c4a78b89..fde93530cc0 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -3063,11 +3063,15 @@ Attempt to do the search exactly the way the pending Isearch would." (bound (if isearch-lazy-highlight-forward (min (or isearch-lazy-highlight-end-limit (point-max)) (if isearch-lazy-highlight-wrapped - isearch-lazy-highlight-start + (+ isearch-lazy-highlight-start + ;; Extend bound to match whole string at point + (1- (length isearch-lazy-highlight-last-string))) (window-end))) (max (or isearch-lazy-highlight-start-limit (point-min)) (if isearch-lazy-highlight-wrapped - isearch-lazy-highlight-end + (- isearch-lazy-highlight-end + ;; Extend bound to match whole string at point + (1- (length isearch-lazy-highlight-last-string))) (window-start)))))) ;; Use a loop like in `isearch-search'. (while retry -- 2.39.2