procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xml.c (parse_string): Renamed to parse_string(), since that's

Browse source 
what it does.
(parse_string): Return nil when the document can't be parsed.
This commit is contained in:
Lars Magne Ingebrigtsen 2010-09-14 20:37:26 +02:00
parent 5e2a84e30d
commit c97c655f5f
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2010-09-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
* xml.c (parse_string): Renamed to parse_string(), since that's
what it does.
(parse_string): Return nil when the document can't be parsed.
2010-09-14 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (get_current_vm_state): New function.

8
src/xml.c
View file

@ -69,11 +69,11 @@ Lisp_Object make_dom (xmlNode *node)
}
static Lisp_Object
parse_buffer (Lisp_Object string, Lisp_Object base_url, int htmlp)
parse_string (Lisp_Object string, Lisp_Object base_url, int htmlp)
{
xmlDoc *doc;
xmlNode *node;
Lisp_Object result;
Lisp_Object result = Qnil;
int ibeg, iend;
char *burl = "";
@ -114,7 +114,7 @@ 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);
return parse_string (string, base_url, 1);
}
DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
@ -124,7 +124,7 @@ 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);
return parse_string (string, base_url, 0);
}