1 files changed, 24 insertions, 3 deletions

diff --git a/src/xml.c b/src/xml.c
index 63041c96b24..a8a4d8122da 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -71,6 +71,14 @@ make_dom (xmlNode *node)
       else
         return Qnil;
     }
+  else if (node->type == XML_COMMENT_NODE)
+    {
+      if (node->content)
+        return list3 (intern ("comment"), Qnil,
+                      build_string ((char *) node->content));
+      else
+        return Qnil;
+    }
   else
     return Qnil;
 }
@@ -117,9 +125,22 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
 
   if (doc != NULL)
     {
-      node = xmlDocGetRootElement (doc);
-      if (node != NULL)
-        result = make_dom (node);
+      xmlNode *n = doc->children->next;
+      Lisp_Object r = Qnil;
+
+      while (n) {
+        if (r != Qnil)
+          result = Fcons (r, result);
+        r = make_dom (n);
+        n = n->next;
+      }
+
+      if (result == Qnil)
+        result = r;
+      else
+        result = Fcons (intern ("top"),
+                        Fcons (Qnil, Fnreverse (Fcons (r, result))));
+
       xmlFreeDoc (doc);
       xmlCleanupParser ();
     }