texinfo update (Fri Mar 7 21:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- ChangeLog   7 Mar 2008 18:23:05 -0000       1.851
+++ ChangeLog   8 Mar 2008 01:55:39 -0000       1.852
@@ -1,4 +1,9 @@
-2008-03-04  Joseph Myers  <address@hidden>  (tiny change)
+2008-03-07  Karl Berry  <address@hidden>
+
+       * info/infodoc.c (info_internal_help_text): reorder, regroup.
+       Suggestion from Benno Schulenberg, 06 Mar 2008 11:59:06.
+
+2008-03-07  Joseph Myers  <address@hidden>  (tiny change)
 
        * doc/texinfo.tex (\includezzz): Use \turnoffactive before
        expanding @value.
Index: gnulib/lib/alloca.in.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/alloca.in.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/alloca.in.h      26 Dec 2007 00:53:46 -0000      1.1
+++ gnulib/lib/alloca.in.h      8 Mar 2008 01:58:12 -0000       1.2
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2007 Free Software
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2008 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
@@ -42,6 +42,8 @@
 # elif defined _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
+# elif defined __DECC && defined __VMS
+#  define alloca __ALLOCA
 # else
 #  include <stddef.h>
 #  ifdef  __cplusplus
Index: gnulib/lib/getopt.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/getopt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/getopt.c 26 Nov 2007 19:12:40 -0000      1.4
+++ gnulib/lib/getopt.c 8 Mar 2008 01:58:13 -0000       1.5
@@ -2,7 +2,7 @@
    NOTE: getopt is now part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to address@hidden
    before changing it!
-   Copyright (C) 
1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006
+   Copyright (C) 
1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008
        Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -30,10 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef __VMS
-# include <unixlib.h>
-#endif
-
 #ifdef _LIBC
 # include <libintl.h>
 #else
Index: gnulib/m4/argz.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/argz.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/argz.m4   22 Feb 2008 14:41:42 -0000      1.1
+++ gnulib/m4/argz.m4   8 Mar 2008 01:58:13 -0000       1.2
@@ -25,8 +25,8 @@
 #endif])
 
 ARGZ_H=
-AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next \
-       argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
+AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
+       argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
 
 dnl if have system argz functions, allow forced use of 
 dnl libltdl-supplied implementation (and default to do so
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- info/infodoc.c      29 Feb 2008 22:20:52 -0000      1.24
+++ info/infodoc.c      8 Mar 2008 01:55:39 -0000       1.25
@@ -1,5 +1,5 @@
 /* infodoc.c -- functions which build documentation nodes.
-   $Id: infodoc.c,v 1.24 2008/02/29 22:20:52 karl Exp $
+   $Id: infodoc.c,v 1.25 2008/03/08 01:55:39 karl Exp $
 
    Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
    2007, 2008 Free Software Foundation, Inc.
@@ -55,15 +55,24 @@
   N_("\\%-10[beginning-of-node]  Go to the beginning of this node.\n"),
   N_("\\%-10[end-of-node]  Go to the end of this node.\n"),
   "\n",
-  N_("\\%-10[global-next-node]  Go to the next node in the document.\n"),
-  N_("\\%-10[global-prev-node]  Go to the previous node in the document.\n"),
   N_("\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"),
   N_("\\%-10[select-reference-this-line]  Follow the hypertext link under the 
cursor.\n"),
   N_("\\%-10[history-node]  Go back to the last node seen in this window.\n"),
+  "\n",
+  N_("\\%-10[global-prev-node]  Go to the previous node in the document.\n"),
+  N_("\\%-10[global-next-node]  Go to the next node in the document.\n"),
+  N_("\\%-10[prev-node]  Go to the previous node on this level.\n"),
+  N_("\\%-10[next-node]  Go to the next node on this level.\n"),
   N_("\\%-10[up-node]  Go up one level.\n"),
   N_("\\%-10[top-node]  Go to the top node of this document.\n"),
   N_("\\%-10[dir-node]  Go to the main `directory' node.\n"),
   "\n",
+  N_("1...9       Pick the first...ninth item in this node's menu.\n"),
+  N_("\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"),
+  N_("\\%-10[menu-item]  Pick a menu item specified by name.\n"),
+  N_("\\%-10[xref-item]  Follow a cross reference specified by name.\n"),
+  N_("\\%-10[goto-node]  Go to a node specified by name.\n"),
+  "\n",
   N_("\\%-10[search]  Search forward for a specified string.\n"),
   N_("\\%-10[search-previous]  Search for previous occurrence.\n"),
   N_("\\%-10[search-next]  Search for next occurrence.\n"),
@@ -71,13 +80,6 @@
               select the node referenced by the first entry found.\n"),
   N_("\\%-10[abort-key]  Cancel the current operation.\n"),
   "\n",
-  N_("1...9       Pick the first...ninth item in this node's menu.\n"),
-  N_("\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"),
-  N_("\\%-10[menu-item]  Pick a menu item specified by name.\n"),
-  N_("\\%-10[xref-item]  Follow a cross reference specified by name.\n"),
-  N_("\\%-10[goto-node]  Go to a node specified by name.\n"),
-  N_("\\%-10[next-node]  Go to the next node on this level.\n"),
-  N_("\\%-10[prev-node]  Go to the previous node on this level.\n"),
   NULL
 };
 
P ChangeLog
P gnulib/lib/alloca.in.h
P gnulib/lib/getopt.c
P gnulib/m4/argz.m4
P info/infodoc.c