procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-25

Browse source 
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
This commit is contained in:
Paul Eggert 2016-05-01 18:14:22 -07:00
commit 595195a10e
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/misc/url.texi
View file

@ -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

7
src/fns.c
View file

@ -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,