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

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

Browse source
This commit is contained in:
Chong Yidong 2010-01-30 23:49:28 -05:00
parent 5e4fe3f9cf
commit 8fab23622f
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
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.

7
src/fileio.c
View file

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