From 586b21393fb1073a91533c25339c4560b0d9e02e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 1 May 2016 18:24:51 +0300 Subject: [PATCH 1/3] * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411) --- lisp/url/url.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/url/url.el b/lisp/url/url.el index 4837ba07f7e..91adada5e85 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -225,7 +225,10 @@ URL-encoded before it's used." "Retrieve URL synchronously. Return the buffer containing the data, or nil if there are no data associated with it (the case for dired, info, or mailto URLs that need -no further processing). URL is either a string or a parsed URL." +no further processing). URL is either a string or a parsed URL. +If SILENT is non-nil, don't display progress reports and similar messages. +If INHIBIT-COOKIES is non-nil, cookies will neither be stored nor sent +to the server." (url-do-setup) (let ((retrieval-done nil) From d38d2a845a8e44443e8d995c0ba79211e6934400 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 1 May 2016 18:28:48 +0300 Subject: [PATCH 2/3] Fix documentation of 'url-retrieve-synchronously' * doc/misc/url.texi (Retrieving URLs): Update argument list of 'url-retrieve-synchronously'. (Bug#23411) --- doc/misc/url.texi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/misc/url.texi b/doc/misc/url.texi index c46859968a2..a3c6b88ea05 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -289,11 +289,15 @@ string or a parsed URL structure. If it is a string, that string is passed through @code{url-encode-url} before using it, to ensure that it is properly URI-encoded (@pxref{URI Encoding}). -@defun url-retrieve-synchronously url +@defun url-retrieve-synchronously url silent no-cookies This function synchronously retrieves the data specified by @var{url}, and returns a buffer containing the data. The return value is @code{nil} if there is no data associated with the URL (as is the case for @code{dired}, @code{info}, and @code{mailto} URLs). + +If the optional argument @var{silent} is non-@code{nil}, progress +messages are suppressed. If the optional argument @var{no-cookies} is +non-@code{nil}, cookies are not stored or sent. @end defun @defun url-retrieve url callback &optional cbargs silent no-cookies From d8affa3dc5267c5da120ac09e14a81e0afed8fe8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 May 2016 09:00:08 -0700 Subject: [PATCH 3/3] =?UTF-8?q?Use=20=E2=80=98T=20*restrict=E2=80=99=20pro?= =?UTF-8?q?to,=20not=20=E2=80=98T[restrict]=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/fns.c (sort_vector_copy): Use a different way to attempt to work around GCC 3.0-and-earlier incompatibility with C99, one that does not have problems with modern non-GCC compilers. --- src/fns.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/fns.c b/src/fns.c index a65863ce0e8..9bbbb6d7b71 100644 --- a/src/fns.c +++ b/src/fns.c @@ -32,13 +32,8 @@ along with GNU Emacs. If not, see . */ #include "intervals.h" #include "window.h" -#if __GNUC__ >= 4 static void sort_vector_copy (Lisp_Object, ptrdiff_t, - Lisp_Object [restrict], Lisp_Object [restrict]); -#else -static void sort_vector_copy (Lisp_Object, ptrdiff_t, - Lisp_Object [], Lisp_Object []); -#endif + Lisp_Object *restrict, Lisp_Object *restrict); static bool internal_equal (Lisp_Object, Lisp_Object, int, bool, Lisp_Object); DEFUN ("identity", Fidentity, Sidentity, 1, 1, 0,