aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-01-05 20:49:11 +0000
committerStefan Monnier2005-01-05 20:49:11 +0000
commit4dbbcb46d91862a16b21651e0b95e5959ffdbfb8 (patch)
tree5e6f526b08c99ffa2057e621b6af378c24b48245
parent436c08c28835f5c0f7080a1ddd3a876f65e16145 (diff)
downloademacs-4dbbcb46d91862a16b21651e0b95e5959ffdbfb8.tar.gz
emacs-4dbbcb46d91862a16b21651e0b95e5959ffdbfb8.zip
(isearch-dehighlight): Remove unused arg `totally'.
(isearch-update, isearch-done): Adjust calls accordingly.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/isearch.el8
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 730d199dc3b..f3a0a9aa31b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
12005-01-05 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * isearch.el (isearch-dehighlight): Remove unused arg `totally'.
4 (isearch-update, isearch-done): Adjust calls accordingly.
5
12005-01-05 Richard M. Stallman <rms@gnu.org> 62005-01-05 Richard M. Stallman <rms@gnu.org>
2 7
3 * emacs-lisp/find-func.el (find-variable) 8 * emacs-lisp/find-func.el (find-variable)
4 (find-variable-other-window, find-variable-other-frame): 9 (find-variable-other-window, find-variable-other-frame):
5 Fix the TYPE args to find-function-read and find-function-do-it. 10 Fix the TYPE args to find-function-read and find-function-do-it.
6 (find-function): Doc fix. 11 (find-function): Doc fix.
7 (find-function-at-point): Replace function-at-point alias. 12 (find-function-at-point): Replace function-at-point alias.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index a87097f884e..8f2875d6726 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1,7 +1,7 @@
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
@@ -705,7 +705,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
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
@@ -733,7 +733,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
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)))
@@ -2220,7 +2220,7 @@ Can be changed via `isearch-search-fun-function' for special needs."
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