texinfo update (Sat Jul 3 09:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.351
retrieving revision 1.352
diff -c -r1.351 -r1.352
*** ChangeLog   27 Jun 2004 23:50:37 -0000      1.351
--- ChangeLog   3 Jul 2004 12:48:22 -0000       1.352
***************
*** 1,3 ****
--- 1,8 ----
+ 2004-07-02  Karl Berry  <address@hidden>
+ 
+       * makeinfo/makinfo.c (execute_string): don't worry about
+               mismatched multiline commands if executing_macro.
+ 
  2004-06-27  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex: Various doc fixes.
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -c -r1.60 -r1.61
*** makeinfo/makeinfo.c 6 Jun 2004 14:04:12 -0000       1.60
--- makeinfo/makeinfo.c 3 Jul 2004 12:48:22 -0000       1.61
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.60 2004/06/06 14:04:12 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.61 2004/07/03 12:48:22 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 3934,3940 ****
  
    /* If insertion stack level changes during execution, that means a multiline
       command is used inside braces or @section ... kind of commands.  */
!   if (insertion_level_at_start != insertion_level)
      {
        line_error (_("Multiline command %c%s used improperly"),
            COMMAND_PREFIX,
--- 3934,3940 ----
  
    /* If insertion stack level changes during execution, that means a multiline
       command is used inside braces or @section ... kind of commands.  */
!   if (insertion_level_at_start != insertion_level && !executing_macro)
      {
        line_error (_("Multiline command %c%s used improperly"),
            COMMAND_PREFIX,
P ChangeLog
P makeinfo/makeinfo.c