summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2013-12-20 18:12:17 +0800
committerLeo Liu <sdl.web@gmail.com>2013-12-20 18:12:17 +0800
commitd506bc1d20baf7ed991b01cede719791778a53c7 (patch)
treeff21534abba520f0bdf83a10fb331229874b93d6 /lisp/url
parentf5df4cebdb5e2edfddd8b8e16b1c237e2dd45855 (diff)
downloademacs-d506bc1d20baf7ed991b01cede719791778a53c7.tar.gz
* url/url.el (url-retrieve-synchronously): Add optional arg SILENT and
INHIBIT-COOKIES.
Diffstat (limited to 'lisp/url')
-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 @@
+2013-12-20 Leo Liu <sdl.web@gmail.com>
+
+ * url.el (url-retrieve-synchronously): Add optional arg SILENT and
+ INHIBIT-COOKIES.
+
2013-09-29 Leo Liu <sdl.web@gmail.com>
* 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."
buffer))
;;;###autoload
-(defun url-retrieve-synchronously (url)
+(defun url-retrieve-synchronously (url &optional silent inhibit-cookies)
"Retrieve URL synchronously.
Return the buffer containing the data, or nil if there are no data
associated 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."
(url-retrieve url (lambda (&rest ignored)
(url-debug 'retrieval "Synchronous fetching done (%S)" (current-buffer))
(setq retrieval-done t
- asynch-buffer (current-buffer)))))
+ asynch-buffer (current-buffer)))
+ nil silent inhibit-cookies))
(if (null asynch-buffer)
;; We do not need to do anything, it was a mailto or something
;; similar that takes processing completely outside of the URL