diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-09-22 15:20:45 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-09-22 15:20:45 -0400 |
| commit | 9949231fb06aa4a2dfa536e9d5125a81424db3a7 (patch) | |
| tree | a2259e8489127b8685097a20a3fd3d7be222d9fe /lisp/url | |
| parent | 298dfce8ac018aca6f8f1a38d7199cc28bfaf7fd (diff) | |
| parent | fc5ebc3f497a152132407d57a14cce147d59d29c (diff) | |
| download | emacs-9949231fb06aa4a2dfa536e9d5125a81424db3a7.tar.gz | |
Merge from emacs-24
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 4 | ||||
| -rw-r--r-- | lisp/url/url.el | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 9554c6e519c..b99f57cfbfd 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -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 diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 608a865be7b..cba4c6fbc02 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -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). diff --git a/lisp/url/url.el b/lisp/url/url.el index 620593a9a81..4594ab6a7f7 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -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). |