[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 595195a 7/9: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 595195a 7/9: Merge from origin/emacs-25 |
Date: |
Mon, 02 May 2016 01:19:47 +0000 |
branch: master
commit 595195a10e5dd568bf249f5fb6778ae3d7037cd5
Merge: d6ec146 d8affa3
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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
---
doc/misc/url.texi | 7 ++++---
src/fns.c | 7 +------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index fe03234..097f626 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 address@hidden, don't do any messaging while
-retrieving. If @var{inhibit-cookies} is address@hidden, refuse to
-store cookies. If @var{timeout} is passed, it should be a number that
+If the optional argument @var{silent} is address@hidden, progress
+messages are suppressed. If the optional argument @var{no-cookies} is
address@hidden, cookies are not stored or sent. If the optional
+argument @var{timeout} is address@hidden, 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 5217b06..731f0a8 100644
--- 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,
- [Emacs-diffs] master updated (309cefe -> 3354582), Paul Eggert, 2016/05/01
- [Emacs-diffs] master 07fafe1 4/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master a8da4d0 3/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master ce92397 2/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master b57c174 1/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master 198ce5b 8/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master d6ec146 6/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master 595195a 7/9: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master 3354582 9/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01
- [Emacs-diffs] master c3ed7ce 5/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/01