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

[Juri Linkov]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.260 emacs/lisp/isearch.el:1.261
*** emacs/lisp/isearch.el:1.260 Fri Mar 18 07:06:15 2005
--- emacs/lisp/isearch.el       Fri Mar 18 09:59:31 2005
***************
*** 744,750 ****
     isearch-adjusted nil
     isearch-yank-flag nil)
    (when isearch-lazy-highlight
!     (isearch-lazy-highlight-new-loop nil nil))
    ;; 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))
--- 744,750 ----
     isearch-adjusted nil
     isearch-yank-flag nil)
    (when 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))
***************
*** 2347,2353 ****
  (defalias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
  (make-obsolete 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup "22.1")
  
! (defun isearch-lazy-highlight-new-loop (beg end)
    "Cleanup any previous `lazy-highlight' loop and begin a new one.
  BEG and END specify the bounds within which highlighting should occur.
  This is called when `isearch-update' is invoked (which can cause the
--- 2347,2353 ----
  (defalias 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup)
  (make-obsolete 'isearch-lazy-highlight-cleanup 'lazy-highlight-cleanup "22.1")
  
! (defun isearch-lazy-highlight-new-loop (&optional beg end)
    "Cleanup any previous `lazy-highlight' loop and begin a new one.
  BEG and END specify the bounds within which highlighting should occur.
  This is called when `isearch-update' is invoked (which can cause the
***************
*** 2389,2399 ****
  (defun isearch-lazy-highlight-search ()
    "Search ahead for the next or previous match, for lazy highlighting.
  Attempt to do the search exactly the way the pending isearch would."
!   (let ((case-fold-search isearch-case-fold-search)
        (search-spaces-regexp search-whitespace-regexp))
      (condition-case nil
        (funcall (isearch-search-fun)
!                isearch-string
                 (if isearch-forward
                     (min (or isearch-lazy-highlight-end-limit (point-max))
                          (if isearch-lazy-highlight-wrapped
--- 2389,2400 ----
  (defun isearch-lazy-highlight-search ()
    "Search ahead for the next or previous match, for lazy highlighting.
  Attempt to do the search exactly the way the pending isearch would."
!   (let ((case-fold-search isearch-lazy-highlight-case-fold-search)
!       (isearch-regexp isearch-lazy-highlight-regexp)
        (search-spaces-regexp search-whitespace-regexp))
      (condition-case nil
        (funcall (isearch-search-fun)
!                isearch-lazy-highlight-last-string
                 (if isearch-forward
                     (min (or isearch-lazy-highlight-end-limit (point-max))
                          (if isearch-lazy-highlight-wrapped