[Emacs-diffs] /srv/bzr/emacs/trunk r99404: * fileio.c (Frename_file): Fix last change (Bug#5487).

[Chong Yidong]

------------------------------------------------------------
revno: 99404
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-28 12:47:05 -0500
message:
  * fileio.c (Frename_file): Fix last change (Bug#5487).
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-28 17:33:28 +0000
+++ b/src/ChangeLog     2010-01-28 17:47:05 +0000
@@ -1,5 +1,7 @@
 2010-01-28  Chong Yidong  <address@hidden>
 
+       * 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).

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-01-27 04:08:41 +0000
+++ b/src/fileio.c      2010-01-28 17:47:05 +0000
@@ -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);