aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-12-20 18:12:17 +0800
committerLeo Liu2013-12-20 18:12:17 +0800
commitd506bc1d20baf7ed991b01cede719791778a53c7 (patch)
treeff21534abba520f0bdf83a10fb331229874b93d6
parentf5df4cebdb5e2edfddd8b8e16b1c237e2dd45855 (diff)
downloademacs-d506bc1d20baf7ed991b01cede719791778a53c7.tar.gz
emacs-d506bc1d20baf7ed991b01cede719791778a53c7.zip
* url/url.el (url-retrieve-synchronously): Add optional arg SILENT and
INHIBIT-COOKIES.
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 0c7cd1ef64e..add3df79139 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
12013-12-20 Leo Liu <sdl.web@gmail.com>
2
3 * url.el (url-retrieve-synchronously): Add optional arg SILENT and
4 INHIBIT-COOKIES.
5
12013-09-29 Leo Liu <sdl.web@gmail.com> 62013-09-29 Leo Liu <sdl.web@gmail.com>
2 7
3 * url-util.el (url-pretty-length): Make obsolete and all uses 8 * url-util.el (url-pretty-length): Make obsolete and all uses
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 43e52ef25cf..a72b9c485b7 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -220,7 +220,7 @@ URL-encoded before it's used."
220 buffer)) 220 buffer))
221 221
222;;;###autoload 222;;;###autoload
223(defun url-retrieve-synchronously (url) 223(defun url-retrieve-synchronously (url &optional silent inhibit-cookies)
224 "Retrieve URL synchronously. 224 "Retrieve URL synchronously.
225Return the buffer containing the data, or nil if there are no data 225Return the buffer containing the data, or nil if there are no data
226associated with it (the case for dired, info, or mailto URLs that need 226associated with it (the case for dired, info, or mailto URLs that need
@@ -233,7 +233,8 @@ no further processing). URL is either a string or a parsed URL."
233 (url-retrieve url (lambda (&rest ignored) 233 (url-retrieve url (lambda (&rest ignored)
234 (url-debug 'retrieval "Synchronous fetching done (%S)" (current-buffer)) 234 (url-debug 'retrieval "Synchronous fetching done (%S)" (current-buffer))
235 (setq retrieval-done t 235 (setq retrieval-done t
236 asynch-buffer (current-buffer))))) 236 asynch-buffer (current-buffer)))
237 nil silent inhibit-cookies))
237 (if (null asynch-buffer) 238 (if (null asynch-buffer)
238 ;; We do not need to do anything, it was a mailto or something 239 ;; We do not need to do anything, it was a mailto or something
239 ;; similar that takes processing completely outside of the URL 240 ;; similar that takes processing completely outside of the URL