[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101432: * xml.c (Fxml_parse_string,
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101432: * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last |
Date: |
Tue, 14 Sep 2010 09:53:39 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101432
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2010-09-14 09:53:39 +0200
message:
* xml.c (Fxml_parse_string, Fxml_parse_string): Revert last
change. Don't make first argument optional. Doc fix.
modified:
src/ChangeLog
src/xml.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-09-14 00:08:02 +0000
+++ b/src/ChangeLog 2010-09-14 07:53:39 +0000
@@ -1,3 +1,8 @@
+2010-09-14 Andreas Schwab <address@hidden>
+
+ * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last
+ change. Don't make first argument optional. Doc fix.
+
2010-09-14 Leo <address@hidden> (tiny change)
* xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
=== modified file 'src/xml.c'
--- a/src/xml.c 2010-09-14 00:08:02 +0000
+++ b/src/xml.c 2010-09-14 07:53:39 +0000
@@ -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);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101432: * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last,
Andreas Schwab <=