Commit 8fab2362 authored by Chong Yidong's avatar Chong Yidong

* fileio.c (Frename_file): Correctly rename symlinks to directories (Bug#5496).

parent 5e4fe3f9
2010-01-31 David De La Harpe Golden <david@harpegolden.net>
* fileio.c (Frename_file): Correctly rename symlinks to
directories (Bug#5496).
2010-01-31 Filipe Cabecinhas <filcab@gmail.com> (tiny change)
* nsterm.m (ns_ring_bell): Handle visible bell like X.
......
......@@ -2300,7 +2300,12 @@ This is what happens in interactive use with M-x. */)
count = SPECPDL_INDEX ();
specbind (Qdelete_by_moving_to_trash, Qnil);
if (!NILP (Ffile_directory_p (file)))
if (!NILP (Ffile_directory_p (file))
#ifdef S_IFLNK
&& NILP (symlink_target)
#endif
)
call2 (Qdelete_directory, file, Qt);
else
Fdelete_file (file);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment