Mercurial > emacs

comparison lisp/isearch.el @ 90224:2d92f5c9d6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 514-518) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 104-105) - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 26 Aug 2005 09:51:52 +0000
parents 890cc78a5a24 b66a53128ca5
children fa0da9b57058
comparison
equal deleted inserted replaced
90223:edf295560b5a 90224:2d92f5c9d6ae
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, 2000,
4 ;; 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. 4 ;; 2001, 2002, 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
1066 (isearch-search) 1066 (isearch-search)
1067 (isearch-update) 1067 (isearch-update)
1068 (if isearch-nonincremental 1068 (if isearch-nonincremental
1069 (progn 1069 (progn
1070 ;; (sit-for 1) ;; needed if isearch-done does: (message "") 1070 ;; (sit-for 1) ;; needed if isearch-done does: (message "")
1071 (isearch-done)))) 1071 (isearch-done)
1072 ;; The search done message is confusing when the string
1073 ;; is empty, so erase it.
1074 (if (equal isearch-string "")
1075 (message "")))))
1072 1076
1073 (quit ; handle abort-recursive-edit 1077 (quit ; handle abort-recursive-edit
1074 (isearch-abort) ;; outside of let to restore outside global values 1078 (isearch-abort) ;; outside of let to restore outside global values
1075 ))) 1079 )))
1076 1080
1141 (setq isearch-wrapped t) 1145 (setq isearch-wrapped t)
1142 (if isearch-wrap-function 1146 (if isearch-wrap-function
1143 (funcall isearch-wrap-function) 1147 (funcall isearch-wrap-function)
1144 (goto-char (if isearch-forward (point-min) (point-max))))))) 1148 (goto-char (if isearch-forward (point-min) (point-max)))))))
1145 ;; C-s in reverse or C-r in forward, change direction. 1149 ;; C-s in reverse or C-r in forward, change direction.
1146 (setq isearch-forward (not isearch-forward))) 1150 (setq isearch-forward (not isearch-forward)
1151 isearch-success t))
1147 1152
1148 (setq isearch-barrier (point)) ; For subsequent \| if regexp. 1153 (setq isearch-barrier (point)) ; For subsequent \| if regexp.
1149 1154
1150 (if (equal isearch-string "") 1155 (if (equal isearch-string "")
1151 (setq isearch-success t) 1156 (setq isearch-success t)