# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1264913368 18000
# Node ID 56607edb3cea25b0232e47553d68fbfa1e04ddb9
# Parent  4ab5994c284696f12490238fcd6ca57f4681abbd
* fileio.c (Frename_file): Correctly rename symlinks to directories (Bug#5496).

diff -r 4ab5994c2846 -r 56607edb3cea src/ChangeLog
--- a/src/ChangeLog	Sat Jan 30 23:29:06 2010 -0500
+++ b/src/ChangeLog	Sat Jan 30 23:49:28 2010 -0500
@@ -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.
diff -r 4ab5994c2846 -r 56607edb3cea src/fileio.c
--- a/src/fileio.c	Sat Jan 30 23:29:06 2010 -0500
+++ b/src/fileio.c	Sat Jan 30 23:49:28 2010 -0500
@@ -2300,7 +2300,12 @@
 
 	  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);