Mercurial > emacs
diff lisp/isearch.el @ 90224:2d92f5c9d6ae
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 |
line wrap: on
line diff
--- a/lisp/isearch.el Fri Aug 05 10:57:36 2005 +0000 +++ b/lisp/isearch.el Fri Aug 26 09:51:52 2005 +0000 @@ -1,7 +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. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> ;; Maintainer: FSF @@ -1068,7 +1068,11 @@ (if isearch-nonincremental (progn ;; (sit-for 1) ;; needed if isearch-done does: (message "") - (isearch-done)))) + (isearch-done) + ;; The search done message is confusing when the string + ;; is empty, so erase it. + (if (equal isearch-string "") + (message ""))))) (quit ; handle abort-recursive-edit (isearch-abort) ;; outside of let to restore outside global values @@ -1143,7 +1147,8 @@ (funcall isearch-wrap-function) (goto-char (if isearch-forward (point-min) (point-max))))))) ;; C-s in reverse or C-r in forward, change direction. - (setq isearch-forward (not isearch-forward))) + (setq isearch-forward (not isearch-forward) + isearch-success t)) (setq isearch-barrier (point)) ; For subsequent \| if regexp.