--- a/src/fileio.c	Mon Aug 13 09:03:47 2007 +0200
+++ b/src/fileio.c	Mon Aug 13 09:04:33 2007 +0200
@@ -1815,7 +1815,7 @@
 last-modified time as the old one.  (This works on only some systems.)
 A prefix arg makes KEEP-TIME non-nil.
 */
-       (filename, newname, ok_if_already_exists, keep_date))
+       (filename, newname, ok_if_already_exists, keep_time))
 {
   /* This function can GC */
   int ifd, ofd, n;
@@ -1843,7 +1843,7 @@
   {
     UNGCPRO;
     return call5 (handler, Qcopy_file, filename, newname,
-		  ok_if_already_exists, keep_date);
+		  ok_if_already_exists, keep_time);
   }
 
   /* When second argument is a directory, copy the file into it.
@@ -1944,7 +1944,7 @@
 
     if (input_file_statable_p)
     {
-      if (!NILP (keep_date))
+      if (!NILP (keep_time))
       {
         EMACS_TIME atime, mtime;
         EMACS_SET_SECS_USECS (atime, st.st_atime, 0);
@@ -2923,8 +2923,8 @@
   handler = Ffind_file_name_handler (filename, Qinsert_file_contents);
   if (!NILP (handler))
     {
-      val = call8 (handler, Qinsert_file_contents, filename,
-		   visit, beg, end, replace, codesys, used_codesys);
+      val = call6 (handler, Qinsert_file_contents, filename,
+		   visit, beg, end, replace);
       goto handled;
     }