Mercurial > emacs
changeset 107037:6e7738cc419f
* fileio.c (Frename_file): Fix last change (Bug#5487).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 28 Jan 2010 12:47:05 -0500 |
| parents | 467d1fce4215 |
| children | d91412f9e8e4 |
| files | src/ChangeLog src/fileio.c |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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).
--- 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);