[Emacs-diffs] /srv/bzr/emacs/trunk r99425: * fileio.c (Frename_file): Correctly rename symlinks to directories (Bug#5496).

[Chong Yidong]

------------------------------------------------------------
revno: 99425
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-30 23:49:28 -0500
message:
  * fileio.c (Frename_file): Correctly rename symlinks to directories 
(Bug#5496).
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-31 03:36:06 +0000
+++ b/src/ChangeLog     2010-01-31 04:49:28 +0000
@@ -1,3 +1,8 @@
+2010-01-31  David De La Harpe Golden  <address@hidden>
+
+       * fileio.c (Frename_file): Correctly rename symlinks to
+       directories (Bug#5496).
+
 2010-01-31  Filipe Cabecinhas  <address@hidden>  (tiny change)
 
        * nsterm.m (ns_ring_bell): Handle visible bell like X.

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-01-28 17:47:05 +0000
+++ b/src/fileio.c      2010-01-31 04:49:28 +0000
@@ -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);