aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-09-14 02:08:02 +0200
committerLars Magne Ingebrigtsen2010-09-14 02:08:02 +0200
commit26632d8d412f5cdd2034e125eafb38a9a6b99c2d (patch)
treefef2875cd3608bc11c3bf0a4f5be41301dc6e001 /src
parent7d5444bee60f9fde3d21e8266ff7bb760102cdf5 (diff)
downloademacs-26632d8d412f5cdd2034e125eafb38a9a6b99c2d.tar.gz
emacs-26632d8d412f5cdd2034e125eafb38a9a6b99c2d.zip
* xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the parameters
for the doc string. From Leo <sdl.web@gmail.com> (tiny change)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xml.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 87b54529f2e..f2dc725d045 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-09-14 Leo <sdl.web@gmail.com> (tiny change)
2
3 * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
4 parameters for the doc string.
5
12010-09-12 Lars Magne Ingebrigtsen <larsi@gnus.org> 62010-09-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL. 8 * xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
diff --git a/src/xml.c b/src/xml.c
index c1098b15a20..1087e504d5f 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -112,7 +112,8 @@ DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
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 113If BASE-URL is non-nil, it will be used to expand relative URLs in
114the HTML document.*/) 114the HTML document.*/)
115 (Lisp_Object string, Lisp_Object base_url) 115 (string, base_url)
116 Lisp_Object string, base_url;
116{ 117{
117 return parse_buffer (string, base_url, 1); 118 return parse_buffer (string, base_url, 1);
118} 119}
@@ -122,7 +123,8 @@ DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
122 doc: /* Parse the string as an XML document and return the parse tree. 123 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 124If BASE-URL is non-nil, it will be used to expand relative URLs in
124the XML document.*/) 125the XML document.*/)
125 (Lisp_Object string, Lisp_Object base_url) 126 (string, base_url)
127 Lisp_Object string, base_url;
126{ 128{
127 return parse_buffer (string, base_url, 0); 129 return parse_buffer (string, base_url, 0);
128} 130}