From: Juri Linkov <juri@jurta.org>
Date: Wed, 23 Feb 2005 17:15:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~2145
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91c6626241581dd37ce938e6e45aabc16d252ed4;p=emacs.git

*** empty log message ***
---

diff --git a/etc/NEWS b/etc/NEWS
index b4c65a77a9a..3e71209d05c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -699,8 +699,10 @@ multiple files, and C-x d passes it to `dired'.
 *** A numeric prefix argument of `info' selects an Info buffer
 with the number appended to the *info* buffer name (e.g. "*info*<2>").
 
-*** Regexp isearch (C-M-s and C-M-r) can search through multiple nodes.
-Failed isearch wraps to the top/final node.
+*** isearch in Info uses Info-search and searches through multiple nodes.
+Failed isearch wraps to the top/final node.  The user option
+`Info-isearch-search' controls whether to use Info-search or the
+default isearch search function.
 
 *** New search commands: `Info-search-case-sensitively' (bound to S),
 `Info-search-backward', and `Info-search-next' which repeats the last
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ada6badaee8..01fe2d533a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-23  Juri Linkov  <juri@jurta.org>
+
+	* info.el (Info-isearch-search): New defcustom.
+	(Info-isearch-search): Call the default isearch function
+	when Info-isearch-search is nil.
+	(Info-isearch-wrap): Use variable Info-isearch-search.
+
 2005-02-22  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* cus-edit.el: Comment change.