Mercurial > emacs

diff src/fileio.c @ 107264:79ebcc02de4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 28 Jan 2010 22:03:25 +0000
parents 6e7738cc419f
children 56607edb3cea
line wrap: on
line diff
--- a/src/fileio.c	Thu Jan 28 08:58:10 2010 +0000
+++ b/src/fileio.c	Thu Jan 28 22:03:25 2010 +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);