Mercurial > emacs
comparison lisp/isearch.el @ 59379:b9bf38399e43
(isearch-dehighlight): Remove unused arg `totally'.
(isearch-update, isearch-done): Adjust calls accordingly.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 05 Jan 2005 20:49:11 +0000 |
| parents | eb4a4bdb4f0f |
| children | 89c73b450bcc |
comparison
equal
deleted
inserted
replaced
| 59378:634d7564a9e8 | 59379:b9bf38399e43 |
|---|---|
| 1 ;;; isearch.el --- incremental search minor mode | 1 ;;; isearch.el --- incremental search minor mode |
| 2 | 2 |
| 3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, | 3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, |
| 4 ;; 2000, 2001, 2003, 2004 Free Software Foundation, Inc. | 4 ;; 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. |
| 5 | 5 |
| 6 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> | 6 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> |
| 7 ;; Maintainer: FSF | 7 ;; Maintainer: FSF |
| 8 ;; Keywords: matching | 8 ;; Keywords: matching |
| 9 | 9 |
| 703 (set-window-hscroll (selected-window) current-scroll)))) | 703 (set-window-hscroll (selected-window) current-scroll)))) |
| 704 (if isearch-other-end | 704 (if isearch-other-end |
| 705 (if (< isearch-other-end (point)) ; isearch-forward? | 705 (if (< isearch-other-end (point)) ; isearch-forward? |
| 706 (isearch-highlight isearch-other-end (point)) | 706 (isearch-highlight isearch-other-end (point)) |
| 707 (isearch-highlight (point) isearch-other-end)) | 707 (isearch-highlight (point) isearch-other-end)) |
| 708 (isearch-dehighlight nil)) | 708 (isearch-dehighlight)) |
| 709 )) | 709 )) |
| 710 (setq ;; quit-flag nil not for isearch-mode | 710 (setq ;; quit-flag nil not for isearch-mode |
| 711 isearch-adjusted nil | 711 isearch-adjusted nil |
| 712 isearch-yank-flag nil) | 712 isearch-yank-flag nil) |
| 713 (if isearch-lazy-highlight (isearch-lazy-highlight-new-loop)) | 713 (if isearch-lazy-highlight (isearch-lazy-highlight-new-loop)) |
| 731 ;; Called by all commands that terminate isearch-mode. | 731 ;; Called by all commands that terminate isearch-mode. |
| 732 ;; If NOPUSH is non-nil, we don't push the string on the search ring. | 732 ;; If NOPUSH is non-nil, we don't push the string on the search ring. |
| 733 (setq overriding-terminal-local-map nil) | 733 (setq overriding-terminal-local-map nil) |
| 734 ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs | 734 ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs |
| 735 (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout) | 735 (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout) |
| 736 (isearch-dehighlight t) | 736 (isearch-dehighlight) |
| 737 (isearch-lazy-highlight-cleanup lazy-highlight-cleanup) | 737 (isearch-lazy-highlight-cleanup lazy-highlight-cleanup) |
| 738 (let ((found-start (window-start (selected-window))) | 738 (let ((found-start (window-start (selected-window))) |
| 739 (found-point (point))) | 739 (found-point (point))) |
| 740 (if isearch-window-configuration | 740 (if isearch-window-configuration |
| 741 (set-window-configuration isearch-window-configuration)) | 741 (set-window-configuration isearch-window-configuration)) |
| 2218 (setq isearch-overlay (make-overlay beg end)) | 2218 (setq isearch-overlay (make-overlay beg end)) |
| 2219 (overlay-put isearch-overlay 'face isearch) | 2219 (overlay-put isearch-overlay 'face isearch) |
| 2220 (overlay-put isearch-overlay 'priority 1) ;higher than lazy overlays | 2220 (overlay-put isearch-overlay 'priority 1) ;higher than lazy overlays |
| 2221 )))) | 2221 )))) |
| 2222 | 2222 |
| 2223 (defun isearch-dehighlight (totally) | 2223 (defun isearch-dehighlight () |
| 2224 (when isearch-overlay | 2224 (when isearch-overlay |
| 2225 (delete-overlay isearch-overlay))) | 2225 (delete-overlay isearch-overlay))) |
| 2226 | 2226 |
| 2227 | 2227 |
| 2228 ;; General utilities | 2228 ;; General utilities |