texinfo update (Sun Feb 17 14:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- ChangeLog   16 Feb 2008 22:58:27 -0000      1.819
+++ ChangeLog   17 Feb 2008 19:07:58 -0000      1.820
@@ -1,3 +1,12 @@
+2008-02-17  Karl Berry  <address@hidden>
+
+       * makeinfo/makeinfo.c: typos in comments.
+       
+       * makeinfo/cmds.c (cm_direntry): call close_single_paragraph,
+       instead of add_char('\n'), or the INFO-DIR-SECTION lines from two
+       consecutive @dircategory's are munged together.
+       Bug report from Ralf Angeli, 16 Feb 2008 18:59:42.
+
 2008-02-16  Karl Berry  <address@hidden>
 
        * util/texi2dvi: path_sep is ; on mingw as well as cygwin.
Index: makeinfo/.gdbinit
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/.gdbinit,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- makeinfo/.gdbinit   17 Feb 2008 15:08:09 -0000      1.42
+++ makeinfo/.gdbinit   17 Feb 2008 19:07:58 -0000      1.43
@@ -275,3 +275,6 @@
 
 # double ' after @cite
 set args -o - $ttests/cite.tex
+
+# conglomerated INFO-DIR-SECTIONs
+set args -o - $ttests/dircat2.tex
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- makeinfo/cmds.c     16 Feb 2008 19:19:37 -0000      1.81
+++ makeinfo/cmds.c     17 Feb 2008 19:07:58 -0000      1.82
@@ -1,5 +1,5 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.81 2008/02/16 19:19:37 karl Exp $
+   $Id: cmds.c,v 1.82 2008/02/17 19:07:58 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
    2007, 2008 Free Software Foundation, Inc.
@@ -1643,7 +1643,7 @@
           cm_noindent (); /* make sure again */
           add_word ("INFO-DIR-SECTION ");
           add_word (line);
-          add_char ('\n');
+          close_single_paragraph ();  /* newline */
         }
 
       free (line);
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- makeinfo/makeinfo.c 31 Jan 2008 17:46:22 -0000      1.115
+++ makeinfo/makeinfo.c 17 Feb 2008 19:07:58 -0000      1.116
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.115 2008/01/31 17:46:22 karl Exp $
+   $Id: makeinfo.c,v 1.116 2008/02/17 19:07:58 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
@@ -3102,7 +3102,7 @@
   int i;
 
   /* We don't need these newlines in XML and Docbook outputs for
-     paragraph seperation.  We have <para> element for that.  */
+     paragraph separation.  We have the <para> element for that.  */
   if (xml)
     return;
 
P ChangeLog
P makeinfo/.gdbinit
P makeinfo/cmds.c
P makeinfo/makeinfo.c