diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:14:22 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:14:22 -0700 |
commit | 595195a10e5dd568bf249f5fb6778ae3d7037cd5 (patch) | |
tree | e973d6ef419ca9c48563b03587184e58ee0df5ed | |
parent | d6ec146ff9b66a1849932f90f3a5edade28d4579 (diff) | |
parent | d8affa3dc5267c5da120ac09e14a81e0afed8fe8 (diff) |
Merge from origin/emacs-25
d8affa3 Use ‘T *restrict’ proto, not ‘T[restrict]’
d38d2a8 Fix documentation of 'url-retrieve-synchronously'
586b213 * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bu...
# Conflicts:
# doc/misc/url.texi
# lisp/url/url.el
-rw-r--r-- | doc/misc/url.texi | 7 | ||||
-rw-r--r-- | src/fns.c | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/doc/misc/url.texi b/doc/misc/url.texi index fe03234d11..097f626e71 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -295,9 +295,10 @@ 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 @var{silent} is non-@code{nil}, don't do any messaging while -retrieving. If @var{inhibit-cookies} is non-@code{nil}, refuse to -store cookies. If @var{timeout} is passed, it should be a number that +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. If the optional +argument @var{timeout} is non-@code{nil}, it should be a number that says (in seconds) how long to wait for a response before giving up. @end defun @@ -34,13 +34,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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, |