procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak copy-file, rename-file doc

Browse source 
* src/fileio.c (Fcopy_file, Frename_file): Tweak the recent change
slightly, as NEWNAME is treated as a directory name depending only
on the contents of the NEWNAME string, and independently of
whether NEWNAME names a directory (i.e., whether the directory
exists) (Bug#29362).
This commit is contained in:
Paul Eggert 2017-11-25 13:04:30 -08:00
parent cfa2a944d4
commit dc7a97fb84
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/fileio.c
View file

@ -1826,10 +1826,8 @@ DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 6,
"fCopy file: \nGCopy %s to file: \np\nP", "fCopy file: \nGCopy %s to file: \np\nP",
doc: /* Copy FILE to NEWNAME. Both args must be strings. doc: /* Copy FILE to NEWNAME. Both args must be strings.
If NEWNAME is a directory name, copy FILE to a like-named file under If NEWNAME is a directory name, copy FILE to a like-named file under
NEWNAME. NEWNAME. For NEWNAME to be recognized as a directory name, it should
end in a slash.
For NEWNAME to be recognized as a directory name, it should name a
directory and end in a slash.
This function always sets the file modes of the output file to match This function always sets the file modes of the output file to match
the input file. the input file.
@ -2254,10 +2252,8 @@ DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,
doc: /* Rename FILE as NEWNAME. Both args must be strings. doc: /* Rename FILE as NEWNAME. Both args must be strings.
If file has names other than FILE, it continues to have those names. If file has names other than FILE, it continues to have those names.
If NEWNAME is a directory name, rename FILE to a like-named file under If NEWNAME is a directory name, rename FILE to a like-named file under
NEWNAME. NEWNAME. For NEWNAME to be recognized as a directory name, it should
end in a slash.
For NEWNAME to be recognized as a directory name, it should name a
directory and end in a slash.
Signal a `file-already-exists' error if a file NEWNAME already exists Signal a `file-already-exists' error if a file NEWNAME already exists
unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.