[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111287: * lisp/isearch.el (isearch-lazy-highlight-new-loop):

[Juri Linkov]

------------------------------------------------------------
revno: 111287
fixes bug: http://debbugs.gnu.org/13402
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Thu 2013-02-21 19:45:12 +0200
message:
  * lisp/isearch.el (isearch-lazy-highlight-new-loop):
  Set `isearch-lazy-highlight-start' and `isearch-lazy-highlight-end'
  to `isearch-other-end' if it is not nil. 
  
  * lisp/replace.el (replace-highlight): Let-bind `isearch-other-end'
  to `match-beg'.
  
  * lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
  Let-bind `isearch-other-end' to `start', `isearch-forward' to t
  and `isearch-error' to nil.
modified:
  lisp/ChangeLog
  lisp/isearch.el
  lisp/replace.el
  lisp/textmodes/ispell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-20 20:41:46 +0000
+++ b/lisp/ChangeLog    2013-02-21 17:45:12 +0000
@@ -1,3 +1,16 @@
+2013-02-21  Juri Linkov  <address@hidden>
+
+       * isearch.el (isearch-lazy-highlight-new-loop):
+       Set `isearch-lazy-highlight-start' and `isearch-lazy-highlight-end'
+       to `isearch-other-end' if it is not nil.  (Bug#13402)
+
+       * replace.el (replace-highlight): Let-bind `isearch-other-end'
+       to `match-beg'.
+
+       * textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
+       Let-bind `isearch-other-end' to `start', `isearch-forward' to t
+       and `isearch-error' to nil.
+
 2013-02-20  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (python-info-current-defun): Enhance

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2013-02-01 23:38:41 +0000
+++ b/lisp/isearch.el   2013-02-21 17:45:12 +0000
@@ -2936,8 +2936,15 @@
     (setq isearch-lazy-highlight-window       (selected-window)
          isearch-lazy-highlight-window-start (window-start)
          isearch-lazy-highlight-window-end   (window-end)
-         isearch-lazy-highlight-start        (point)
-         isearch-lazy-highlight-end          (point)
+         ;; Start lazy-highlighting at the beginning of the found
+         ;; match (`isearch-other-end').  If no match, use point.
+         ;; One of the next two variables (depending on search direction)
+         ;; is used to define the starting position of lazy-highlighting
+         ;; and also to remember the current position of point between
+         ;; calls of `isearch-lazy-highlight-update', and another variable
+         ;; is used to define where the wrapped search must stop.
+         isearch-lazy-highlight-start        (or isearch-other-end (point))
+         isearch-lazy-highlight-end          (or isearch-other-end (point))
          isearch-lazy-highlight-wrapped      nil
          isearch-lazy-highlight-last-string  isearch-string
          isearch-lazy-highlight-case-fold-search isearch-case-fold-search
@@ -3035,6 +3042,9 @@
                          (overlay-put ov 'priority 1000)
                          (overlay-put ov 'face lazy-highlight-face)
                          (overlay-put ov 'window (selected-window))))
+                     ;; Remember the current position of point for
+                     ;; the next call of `isearch-lazy-highlight-update'
+                     ;; when `lazy-highlight-max-at-a-time' is too small.
                      (if isearch-lazy-highlight-forward
                          (setq isearch-lazy-highlight-end (point))
                        (setq isearch-lazy-highlight-start (point)))))

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2013-02-01 23:38:41 +0000
+++ b/lisp/replace.el   2013-02-21 17:45:12 +0000
@@ -2198,6 +2198,7 @@
             replace-regexp-lax-whitespace)
            (isearch-case-fold-search case-fold-search)
            (isearch-forward t)
+           (isearch-other-end match-beg)
            (isearch-error nil))
        (isearch-lazy-highlight-new-loop range-beg range-end))))
 

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2013-01-01 09:11:05 +0000
+++ b/lisp/textmodes/ispell.el  2013-02-21 17:45:12 +0000
@@ -2497,7 +2497,10 @@
                  (regexp-quote (buffer-substring-no-properties start end))
                  "\\b"))
                (isearch-regexp t)
-               (isearch-case-fold-search nil))
+               (isearch-case-fold-search nil)
+               (isearch-forward t)
+               (isearch-other-end start)
+               (isearch-error nil))
            (isearch-lazy-highlight-new-loop
             (if (boundp 'reg-start) reg-start)
             (if (boundp 'reg-end)   reg-end)))