From: Roland McGrath <roland@gnu.org>
Date: Sat, 3 Jul 1993 06:58:05 +0000 (+0000)
Subject: (Frename_file): After prompting for ok-if-already-exists, pass only nil or
X-Git-Tag: emacs-19.34~11888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d093c3ac08ef48f862971dd9b1f35f72c6228976;p=emacs.git

(Frename_file): After prompting for ok-if-already-exists, pass only nil or
t to copy-file, never an integer.
---

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