From 36881d164d73f53a1cbb390de8509506b14a2c89 Mon Sep 17 00:00:00 2001 From: HAMANO Kiyoto Date: Wed, 20 Jul 2011 22:05:02 +0200 Subject: [PATCH] * xml.c (parse_region): If a document contains only comments, return that, too. --- src/ChangeLog | 5 +++++ src/xml.c | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 86062435a5d..02819607fd9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-20 HAMANO Kiyoto + + * xml.c (parse_region): If a document contains only comments, + return that, too. + 2011-07-20 Lars Magne Ingebrigtsen * xml.c (make_dom): Return comments, too. diff --git a/src/xml.c b/src/xml.c index 6dd52638b7d..6d212b44059 100644 --- a/src/xml.c +++ b/src/xml.c @@ -125,9 +125,21 @@ 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 = Fnreverse (Fcons (r, result)); + xmlFreeDoc (doc); xmlCleanupParser (); } -- 2.39.5