texinfo update (Thu Jan 24 20:53:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- ChangeLog   24 Jan 2008 22:55:45 -0000      1.807
+++ ChangeLog   25 Jan 2008 01:23:51 -0000      1.808
@@ -1,5 +1,9 @@
 2008-01-24  Karl Berry  <address@hidden>
 
+       * info/session.c (info_move_to_xref): must use fixed-string
+       searches for these Info keywords that contain *.
+       Report from Ben Asselstine, 29 Dec 2007 11:21:40 (et al.).
+
        * doc/info-stnd.texi (What is Info): that's C-x C-c to exit, not
        C-x C-x.  Report from Benno, 24 Jan 2008 00:40:04.
 
Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- info/session.c      17 Dec 2007 19:12:11 -0000      1.24
+++ info/session.c      25 Jan 2008 01:23:51 -0000      1.25
@@ -1,8 +1,8 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.24 2007/12/17 19:12:11 karl Exp $
+   $Id: session.c,v 1.25 2008/01/25 01:23:51 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2007 Free Software Foundation, Inc.
+   2004, 2007, 2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -4367,6 +4367,10 @@
   long placement = -1;
   long start = 0;
   NODE *node = window->node;
+  int save_use_regex = use_regex;
+
+  /* Most of our keywords contain * characters; don't use regexes.  */
+  use_regex = 0;
 
   if (dir < 0)
     start = node->nodelen;
@@ -4403,6 +4407,7 @@
   if (firstmenu == -1 && firstxref == -1)
     {
       info_error ((char *) msg_no_xref_node, NULL, NULL);
+      use_regex = save_use_regex;
       return cursor_movement_scrolls_p;
     }
 
@@ -4430,6 +4435,9 @@
           (INFO_MENU_ENTRY_LABEL, node, nextmenu + dir, (WINDOW *)NULL, dir, 
0);
     }
 
+  /* No more searches, back to whatever the user wanted.  */
+  use_regex = save_use_regex;
+
   /* If there is both a next menu entry, and a next xref entry, choose the
      one which occurs first.  Otherwise, select the one which actually
      appears in this node following point. */
P ChangeLog
P info/session.c