1 files changed, 13 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ded64a543a0..e351b73fbd6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2013-11-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        Fix problems found while writing a test suite.
+
+        * net/tramp.el (tramp-file-name-regexp-unified): Simplify.
+        (tramp-file-name-for-operation): Use `tramp-tramp-file-p'.
+        (tramp-handle-substitute-in-file-name): Let-bind `process-environment'
+        to nil when running original file name handler.  Otherwise,
+        there are problems with constructs like "$$FOO".
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file): Use correct prefix
+        for `localname'.
+
 2013-11-04  Bozhidar Batsov  <bozhidar@batsov.com>
 
         * helpers.el: New library for misc helper functions.