procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.

Browse source
This commit is contained in:
Lars Magne Ingebrigtsen 2010-09-12 19:16:25 +02:00
parent 5616cc54c5
commit 21fa8e37fd
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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.

8
src/xml.c
View file

@ -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);