Mercurial > emacs
changeset 110365:2e5cec185a69
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 14 Sep 2010 03:37:07 +0000 |
| parents | 6358797a47cd (current diff) 5c41eafe6021 (diff) |
| children | ea52aa6ade3e |
| files | |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Sep 13 22:40:16 2010 +0000 +++ b/configure Tue Sep 14 03:37:07 2010 +0000 @@ -11180,6 +11180,7 @@ fi if test "${HAVE_LIBXML2}" = "yes"; then + LIBS="$LIBXML2_LIBS $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 $as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then :
--- a/src/ChangeLog Mon Sep 13 22:40:16 2010 +0000 +++ b/src/ChangeLog Tue Sep 14 03:37:07 2010 +0000 @@ -1,3 +1,8 @@ +2010-09-14 Leo <sdl.web@gmail.com> (tiny change) + + * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the + parameters for the doc string. + 2010-09-12 Lars Magne Ingebrigtsen <larsi@gnus.org> * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
--- a/src/xml.c Mon Sep 13 22:40:16 2010 +0000 +++ b/src/xml.c Tue Sep 14 03:37:07 2010 +0000 @@ -112,7 +112,8 @@ 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) + (string, base_url) + Lisp_Object string, base_url; { return parse_buffer (string, base_url, 1); } @@ -122,7 +123,8 @@ 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) + (string, base_url) + Lisp_Object string, base_url; { return parse_buffer (string, base_url, 0); }