--- makeinfo.c.old	2004-10-05 18:17:21.000000000 +0200
+++ makeinfo.c	2004-10-05 18:18:03.000000000 +0200
@@ -3959,6 +3959,7 @@
 expansion (char *str, int implicit_code)
 {
   char *result;
+  extern int xml_in_para;
 
   /* Inhibit indentation and filling, so that extra newlines
      are not added to the expansion.  (This is undesirable if
@@ -3967,6 +3968,10 @@
   int saved_indented_fill = indented_fill;
   int saved_no_indent = no_indent;
   int saved_escape_html = escape_html;
+  int saved_xml_in_para;
+
+  if (xml)
+    saved_xml_in_para = xml_in_para;
 
   filling_enabled = 0;
   indented_fill = 0;
@@ -3980,6 +3985,9 @@
   no_indent = saved_no_indent;
   escape_html = saved_escape_html;
 
+  if (xml)
+    xml_in_para = saved_xml_in_para;
+
   return result;
 }