* (html-parse-string &optional LISP-OBJECT STRING LISP-OBJECT BASE-URL)
@ 2010-09-13 23:33 Leo
2010-09-13 23:58 ` Lars Magne Ingebrigtsen
2010-09-14 7:48 ` Andreas Schwab
0 siblings, 2 replies; 4+ messages in thread
From: Leo @ 2010-09-13 23:33 UTC (permalink / raw)
To: emacs-devel
When I looked at the doc string of html-parse-string, it includes
LISP-OBJECT. Looks like the following trivial patch is needed.
diff --git a/src/xml.c b/src/xml.c
index c1098b1..1087e50 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -112,7 +112,8 @@ DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
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 @@ DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
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);
}
Leo
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: (html-parse-string &optional LISP-OBJECT STRING LISP-OBJECT BASE-URL)
2010-09-13 23:33 (html-parse-string &optional LISP-OBJECT STRING LISP-OBJECT BASE-URL) Leo
@ 2010-09-13 23:58 ` Lars Magne Ingebrigtsen
2010-09-14 7:48 ` Andreas Schwab
1 sibling, 0 replies; 4+ messages in thread
From: Lars Magne Ingebrigtsen @ 2010-09-13 23:58 UTC (permalink / raw)
To: emacs-devel
Leo <sdl.web@gmail.com> writes:
> When I looked at the doc string of html-parse-string, it includes
> LISP-OBJECT. Looks like the following trivial patch is needed.
Thanks; applied.
--
(domestic pets only, the antidote for overdose, milk.)
larsi@gnus.org * Lars Magne Ingebrigtsen
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: (html-parse-string &optional LISP-OBJECT STRING LISP-OBJECT BASE-URL)
2010-09-13 23:33 (html-parse-string &optional LISP-OBJECT STRING LISP-OBJECT BASE-URL) Leo
2010-09-13 23:58 ` Lars Magne Ingebrigtsen
@ 2010-09-14 7:48 ` Andreas Schwab
2010-09-14 7:54 ` Leo
1 sibling, 1 reply; 4+ messages in thread
From: Andreas Schwab @ 2010-09-14 7:48 UTC (permalink / raw)
To: Leo; +Cc: emacs-devel
Leo <sdl.web@gmail.com> writes:
> When I looked at the doc string of html-parse-string, it includes
> LISP-OBJECT. Looks like the following trivial patch is needed.
Your make-docfile is outdated.
> diff --git a/src/xml.c b/src/xml.c
> index c1098b1..1087e50 100644
> --- a/src/xml.c
> +++ b/src/xml.c
> @@ -112,7 +112,8 @@ DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
> 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;
This is wrong. We don't use obsolete old-style function definitions any
more.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: (html-parse-string &optional LISP-OBJECT STRING LISP-OBJECT BASE-URL)
2010-09-14 7:48 ` Andreas Schwab
@ 2010-09-14 7:54 ` Leo
0 siblings, 0 replies; 4+ messages in thread
From: Leo @ 2010-09-14 7:54 UTC (permalink / raw)
To: emacs-devel
On 2010-09-14 08:48 +0100, Andreas Schwab wrote:
>> When I looked at the doc string of html-parse-string, it includes
>> LISP-OBJECT. Looks like the following trivial patch is needed.
>
> Your make-docfile is outdated.
>
>> diff --git a/src/xml.c b/src/xml.c
>> index c1098b1..1087e50 100644
>> --- a/src/xml.c
>> +++ b/src/xml.c
>> @@ -112,7 +112,8 @@ DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
>> 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;
>
> This is wrong. We don't use obsolete old-style function definitions any
> more.
Sorry about that. Please revert the commit.
I saw that because I built the libxml2 patch with emacs-23 branch.
Leo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-14 7:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-13 23:33 (html-parse-string &optional LISP-OBJECT STRING LISP-OBJECT BASE-URL) Leo
2010-09-13 23:58 ` Lars Magne Ingebrigtsen
2010-09-14 7:48 ` Andreas Schwab
2010-09-14 7:54 ` Leo
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).