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

[Juri Linkov]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.277 emacs/lisp/isearch.el:1.278
*** emacs/lisp/isearch.el:1.277 Wed Nov 30 22:53:00 2005
--- emacs/lisp/isearch.el       Fri Dec  9 09:45:06 2005
***************
*** 2235,2251 ****
  (defvar isearch-overlay nil)
  
  (defun isearch-highlight (beg end)
!   (unless (null search-highlight)
!     (cond (isearch-overlay
!          ;; Overlay already exists, just move it.
!          (move-overlay isearch-overlay beg end (current-buffer)))
! 
!         (t
!          ;; Overlay doesn't exist, create it.
!          (setq isearch-overlay (make-overlay beg end))
!          (overlay-put isearch-overlay 'face isearch)
!            (overlay-put isearch-overlay 'priority 1) ;higher than lazy 
overlays
!            ))))
  
  (defun isearch-dehighlight ()
    (when isearch-overlay
--- 2235,2249 ----
  (defvar isearch-overlay nil)
  
  (defun isearch-highlight (beg end)
!   (if search-highlight
!       (if isearch-overlay
!         ;; Overlay already exists, just move it.
!         (move-overlay isearch-overlay beg end (current-buffer))
!       ;; Overlay doesn't exist, create it.
!       (setq isearch-overlay (make-overlay beg end))
!       ;; 1001 is higher than lazy's 1000 and ediff's 100+
!       (overlay-put isearch-overlay 'priority 1001)
!       (overlay-put isearch-overlay 'face isearch))))
  
  (defun isearch-dehighlight ()
    (when isearch-overlay
***************
*** 2409,2416 ****
                        ;; non-zero-length match
                        (let ((ov (make-overlay mb me)))
                          (push ov isearch-lazy-highlight-overlays)
                          (overlay-put ov 'face lazy-highlight-face)
-                         (overlay-put ov 'priority 0) ;lower than main overlay
                          (overlay-put ov 'window (selected-window))))
                      (if isearch-forward
                          (setq isearch-lazy-highlight-end (point))
--- 2407,2416 ----
                        ;; non-zero-length match
                        (let ((ov (make-overlay mb me)))
                          (push ov isearch-lazy-highlight-overlays)
+                         ;; 1000 is higher than ediff's 100+,
+                         ;; but lower than isearch main overlay's 1001
+                         (overlay-put ov 'priority 1000)
                          (overlay-put ov 'face lazy-highlight-face)
                          (overlay-put ov 'window (selected-window))))
                      (if isearch-forward
                          (setq isearch-lazy-highlight-end (point))