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

diff --cc doc/misc/url.texi
index fe03234d111b9217d79d97f4b88244fa979491a6,a3c6b88ea05d3f43f8c1d02318f1c49947c6e4a9..097f626e71893aca4db457bb241bbd02362f58cd
--- 1/doc/misc/url.texi
--- 2/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@@ -295,10 -295,9 +295,11 @@@ and returns a buffer containing the dat
  @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.
++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
  
  @defun url-retrieve url callback &optional cbargs silent no-cookies

diff --cc src/fns.c
Simple merge