texinfo update (Sat Oct 13 19:53:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- ChangeLog   8 Oct 2007 18:22:27 -0000       1.770
+++ ChangeLog   13 Oct 2007 23:44:34 -0000      1.771
@@ -1,3 +1,10 @@
+2007-10-13  Karl Berry  <address@hidden>
+
+       * makeinfo/cmds.c (cm_dircategory): use add_word instead of
+       insert_string so that the info file header ("This is ...") comes
+       after the INFO-DIR-SECTION magic.
+       Bug report from Katsumi Yamaoka, emacs-devel 10 Oct 2007 11:17:10.
+
 2007-10-08  Bruno Haible  <address@hidden>
 
        * makeinfo/lang.c (unicode_map): New variable.
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- makeinfo/cmds.c     26 Sep 2007 20:53:39 -0000      1.76
+++ makeinfo/cmds.c     13 Oct 2007 23:44:34 -0000      1.77
@@ -1,5 +1,5 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.76 2007/09/26 20:53:39 karl Exp $
+   $Id: cmds.c,v 1.77 2007/10/13 23:44:34 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
@@ -1631,10 +1631,14 @@
 
       if (!no_headers && !html)
         {
+          /* use add_* instead of insert_* because otherwise the
+             file header ("This is ...") will end up inside the
+             dir section markers.  */
           kill_self_indent (-1); /* make sure there's no indentation */
-          insert_string ("INFO-DIR-SECTION ");
-          insert_string (line);
-          insert ('\n');
+          cm_noindent (); /* make sure again */
+          add_word ("INFO-DIR-SECTION ");
+          add_word (line);
+          add_char ('\n');
         }
 
       free (line);
P ChangeLog
P makeinfo/cmds.c