[Emacs-diffs] Changes to emacs/lisp/isearch.el

[Juri Linkov]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.248 emacs/lisp/isearch.el:1.249
*** emacs/lisp/isearch.el:1.248 Sun Dec 12 21:53:14 2004
--- emacs/lisp/isearch.el       Wed Dec 15 10:08:51 2004
***************
*** 653,659 ****
    (setq ;; quit-flag nil  not for isearch-mode
     isearch-adjusted nil
     isearch-yank-flag nil)
!   (isearch-lazy-highlight-new-loop)
    ;; We must prevent the point moving to the end of composition when a
    ;; part of the composition has just been searched.
    (setq disable-point-adjustment t))
--- 653,659 ----
    (setq ;; quit-flag nil  not for isearch-mode
     isearch-adjusted nil
     isearch-yank-flag nil)
!   (if isearch-lazy-highlight (isearch-lazy-highlight-new-loop))
    ;; We must prevent the point moving to the end of composition when a
    ;; part of the composition has just been searched.
    (setq disable-point-adjustment t))
***************
*** 2333,2340 ****
    "Cleanup any previous `isearch-lazy-highlight' loop and begin a new one.
  This happens when `isearch-update' is invoked (which can cause the
  search string to change or the window to scroll)."
!   (when (and isearch-lazy-highlight
!            (null executing-kbd-macro)
               (sit-for 0)         ;make sure (window-start) is credible
               (or (not (equal isearch-string
                               isearch-lazy-highlight-last-string))
--- 2333,2339 ----
    "Cleanup any previous `isearch-lazy-highlight' loop and begin a new one.
  This happens when `isearch-update' is invoked (which can cause the
  search string to change or the window to scroll)."
!   (when (and (null executing-kbd-macro)
               (sit-for 0)         ;make sure (window-start) is credible
               (or (not (equal isearch-string
                               isearch-lazy-highlight-last-string))