two makeinfo patches

This is a multi-part message in MIME format.
--------------020407020402010105010308
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

The first patches fixes a bug wherin a <para> was emitted inside
a URL.

The second patch make debugging easier.
-- 
	--Per Bothner
[email protected]   http://per.bothner.com/

--------------020407020402010105010308
Content-Type: text/x-patch;
 name="mkinfo.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="mkinfo.patch"

2005-03-31  Per Bothner  <[email protected]>

	* 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.

Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.75
diff -u -p -r1.75 makeinfo.c
--- makeinfo.c	14 Feb 2005 00:20:27 -0000	1.75
+++ makeinfo.c	1 Apr 2005 02:11:21 -0000
@@ -4038,6 +4038,7 @@ maybe_escaped_expansion (char *str, int 
   indented_fill = 0;
   no_indent = 1;
   escape_html = do_html_escape;
+  xml_no_para++;
 
   result = full_expansion (str, implicit_code);
 
@@ -4045,6 +4046,7 @@ maybe_escaped_expansion (char *str, int 
   indented_fill = saved_indented_fill;
   no_indent = saved_no_indent;
   escape_html = saved_escape_html;
+  xml_no_para--;
 
   return result;
 }
Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.55
diff -u -p -r1.55 xml.c
--- xml.c	14 Feb 2005 00:20:27 -0000	1.55
+++ xml.c	1 Apr 2005 02:11:22 -0000
@@ -33,6 +33,11 @@
 /* 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];

--------------020407020402010105010308
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Texinfo home page: http://www.gnu.org/software/texinfo/
[email protected]
http://ff0.org/mailman/listinfo/texinfo-pretest

--------------020407020402010105010308--