From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 25 Nov 2017 21:04:30 +0000 (-0800)
Subject: Tweak copy-file, rename-file doc
X-Git-Tag: emacs-26.0.91~245
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc7a97fb846cbec16a198d95903ae7a85916da9d;p=emacs.git

Tweak copy-file, rename-file doc

* 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).
---

diff --git a/src/fileio.c b/src/fileio.c
index 9742cf1a258..c6b454bd9bd 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1826,10 +1826,8 @@ DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 6,
        "fCopy file: \nGCopy %s to file: \np\nP",
        doc: /* Copy FILE to NEWNAME.  Both args must be strings.
 If NEWNAME is a directory name, copy FILE to a like-named file under
-NEWNAME.
-
-For NEWNAME to be recognized as a directory name, it should name a
-directory and end in a slash.
+NEWNAME.  For NEWNAME to be recognized as a directory name, it should
+end in a slash.
 
 This function always sets the file modes of the output file to match
 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.
 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
-NEWNAME.
-
-For NEWNAME to be recognized as a directory name, it should name a
-directory and end in a slash.
+NEWNAME.  For NEWNAME to be recognized as a directory name, it should
+end in a slash.
 
 Signal a `file-already-exists' error if a file NEWNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.