[Emacs-diffs] /srv/bzr/emacs/trunk r101416: * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101416
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2010-09-12 19:16:25 +0200
message:
  * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
modified:
  src/ChangeLog
  src/xml.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-12 14:35:37 +0000
+++ b/src/ChangeLog     2010-09-12 17:16:25 +0000
@@ -1,3 +1,7 @@
+2010-09-12  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
+
 2010-09-12  Stefan Monnier  <address@hidden>
 
        * fns.c (Fy_or_n_p): Move to lisp/subr.el.

=== modified file 'src/xml.c'
--- a/src/xml.c 2010-09-10 17:45:22 +0000
+++ b/src/xml.c 2010-09-12 17:16:25 +0000
@@ -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);