diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xml.c | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f2dc725d045..fa0dfc79c5b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/xml.c b/src/xml.c index 1087e504d5f..eb844950d05 100644 --- a/src/xml.c +++ b/src/xml.c @@ -108,23 +108,21 @@ 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. + 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); } |