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

src/ChangeLog

+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.

src/fileio.c

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