Commit a9d14e54 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(Fcopy_file): If NEWNAME is a directory copy FILE there.

parent 7bdb67b2
......@@ -2287,6 +2287,7 @@ barf_or_query_if_file_exists (absname, querystring, interactive, statptr, quick)
DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 4,
"fCopy file: \nFCopy %s to file: \np\nP",
"Copy FILE to NEWNAME. Both args must be strings.\n\
If NEWNAME names a directory, copy FILE there.\n\
Signals a `file-already-exists' error if file NEWNAME already exists,\n\
unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.\n\
A number as third arg means request confirmation if NEWNAME already exists.\n\
......@@ -2311,8 +2312,12 @@ A prefix arg makes KEEP-TIME non-nil.")
CHECK_STRING (file, 0);
CHECK_STRING (newname, 1);
if (!NILP (Ffile_directory_p (newname)))
newname = Fexpand_file_name (file, newname);
else
newname = Fexpand_file_name (newname, Qnil);
file = Fexpand_file_name (file, Qnil);
newname = Fexpand_file_name (newname, Qnil);
/* If the input file name has special constructs in it,
call the corresponding file handler. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment