texinfo update (Fri Apr 1 16:52:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.484
retrieving revision 1.485
diff -c -r1.484 -r1.485
*** ChangeLog   31 Mar 2005 16:56:48 -0000      1.484
--- ChangeLog   1 Apr 2005 21:30:40 -0000       1.485
***************
*** 1,3 ****
--- 1,11 ----
+ 2005-03-31  Per Bothner  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (maybe_escaped_expansion): Don't start a new
+       para during string expansion.
+ 
+       * makeinfo/xml.c (xml_element_dummy): Dummy variable so that enum
+       names get emitted in debug symbols, which helps debugging.
+ 
  2005-03-31  ezra peisach <address@hidden>  (tiny change)
  
        (bug-texinfo mail 30 Mar 2005 16:40:24 -0500.)
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -c -r1.75 -r1.76
*** makeinfo/makeinfo.c 14 Feb 2005 00:20:27 -0000      1.75
--- makeinfo/makeinfo.c 1 Apr 2005 21:30:40 -0000       1.76
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.75 2005/02/14 00:20:27 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.76 2005/04/01 21:30:40 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
***************
*** 4038,4043 ****
--- 4038,4044 ----
    indented_fill = 0;
    no_indent = 1;
    escape_html = do_html_escape;
+   xml_no_para++;
  
    result = full_expansion (str, implicit_code);
  
***************
*** 4045,4050 ****
--- 4046,4052 ----
    indented_fill = saved_indented_fill;
    no_indent = saved_no_indent;
    escape_html = saved_escape_html;
+   xml_no_para--;
  
    return result;
  }
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** makeinfo/xml.c      14 Feb 2005 00:20:27 -0000      1.55
--- makeinfo/xml.c      1 Apr 2005 21:30:40 -0000       1.56
***************
*** 1,5 ****
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.55 2005/02/14 00:20:27 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.56 2005/04/01 21:30:40 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
***************
*** 33,38 ****
--- 33,43 ----
  /* Options */
  int xml_index_divisions = 1;
  
+ #if !__OPTIMIZE__
+ /* To make enum names available to debugger. */
+ static enum xml_element xml_element_dummy;
+ #endif
+ 
  typedef struct _element
  {
    char name[32];
P ChangeLog
P makeinfo/makeinfo.c
P makeinfo/xml.c