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

diff --git a/src/ChangeLog b/src/ChangeLog
index 6c0bf66e08acf93db54bb30ddea704e178efdc83..38368f33a70df818e538b2262040f5f3ea5eb719 100644 (file)
--- 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 36eaf7db533efb749d4974e38f532c576bb7467d..72f695acb68983e1b17569bcec1d9b10a5adf904 100644 (file)
--- 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);