From 21fa8e37fd4df7d0f23ddbc7ec99c63578b23617 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 12 Sep 2010 19:16:25 +0200 Subject: [PATCH] * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL. --- src/ChangeLog | 4 ++++ src/xml.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c866258c6fe..87b54529f2e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-09-12 Lars Magne Ingebrigtsen + + * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL. + 2010-09-12 Stefan Monnier * fns.c (Fy_or_n_p): Move to lisp/subr.el. diff --git a/src/xml.c b/src/xml.c index a38795cc245..c1098b15a20 100644 --- a/src/xml.c +++ b/src/xml.c @@ -109,7 +109,9 @@ parse_buffer (Lisp_Object string, Lisp_Object base_url, int htmlp) DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string, 0, 2, 0, - doc: /* Parse the string as an HTML document and return the parse tree.*/) + doc: /* Parse the string as an HTML document and return the parse tree. +If BASE-URL is non-nil, it will be used to expand relative URLs in +the HTML document.*/) (Lisp_Object string, Lisp_Object base_url) { return parse_buffer (string, base_url, 1); @@ -117,7 +119,9 @@ DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string, DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string, 0, 2, 0, - doc: /* Parse the string as an XML document and return the parse tree.*/) + doc: /* Parse the string as an XML document and return the parse tree. +If BASE-URL is non-nil, it will be used to expand relative URLs in +the XML document.*/) (Lisp_Object string, Lisp_Object base_url) { return parse_buffer (string, base_url, 0); -- 2.11.4.GIT