Mercurial > emacs
changeset 110331:7363111f3713
* xml.c (Fxml_parse_string, Fxml_parse_string): Revert last
change. Don't make first argument optional. Doc fix.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Tue, 14 Sep 2010 09:53:39 +0200 |
| parents | b68d97301050 |
| children | 3b63737368e5 |
| files | src/ChangeLog src/xml.c |
| diffstat | 2 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Sep 14 06:01:14 2010 +0000 +++ b/src/ChangeLog Tue Sep 14 09:53:39 2010 +0200 @@ -1,3 +1,8 @@ +2010-09-14 Andreas Schwab <schwab@linux-m68k.org> + + * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last + change. Don't make first argument optional. Doc fix. + 2010-09-14 Leo <sdl.web@gmail.com> (tiny change) * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
--- a/src/xml.c Tue Sep 14 06:01:14 2010 +0000 +++ b/src/xml.c Tue Sep 14 09:53:39 2010 +0200 @@ -108,23 +108,21 @@ } 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. + 1, 2, 0, + doc: /* Parse 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.*/) - (string, base_url) - Lisp_Object string, base_url; +the HTML document. */) + (Lisp_Object string, Lisp_Object base_url) { return parse_buffer (string, base_url, 1); } 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. + 1, 2, 0, + doc: /* Parse 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.*/) - (string, base_url) - Lisp_Object string, base_url; +the XML document. */) + (Lisp_Object string, Lisp_Object base_url) { return parse_buffer (string, base_url, 0); }