procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Chong Yidong 2010-01-28 12:47:05 -05:00
parent ca0eb7088c
commit b242dbfc1b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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).

4
src/fileio.c
View file

@ -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);