texinfo update (Sun Jul 11 18:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.354
retrieving revision 1.355
diff -c -r1.354 -r1.355
*** ChangeLog   11 Jul 2004 13:24:59 -0000      1.354
--- ChangeLog   11 Jul 2004 21:51:16 -0000      1.355
***************
*** 1,5 ****
--- 1,12 ----
  2004-07-11  Karl Berry  <address@hidden>
  
+       * makeinfo/makeinfo.c (discard_until): leave input_text_offset at
+               the end of input_text if not found, not at one past the
+               end of input_text.  (Had erroneously put that in the block
+               only if an error was given.)  The result was a null byte
+               after macro expansions.  Report from Werner,
+               10 Jul 2004 15:36:40 +0200.             
+ 
        * makeinfo/node.c (split_file): fwrite Local Variables trailer so
                it actually gets into the output of the top-level info
                file; don't just insert_string.  
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -c -r1.61 -r1.62
*** makeinfo/makeinfo.c 3 Jul 2004 12:48:22 -0000       1.61
--- makeinfo/makeinfo.c 11 Jul 2004 21:51:18 -0000      1.62
***************
*** 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.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.62 2004/07/11 21:51:18 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 959,964 ****
--- 959,966 ----
  
    if (temp < 0)
      {
+       /* not found, move current position to end of string */
+       input_text_offset = input_text_length;
        if (strcmp (string, "\n") != 0)
          { /* Give a more descriptive feedback, if we are looking for 
address@hidden ''
               during macro execution.  That means someone used a multiline
***************
*** 969,986 ****
              line_error (_("Multiline command %c%s used improperly"), 
                  COMMAND_PREFIX, command);
            else
!             {
!               line_error (_("Expected `%s'"), string);
!               input_text_offset = input_text_length - strlen (string);
!             }
            free (end_block);
            return;
          }
      }
    else
!     input_text_offset = temp;
! 
!   input_text_offset += strlen (string);
  }
  
  /* Read characters from the file until we are at MATCH.
--- 971,984 ----
              line_error (_("Multiline command %c%s used improperly"), 
                  COMMAND_PREFIX, command);
            else
!             line_error (_("Expected `%s'"), string);
            free (end_block);
            return;
          }
      }
    else
!     /* found, move current position to after the found string */
!     input_text_offset = temp + strlen (string);
  }
  
  /* Read characters from the file until we are at MATCH.
P ChangeLog
P makeinfo/makeinfo.c