mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24

Browse source
This commit is contained in:
Stefan Monnier 2014-09-22 15:20:45 -04:00
commit 9949231fb0
20 changed files with 342 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/url/ChangeLog
View file

@ -1,3 +1,9 @@
2014-09-22 Dmitry Gutov <dgutov@yandex.ru>
* url.el (url-retrieve-internal): Clarify the docstring.
* url-http.el (url-http): Same. (Bug#18116)
2014-08-07 Reuben Thomas <rrt@sc3d.org>
* url-handlers.el: Remove a comment about VMS, which we no longer

4
lisp/url/url-http.el
View file

@ -1171,8 +1171,8 @@ the end of the document."
"Retrieve URL via HTTP asynchronously.
URL must be a parsed URL. See `url-generic-parse-url' for details.
When retrieval is completed, execute the function CALLBACK, using
the arguments listed in CBARGS. The first element in CBARGS
When retrieval is completed, execute the function CALLBACK, passing it
an updated value of CBARGS as arguments. The first element in CBARGS
should be a plist describing what has happened so far during the
request, as described in the docstring of `url-retrieve' (if in
doubt, specify nil).

4
lisp/url/url.el
View file

@ -170,8 +170,8 @@ URL-encoded before it's used."
(defun url-retrieve-internal (url callback cbargs &optional silent
inhibit-cookies)
"Internal function; external interface is `url-retrieve'.
CBARGS is the list of arguments that the callback function will
receive; its first element should be a plist specifying what has
The callback function will receive an updated value of CBARGS as
arguments; its first element should be a plist specifying what has
happened so far during the request, as described in the docstring
of `url-retrieve' (if in doubt, specify nil).