Commit 3c2317e8 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen
Browse files

Return CDATA sections (like <style>foo</style>) as text nodes.

Also ignore blank HTML nodes.
parent ce327e48
2010-12-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* xml.c (parse_region): Ignore blank HTML nodes.
(make_dom): Return CDATA sections (like <style>foo</style>) as
text nodes.
2010-12-06 Stefan Monnier <monnier@iro.umontreal.ca>
 
* lread.c (read1): Allow newstyle unquote outside of backquote.
......
......@@ -62,7 +62,7 @@ Lisp_Object make_dom (xmlNode *node)
return Fnreverse (result);
}
else if (node->type == XML_TEXT_NODE)
else if (node->type == XML_TEXT_NODE || node->type == XML_CDATA_SECTION_NODE)
{
if (node->content)
return build_string (node->content);
......@@ -105,7 +105,8 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
doc = htmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
bytes, burl, "utf-8",
HTML_PARSE_RECOVER|HTML_PARSE_NONET|
HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR);
HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR|
HTML_PARSE_NOBLANKS);
else
doc = xmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
bytes, burl, "utf-8",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment