texinfo update (Thu Jan 31 12:53:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- ChangeLog   30 Jan 2008 19:40:12 -0000      1.809
+++ ChangeLog   31 Jan 2008 17:46:22 -0000      1.810
@@ -1,3 +1,8 @@
+2008-01-31  Karl Berry  <address@hidden>
+
+       * makeinfo/makeinfo.c (convert_from_loaded_file): move
+       xml_begin_document to after we are sure the output file is open.
+
 2008-01-30  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi, doc/info-stnd.texi (Back-Cover Text): new
@@ -7511,7 +7516,7 @@
        * version 4.6.
 
 
-Copyright 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- makeinfo/makeinfo.c 10 Dec 2007 00:55:10 -0000      1.114
+++ makeinfo/makeinfo.c 31 Jan 2008 17:46:22 -0000      1.115
@@ -1,8 +1,8 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.114 2007/12/10 00:55:10 karl Exp $
+   $Id: makeinfo.c,v 1.115 2008/01/31 17:46:22 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -1648,9 +1648,6 @@
 
   set_current_output_filename (real_output_filename);
   
-  if (xml)
-    xml_begin_document (filename_part (output_filename));
-
   if (verbose_mode)
     printf (_("Making %s file `%s' from `%s'.\n"),
             no_headers ? "text"
@@ -1665,6 +1662,9 @@
       goto finished;
     }
 
+  if (xml)
+    xml_begin_document (filename_part (output_filename));
+
   /* Make the displayable filename from output_filename.  Only the base
      portion of the filename need be displayed. */
   flush_output ();              /* in case there was no @bye */
P ChangeLog
P makeinfo/makeinfo.c