* net/tramp-sh.el (tramp-sh-handle-copy-directory):

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b954132..34ac8ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2013-10-28  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-sh.el (tramp-sh-handle-copy-directory):
+       * net/tramp-smb.el (tramp-smb-handle-copy-directory):
+       Handle COPY-CONTENTS.  (Bug#15737)
+
+2013-10-28  Daiki Ueno  <ueno@gnu.org>
+
+       * epa-file.el
+       (epa-file-cache-passphrase-for-symmetric-encryption): Document
+       that this option has no effect with GnuPG 2.0 (bug#15552).
+
+2013-10-27  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * image.el (defimage):
+       (image-load-path): Doc fixes.
+
 2013-10-27  Alan Mackenzie  <acm@muc.de>
 
        Indent statements in macros following "##" correctly.