diff lisp/isearch.el @ 83383:2a679c81f552

Merged from [e-mail]--gnu-2005 (patch 118-132, 551-577) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-551 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-552 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-553 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-554 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-555 Remove CVS keywords from newsticker files * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-556 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-557 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-558 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-559 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-560 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-561 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-562 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-563 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-564 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-565 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-566 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-567 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-568 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-569 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-570 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-571 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-572 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-573 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-574 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-575 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-576 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-577 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-118 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-119 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-120 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-121 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-122 Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-123 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-124 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-125 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-126 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-127 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-128 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-129 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-130 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-131 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-132 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-423

--- a/lisp/isearch.el	Mon Sep 19 21:25:51 2005 +0000
+++ b/lisp/isearch.el	Sun Oct 09 20:00:17 2005 +0000
@@ -219,7 +219,8 @@
      (:background "magenta4" :foreground "cyan1"))
     (t (:inverse-video t)))
   "Face for highlighting Isearch matches."
-  :group 'isearch)
+  :group 'isearch
+  :group 'basic-faces)
 (defvar isearch 'isearch)
 
 (defcustom isearch-lazy-highlight t
@@ -289,7 +290,8 @@
      (:background "turquoise3"))
     (t (:underline t)))
   "Face for lazy highlighting of matches other than the current one."
-  :group 'lazy-highlight)
+  :group 'lazy-highlight
+  :group 'basic-faces)
 (put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
 (defvar lazy-highlight-face 'lazy-highlight)
 (define-obsolete-variable-alias 'isearch-lazy-highlight-face
@@ -533,6 +535,9 @@
 \\[isearch-abort] when search is successful aborts and moves point to\
  starting point.
 
+If you try to exit with the search string still empty, it invokes
+ nonincremental search.
+
 Type \\[isearch-query-replace] to start `query-replace' with string to\
  replace from last search string.
 Type \\[isearch-query-replace-regexp] to start `query-replace-regexp'\
@@ -579,7 +584,7 @@
 In regexp incremental searches, a space or spaces normally matches
 any whitespace (the variable `search-whitespace-regexp' controls
 precisely what that means).  If you want to search for a literal space
-and nothing else, enter `[ ]'."
+and nothing else, enter C-q SPC."
   (interactive "P\np")
   (isearch-mode t (null not-regexp) nil (not no-recursive-edit)))
 
@@ -1016,7 +1021,7 @@
 		;; read a key the normal way.
 		;; Word search does not apply (yet) to regexp searches,
 		;; no check is made here.
-		(message (isearch-message-prefix nil nil t))
+		(message "%s" (isearch-message-prefix nil nil t))
 		(if (memq (lookup-key isearch-mode-map (vector e))
 			  '(isearch-yank-word
 			    isearch-yank-word-or-char))