aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-09-12 19:16:25 +0200
committerLars Magne Ingebrigtsen2010-09-12 19:16:25 +0200
commit21fa8e37fd4df7d0f23ddbc7ec99c63578b23617 (patch)
tree9d584a87b529c44b33e5716a7c0e5031ea2f502a
parent5616cc54c5d2f39259d5530c2e4419c4f35356eb (diff)
downloademacs-21fa8e37fd4df7d0f23ddbc7ec99c63578b23617.tar.gz
emacs-21fa8e37fd4df7d0f23ddbc7ec99c63578b23617.zip
* xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xml.c8
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 @@
12010-09-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
4
12010-09-12 Stefan Monnier <monnier@iro.umontreal.ca> 52010-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * fns.c (Fy_or_n_p): Move to lisp/subr.el. 7 * 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)
109 109
110DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string, 110DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
111 0, 2, 0, 111 0, 2, 0,
112 doc: /* Parse the string as an HTML document and return the parse tree.*/) 112 doc: /* Parse the string as an HTML document and return the parse tree.
113If BASE-URL is non-nil, it will be used to expand relative URLs in
114the HTML document.*/)
113 (Lisp_Object string, Lisp_Object base_url) 115 (Lisp_Object string, Lisp_Object base_url)
114{ 116{
115 return parse_buffer (string, base_url, 1); 117 return parse_buffer (string, base_url, 1);
@@ -117,7 +119,9 @@ DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
117 119
118DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string, 120DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
119 0, 2, 0, 121 0, 2, 0,
120 doc: /* Parse the string as an XML document and return the parse tree.*/) 122 doc: /* Parse the string as an XML document and return the parse tree.
123If BASE-URL is non-nil, it will be used to expand relative URLs in
124the XML document.*/)
121 (Lisp_Object string, Lisp_Object base_url) 125 (Lisp_Object string, Lisp_Object base_url)
122{ 126{
123 return parse_buffer (string, base_url, 0); 127 return parse_buffer (string, base_url, 0);