summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2006-08-25 20:44:49 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2006-08-25 20:44:49 +0000
commitd0f891a742ddf5104188a26b9e02211735b9d5a5 (patch)
tree4a95c2c9bd00432c96e7f4bc8b0446d6786b93cd /lisp/url
parent7167d4092a9bc6e07a69ae3de4de3da7b138b688 (diff)
downloademacs-d0f891a742ddf5104188a26b9e02211735b9d5a5.tar.gz
(url-file-local-copy): Tell url-copy-file that the dest file will already exist.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-handlers.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2bbe6085be4..e4b54f9fc92 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-25 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * url-handlers.el (url-file-local-copy): Tell url-copy-file that the
+ dest file will already exist.
+
2006-07-31 Stefan Monnier <monnier@iro.umontreal.ca>
* url-util.el (url-hexify-string): Only utf-8 encode if it's
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 6c6d85a1e03..97d10003620 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -213,7 +213,7 @@ A prefix arg makes KEEP-TIME non-nil."
Returns the name of the local copy, or nil, if FILE is directly
accessible."
(let ((filename (make-temp-file "url")))
- (url-copy-file url filename)
+ (url-copy-file url filename 'ok-if-already-exists)
filename))
(defun url-insert (buffer &optional beg end)