from trunk

1 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b1a9c1ee73..eb996b92a73 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,12 @@
         * regex.c (analyse_first): Fix setting of fastmap for unibyte
         pattern string.
 
+2010-01-27  David De La Harpe Golden  <david@harpegolden.net>
+
+        * fileio.c (Frename_file): Call copy-directory and
+        delete-directory for directories, in order to handle cross-device
+        renaming (Bug#3353).
+
 2010-01-25  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xfns.c (Fx_create_frame): If frame height is too big, try
@@ -9328,7 +9334,7 @@
         (syms_of_xterm): Don't declare it any more.
         (x_draw_glyph_string): Adjust to the new name.
 
-2008-06-10  David De La Harpe Golden  <david@harpegolden.net>  (tiny change)
+2008-06-10  David De La Harpe Golden  <david@harpegolden.net>
 
         * xterm.c (x_underline_minimum_display_offset): New var.
         (x_draw_glyph_string): Use it.