From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 28 Mar 1996 19:31:28 +0000 (+0000)
Subject: (Frename_file) [WINDOWSNT]: Remove conditional code.
X-Git-Tag: emacs-19.34~954
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7426ce61f62afa149dda06ba2552ebffd45fdc34;p=emacs.git

(Frename_file) [WINDOWSNT]: Remove conditional code.
---

diff --git a/src/fileio.c b/src/fileio.c
index 221ef67cd8e..3d0e30d1f4e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2109,21 +2109,11 @@ This is what happens in interactive use with M-x.")
 #ifndef BSD4_1
   if (0 > rename (XSTRING (file)->data, XSTRING (newname)->data))
 #else
-#ifdef WINDOWSNT
-  if (!MoveFile (XSTRING (file)->data, XSTRING (newname)->data))
-#else  /* not WINDOWSNT */
   if (0 > link (XSTRING (file)->data, XSTRING (newname)->data)
       || 0 > unlink (XSTRING (file)->data))
-#endif /* not WINDOWSNT */
 #endif
     {
-#ifdef  WINDOWSNT
-      /* Why two?  And why doesn't MS document what MoveFile will return?  */
-      if (GetLastError () == ERROR_FILE_EXISTS
-	  || GetLastError () == ERROR_ALREADY_EXISTS)
-#else  /* not WINDOWSNT */
       if (errno == EXDEV)
-#endif /* not WINDOWSNT */
 	{
 	  Fcopy_file (file, newname,
 		      /* We have already prompted if it was an integer,