aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-09-19 05:55:43 +0400
committerDmitry Gutov2014-09-19 05:55:43 +0400
commit35ee96fdcba8a223013759cc0f81bf146f3d47e3 (patch)
tree0e3b5228f7ec0456a160080eac6ce725c2e5ae0d
parent3a449b759c008c5c2ffa4524f09d8d90e1c764d4 (diff)
downloademacs-35ee96fdcba8a223013759cc0f81bf146f3d47e3.tar.gz
emacs-35ee96fdcba8a223013759cc0f81bf146f3d47e3.zip
Clarify url-http and url-retrieve-internal docstrings
* lisp/url/url-http.el (url-http): Same. * lisp/url/url.el (url-retrieve-internal): Clarify the docstring. Fixes: debbugs:18116
-rw-r--r--lisp/url/ChangeLog6
-rw-r--r--lisp/url/url-http.el4
-rw-r--r--lisp/url/url.el4
3 files changed, 10 insertions, 4 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 4880bfea30b..dfaf6f8c529 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
12014-09-19 Dmitry <dgutov@yandex.ru>
2
3 * url.el (url-retrieve-internal): Clarify the docstring.
4
5 * url-http.el (url-http): Same. (Bug#18116)
6
12014-06-26 Leo Liu <sdl.web@gmail.com> 72014-06-26 Leo Liu <sdl.web@gmail.com>
2 8
3 * url-http.el (url-http-end-of-headers): Remove duplicate defvar. 9 * url-http.el (url-http-end-of-headers): Remove duplicate defvar.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index dcb86689ca9..b0a3b688a55 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1170,8 +1170,8 @@ the end of the document."
1170 "Retrieve URL via HTTP asynchronously. 1170 "Retrieve URL via HTTP asynchronously.
1171URL must be a parsed URL. See `url-generic-parse-url' for details. 1171URL must be a parsed URL. See `url-generic-parse-url' for details.
1172 1172
1173When retrieval is completed, execute the function CALLBACK, using 1173When retrieval is completed, execute the function CALLBACK, passing it
1174the arguments listed in CBARGS. The first element in CBARGS 1174an updated value of CBARGS as arguments. The first element in CBARGS
1175should be a plist describing what has happened so far during the 1175should be a plist describing what has happened so far during the
1176request, as described in the docstring of `url-retrieve' (if in 1176request, as described in the docstring of `url-retrieve' (if in
1177doubt, specify nil). 1177doubt, specify nil).
diff --git a/lisp/url/url.el b/lisp/url/url.el
index cbbcfd4f18b..ca18d718dcb 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -170,8 +170,8 @@ URL-encoded before it's used."
170(defun url-retrieve-internal (url callback cbargs &optional silent 170(defun url-retrieve-internal (url callback cbargs &optional silent
171 inhibit-cookies) 171 inhibit-cookies)
172 "Internal function; external interface is `url-retrieve'. 172 "Internal function; external interface is `url-retrieve'.
173CBARGS is the list of arguments that the callback function will 173The callback function will receive an updated value of CBARGS as
174receive; its first element should be a plist specifying what has 174arguments; its first element should be a plist specifying what has
175happened so far during the request, as described in the docstring 175happened so far during the request, as described in the docstring
176of `url-retrieve' (if in doubt, specify nil). 176of `url-retrieve' (if in doubt, specify nil).
177 177