2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index fa6ce1945b1..7b38fb7ed11 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * url-handlers.el (url-copy-file): Add fifth arg for compatibility
+        with 2005-06-25 change to copy-file (Bug#4410).
+
 2009-09-13  Glenn Morris  <rgm@gnu.org>
 
         * url-file.el (url-file): Avoid assignment to free variable `filename'.
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index c06e841b2c8..2cf88e8f202 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -215,7 +215,8 @@ the arguments that would have been passed to OPERATION."
 
 ;; The actual implementation
 ;;;###autoload
-(defun url-copy-file (url newname &optional ok-if-already-exists keep-time)
+(defun url-copy-file (url newname &optional ok-if-already-exists
+                          keep-time preserve-uid-gid)
   "Copy URL to NEWNAME.  Both args must be strings.
 Signals a `file-already-exists' error if file NEWNAME already exists,
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
@@ -223,6 +224,7 @@ A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
 Fourth arg KEEP-TIME non-nil means give the new file the same
 last-modified time as the old one.  (This works on only some systems.)
+Fifth arg PRESERVE-UID-GID is ignored.
 A prefix arg makes KEEP-TIME non-nil."
   (if (and (file-exists-p newname)
            (not ok-if-already-exists))