texinfo update (Mon Oct 4 09:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.392
retrieving revision 1.393
diff -c -r1.392 -r1.393
*** ChangeLog   2 Oct 2004 12:38:14 -0000       1.392
--- ChangeLog   4 Oct 2004 13:05:49 -0000       1.393
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-10-04  Karl Berry  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (cm_value): increment and restore
+               input_text_offset before execute_string on the value,
+               so cm_xref doesn't complain about missing punctuation.
+       From: Sergey Poznyakoff <address@hidden>,
+       04 Oct 2004 15:04:33 +0300.
+ 
  2004-10-01  Karl Berry  <address@hidden>
  
        * lib/Makefile.am (libtxi_a_SOURCES): add getopt_.h.
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** makeinfo/makeinfo.c 30 Aug 2004 22:11:39 -0000      1.66
--- makeinfo/makeinfo.c 4 Oct 2004 13:05:49 -0000       1.67
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.66 2004/08/30 22:11:39 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.67 2004/10/04 13:05:49 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 3652,3658 ****
           among other things.  */
  
        if (value)
!         execute_string ("%s", value);
        else
        {
            warning (_("undefined flag: %s"), name);
--- 3652,3665 ----
           among other things.  */
  
        if (value)
!       {
!         /* We need to get past the closing brace since the value may
!            expand to a context-sensitive macro (e.g. @xref) and produce
!            spurious warnings */
!         input_text_offset++; 
!         execute_string ("%s", value);
!         input_text_offset--;
!       }
        else
        {
            warning (_("undefined flag: %s"), name);
P ChangeLog
P makeinfo/makeinfo.c