diff options
| author | Glenn Morris | 2012-02-10 09:22:09 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-02-10 09:22:09 -0800 |
| commit | a48ec60ca1e8df977b155e43e13199a7cb3e4685 (patch) | |
| tree | 8f0a710505faaf8c7341ac2582da3f5093e21961 /lisp | |
| parent | 578ad769a6626dca5735ed769b19f0d12933e260 (diff) | |
| download | emacs-a48ec60ca1e8df977b155e43e13199a7cb3e4685.tar.gz emacs-a48ec60ca1e8df977b155e43e13199a7cb3e4685.zip | |
Fix previous URL doc change
* lisp/url/url-queue.el (url-queue-retrieve): Fic previous doc fix.
* doc/misc/url.texi (Retrieving URLs): Update url-retrieve arguments.
Mention url-queue-retrieve.
* etc/NEWS: Related edit.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/url/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/url/url-queue.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 8f0cbcb2594..14aaa4bf113 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-02-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * url-queue.el (url-queue-retrieve): Fic previous doc fix. | ||
| 4 | |||
| 1 | 2012-02-10 Andreas Schwab <schwab@linux-m68k.org> | 5 | 2012-02-10 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 6 | ||
| 3 | * url-http.el (url-http-clean-headers): Return the number of | 7 | * url-http.el (url-http-clean-headers): Return the number of |
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el index 62e5e2f84d4..9dfee485918 100644 --- a/lisp/url/url-queue.el +++ b/lisp/url/url-queue.el | |||
| @@ -57,9 +57,9 @@ | |||
| 57 | (defun url-queue-retrieve (url callback &optional cbargs silent inhibit-cookies) | 57 | (defun url-queue-retrieve (url callback &optional cbargs silent inhibit-cookies) |
| 58 | "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished. | 58 | "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished. |
| 59 | This is like `url-retrieve' (which see for details of the arguments), | 59 | This is like `url-retrieve' (which see for details of the arguments), |
| 60 | but downloads in parallel. The variable `url-queue-parallel-processes' | 60 | but with limits on the degree of parallelism. The variable |
| 61 | sets the number of concurrent processes. The variable `url-queue-timeout' | 61 | `url-queue-parallel-processes' sets the number of concurrent processes. |
| 62 | sets a timeout." | 62 | The variable `url-queue-timeout' sets a timeout." |
| 63 | (setq url-queue | 63 | (setq url-queue |
| 64 | (append url-queue | 64 | (append url-queue |
| 65 | (list (make-url-queue :url url | 65 | (list (make-url-queue :url url |