1 files changed, 20 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81e6b9f10b2..5e6f2cc1ecc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2009-11-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.1.17.
+
+        * net/tramp.el (tramp-handle-copy-directory): Don't use
+        `file-remote-p' (due to compatibility).
+
+        * net/tramp-compat.el (tramp-compat-copy-directory)
+        (tramp-compat-delete-directory): New defuns.
+
+        * net/tramp-fish.el (tramp-fish-handle-delete-directory):
+        * net/tramp-gvfs.el (tramp-gvfs-handle-delete-directory): Use
+        `tramp-compat-delete-directory'.
+
+        * net/tramp-smb.el (tramp-smb-handle-copy-directory)
+        (tramp-smb-handle-delete-directory ): Use
+        `tramp-compat-copy-directory' and `tramp-compat-delete-directory'.
+
+        * net/trampver.el: Update release number.
+
 2009-11-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * tar-mode.el (tar-copy): Call write-region on the right buffer