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 --git a/doc/misc/url.texi b/doc/misc/url.texi
index fe03234d111b9217d79d97f4b88244fa979491a6..097f626e71893aca4db457bb241bbd02362f58cd 100644 (file)
--- 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
 

diff --git a/src/fns.c b/src/fns.c
index 5217b068882c1c169e97115b0b8f4c58bb4f5f41..731f0a899a9415edfe8fe05f157c85246c63ed62 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -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,