texinfo update (Mon Feb 11 11:53:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- ChangeLog   10 Feb 2008 18:44:22 -0000      1.814
+++ ChangeLog   11 Feb 2008 16:47:12 -0000      1.815
@@ -1,8 +1,15 @@
+2008-02-11  Karl Berry  <address@hidden>
+
+       * info/session.c (incremental_search): if a regex search,
+       search every time through the loop, not only if the search
+       succeeded.
+       Bug report from Ralf Wildenhues, 8 Feb 2008 23:30:51.
+
 2008-02-10  Karl Berry  <address@hidden>
 
        * info/session.c (show_isearch_prompt): Start with "Regexp" if
        it's a regexp i-search.
-       Report from Ralf Wildenhues, 8 Feb 2008 23:30:51.
+       Suggestion from Ralf Wildenhues, 8 Feb 2008 23:30:51.
 
 2008-02-04  Karl Berry  <address@hidden>
 
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- NEWS        31 Jan 2008 18:33:27 -0000      1.160
+++ NEWS        11 Feb 2008 16:47:13 -0000      1.161
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.160 2008/01/31 18:33:27 karl Exp $
+$Id: NEWS,v 1.161 2008/02/11 16:47:13 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -48,8 +48,9 @@
   . New section in the Texinfo manual describing all this.
 
 * Info:
-  . regular expression searches are now the default; the new R command
-    toggles between regexp and literal-string searches.
+  . regular expression searches are now the default for both regular
+    and incremental searches.
+  . the new R command toggles between regexp and literal-string searches.
   . the precise line number specified in index entries is used if available.
   . --usage=info shows usage for standalone Info.
 
Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- info/session.c      10 Feb 2008 18:44:22 -0000      1.26
+++ info/session.c      11 Feb 2008 16:47:13 -0000      1.27
@@ -1,5 +1,5 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.26 2008/02/10 18:44:22 karl Exp $
+   $Id: session.c,v 1.27 2008/02/11 16:47:13 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2007, 2008 Free Software Foundation, Inc.
@@ -4238,9 +4238,19 @@
             break;
           }
       
-
-      if (search_result == 0)
-        {
+      /* Regex isearch means we better search again every time.  We
+         might have had a failed search for "\", for example, but now we
+         have "\.".  */
+      if (use_regex)
+        {
+          search_result = info_search_internal (isearch_string,
+                                                window, dir, case_sensitive);
+        }
+      else if (search_result == 0)
+        { /* I don't understand why we test for search_result being
+             zero; it means if the search failed we don't search again. 
+             Clearly the special check isn't applicable to regex search
+             anyway.  --karl, 11feb08.  */
           /* Check to see if the current search string is right here.  If
              we are looking at it, then don't bother calling the search
              function. */
P ChangeLog
P NEWS
P info/session.c