Mercurial > emacs
changeset 110315:5988195cbf4c
* xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> |
|---|---|
| date | Sun, 12 Sep 2010 19:16:25 +0200 |
| parents | 405e3949f580 |
| children | 14e479cda1d2 c98f769d9fcf |
| files | src/ChangeLog src/xml.c |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Sep 12 16:35:37 2010 +0200 +++ b/src/ChangeLog Sun Sep 12 19:16:25 2010 +0200 @@ -1,3 +1,7 @@ +2010-09-12 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL. + 2010-09-12 Stefan Monnier <monnier@iro.umontreal.ca> * fns.c (Fy_or_n_p): Move to lisp/subr.el.
--- a/src/xml.c Sun Sep 12 16:35:37 2010 +0200 +++ b/src/xml.c Sun Sep 12 19:16:25 2010 +0200 @@ -109,7 +109,9 @@ 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 ("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);