From: Stefan Monnier Date: Fri, 25 Aug 2006 20:44:49 +0000 (+0000) Subject: (url-file-local-copy): Tell url-copy-file that the dest file will already exist. X-Git-Tag: emacs-pretest-22.0.90~883 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0f891a742ddf5104188a26b9e02211735b9d5a5;p=emacs.git (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 2bbe6085be4..e4b54f9fc92 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2006-08-25 Stefan Monnier + + * url-handlers.el (url-file-local-copy): Tell url-copy-file that the + dest file will already exist. + 2006-07-31 Stefan Monnier * 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) diff --git a/src/ChangeLog b/src/ChangeLog index bcb576f1fa0..e55a8a8b9e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -868,8 +868,8 @@ 2006-06-14 Chong Yidong - * 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 @@ -940,8 +940,8 @@ 2006-06-06 YAMAMOTO Mitsuharu - * 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