texinfo update (Thu Jun 3 12:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.346
retrieving revision 1.347
diff -c -r1.346 -r1.347
*** ChangeLog   17 May 2004 12:58:40 -0000      1.346
--- ChangeLog   3 Jun 2004 16:00:04 -0000       1.347
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-06-03  Karl Berry  <address@hidden>
+ 
+       * info/session.c (info_menu_digit): use menu, rather than entry, to
+       avoid seg fault on "0" (the last item),
+       since menu has already been checked.
+       From: Malcolm Rowe <address@hidden>,
+       02 Jun 2004 21:32:37 +0100.
+ 
  2004-05-17  Karl Berry  <address@hidden>
  
        * util/gendocs.sh, gendocs_template: use package.format.tar.gz
Index: info/session.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/session.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** info/session.c      11 Apr 2004 17:56:46 -0000      1.12
--- info/session.c      3 Jun 2004 15:58:51 -0000       1.13
***************
*** 1,5 ****
  /* session.c -- user windowing interface to Info.
!    $Id: session.c,v 1.12 2004/04/11 17:56:46 karl Exp $
  
     Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
     Free Software Foundation, Inc.
--- 1,5 ----
  /* session.c -- user windowing interface to Info.
!    $Id: session.c,v 1.13 2004/06/03 15:58:51 karl Exp $
  
     Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
     Free Software Foundation, Inc.
***************
*** 1944,1950 ****
  DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item"))
  {
    register int i, item;
!   register REFERENCE *entry = NULL, **menu;
  
    menu = info_menu_of_node (window->node);
  
--- 1944,1950 ----
  DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item"))
  {
    register int i, item;
!   register REFERENCE **menu;
  
    menu = info_menu_of_node (window->node);
  
***************
*** 1962,1968 ****
      for (i = 0; menu[i + 1]; i++);
    else
      {
!       for (i = 0; (entry = menu[i]); i++)
          if (i == item - 1)
            break;
      }
--- 1962,1968 ----
      for (i = 0; menu[i + 1]; i++);
    else
      {
!       for (i = 0; menu[i]; i++)
          if (i == item - 1)
            break;
      }
***************
*** 1970,1977 ****
    if (menu[i])
      {
        info_select_reference (window, menu[i]);
!       if (entry->line_number > 0)
!         info_next_line (window, entry->line_number - 1, key);
      }
    else
      info_error ((char *) _("There aren't %d items in this menu."),
--- 1970,1977 ----
    if (menu[i])
      {
        info_select_reference (window, menu[i]);
!       if (menu[i]->line_number > 0)
!         info_next_line (window, menu[i]->line_number - 1, key);
      }
    else
      info_error ((char *) _("There aren't %d items in this menu."),
P ChangeLog
P info/session.c