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

[Stefan Monnier]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.250 emacs/lisp/isearch.el:1.251
*** emacs/lisp/isearch.el:1.250 Tue Jan  4 02:21:55 2005
--- emacs/lisp/isearch.el       Wed Jan  5 20:49:11 2005
***************
*** 1,7 ****
  ;;; isearch.el --- incremental search minor mode
  
  ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999,
! ;;   2000, 2001, 2003, 2004  Free Software Foundation, Inc.
  
  ;; Author: Daniel LaLiberte <address@hidden>
  ;; Maintainer: FSF
--- 1,7 ----
  ;;; isearch.el --- incremental search minor mode
  
  ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999,
! ;;   2000, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
  
  ;; Author: Daniel LaLiberte <address@hidden>
  ;; Maintainer: FSF
***************
*** 705,711 ****
              (if (< isearch-other-end (point)) ; isearch-forward?
                  (isearch-highlight isearch-other-end (point))
                (isearch-highlight (point) isearch-other-end))
!           (isearch-dehighlight nil))
          ))
    (setq ;; quit-flag nil  not for isearch-mode
     isearch-adjusted nil
--- 705,711 ----
              (if (< isearch-other-end (point)) ; isearch-forward?
                  (isearch-highlight isearch-other-end (point))
                (isearch-highlight (point) isearch-other-end))
!           (isearch-dehighlight))
          ))
    (setq ;; quit-flag nil  not for isearch-mode
     isearch-adjusted nil
***************
*** 733,739 ****
    (setq overriding-terminal-local-map nil)
    ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
    (setq minibuffer-message-timeout 
isearch-original-minibuffer-message-timeout)
!   (isearch-dehighlight t)
    (isearch-lazy-highlight-cleanup lazy-highlight-cleanup)
    (let ((found-start (window-start (selected-window)))
        (found-point (point)))
--- 733,739 ----
    (setq overriding-terminal-local-map nil)
    ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
    (setq minibuffer-message-timeout 
isearch-original-minibuffer-message-timeout)
!   (isearch-dehighlight)
    (isearch-lazy-highlight-cleanup lazy-highlight-cleanup)
    (let ((found-start (window-start (selected-window)))
        (found-point (point)))
***************
*** 2220,2226 ****
             (overlay-put isearch-overlay 'priority 1) ;higher than lazy 
overlays
             ))))
  
! (defun isearch-dehighlight (totally)
    (when isearch-overlay
      (delete-overlay isearch-overlay)))
  
--- 2220,2226 ----
             (overlay-put isearch-overlay 'priority 1) ;higher than lazy 
overlays
             ))))
  
! (defun isearch-dehighlight ()
    (when isearch-overlay
      (delete-overlay isearch-overlay)))