From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 28 Jan 2010 17:47:05 +0000 (-0500)
Subject: * fileio.c (Frename_file): Fix last change (Bug#5487).
X-Git-Tag: emacs-pretest-23.1.92~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b242dbfc1b2d4dacad8d33fdd12b328a48afb8b6;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 6c0bf66e08a..38368f33a70 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/fileio.c b/src/fileio.c
index 36eaf7db533..72f695acb68 100644
--- 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);