(url-file-local-copy): Tell url-copy-file that the dest file will already exist.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2bbe6085be40c84a28dd924fac5cf8e4b2ebaff9..e4b54f9fc92a8540c89e5dfbfe3da567b7b249e7 100644 (file)
--- 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 6c6d85a1e03075960fa8f11b7e6c994a5aac03b2..97d10003620455d3a1c5ba1721c5333e2bf8bc05 100644 (file)
--- 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)

diff --git a/src/ChangeLog b/src/ChangeLog
index bcb576f1fa0550b66cdc5af5be6b111ec476b331..e55a8a8b9e30a07384871bcd6db5160222962055 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -868,8 +868,8 @@
 
 2006-06-14  Chong Yidong  <cyd@stupidchicken.com>
 
-       * xdisp.c (back_to_previous_visible_line_start): Reset
-       it->continuation_lines_width.
+       * xdisp.c (back_to_previous_visible_line_start):
+       Reset it->continuation_lines_width.
 
 2006-06-14  Richard Stallman  <rms@gnu.org>
 
@@ -940,8 +940,8 @@
 
 2006-06-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-       * macterm.c [USE_MAC_TSM] (mac_handle_text_input_event): Exclude
-       0x7f from ASCII range.
+       * macterm.c [USE_MAC_TSM] (mac_handle_text_input_event):
+       Exclude 0x7f from ASCII range.
 
 2006-06-05  Jason Rumney  <jasonr@gnu.org>