Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a13cd1427804641e5532466f22353708559fe54d..81740630e2a16ebda2f5a2e6e46f631e15aa85ea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,13 @@
        arg MARKER.
        (tramp-get-remote-path): Use it.
 
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-sh.el (tramp-send-command-and-read): New optional
+       arg MARKER.
+       (tramp-get-remote-path): Use it.
+
 2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-error-with-buffer): Call `message' properly.