* fileio.c (Frename_file): Fix last change (Bug#5487).

b242dbfc · Chong Yidong · ca0eb708 · b242dbfc · b242dbfc
Commit b242dbfc authored Jan 28, 2010 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/ChangeLog src/ChangeLog +2 -0

src/fileio.c src/fileio.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 2010-01-28  Chong Yidong  <cyd@stupidchicken.com>

+	* fileio.c (Frename_file): Fix last change (Bug#5487).
+
 	* m/mips.h: Remove DATA_START.  Suggested by Dan Nicolaescu.

 	* m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629).

--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2289,7 +2289,7 @@ This is what happens in interactive use with M-x.  */)
                                 NILP (ok_if_already_exists) ? Qnil : Qt);
          else
 #endif
-	  if (Ffile_directory_p (file))
+	  if (!NILP (Ffile_directory_p (file)))
 	    call4 (Qcopy_directory, file, newname, Qt, Qnil);
 	  else
 	    /* We have already prompted if it was an integer, so don't
@@ -2300,7 +2300,7 @@ This is what happens in interactive use with M-x.  */)

 	  count = SPECPDL_INDEX ();
 	  specbind (Qdelete_by_moving_to_trash, Qnil);
-	  if (Ffile_directory_p (file))
+	  if (!NILP (Ffile_directory_p (file)))
 	    call2 (Qdelete_directory, file, Qt);
 	  else
 	    Fdelete_file (file);