Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-70
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-74

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9a93ac894ca..76d63cab844 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-02  Eli Zaretskii  <eliz@elta.co.il>
+
+        * fileio.c (Fcopy_file): If NEWNAME is a directory, expand the
+        basename of FILE relative to it, not FILE itself.
+
 2004-02-02  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (coding_restore_composition): Check invalid
diff --git a/src/fileio.c b/src/fileio.c
index c7959b3672d..73771591994 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2407,7 +2407,7 @@ Also set the file modes of the target file to match the source file.  */)
   CHECK_STRING (newname);
 
   if (!NILP (Ffile_directory_p (newname)))
-    newname = Fexpand_file_name (file, newname);
+    newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname);
   else
     newname = Fexpand_file_name (newname, Qnil);