(Frename_file): After prompting for ok-if-already-exists, pass only nil or

t to copy-file, never an integer.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 41838f0937e..fe4deb1fd32 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1767,7 +1767,10 @@ This is what happens in interactive use with M-x.")
     {
       if (errno == EXDEV)
         {
-          Fcopy_file (filename, newname, ok_if_already_exists, Qt);
+          Fcopy_file (filename, newname,
+                      /* We have already prompted if it was an integer,
+                         so don't have copy-file prompt again.  */
+                      NILP (ok_if_already_exists) ? Qnil : Qt, Qt);
           Fdelete_file (filename);
         }
       else