# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1264700825 18000
# Node ID 6e7738cc419f05b01daef484081113fd176ffc50
# Parent  467d1fce4215bc3934471f11d1aa6b11a6b8300a
* fileio.c (Frename_file): Fix last change (Bug#5487).

diff -r 467d1fce4215 -r 6e7738cc419f src/ChangeLog
--- a/src/ChangeLog	Thu Jan 28 12:33:28 2010 -0500
+++ b/src/ChangeLog	Thu Jan 28 12:47:05 2010 -0500
@@ -1,5 +1,7 @@
 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).
diff -r 467d1fce4215 -r 6e7738cc419f src/fileio.c
--- a/src/fileio.c	Thu Jan 28 12:33:28 2010 -0500
+++ b/src/fileio.c	Thu Jan 28 12:47:05 2010 -0500
@@ -2289,7 +2289,7 @@
                                  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 @@
 
 	  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);