[Emacs-diffs] master 6e66744 03/10: Merge from origin/emacs-24

[Fabián Ezequiel Gallina]

branch: master
commit 6e66744d4c4bd94bb7e34f4243de0213334a31c5
Merge: cd1ed48 230c010
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>

    Merge from origin/emacs-24
    
    230c010 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg 
MARKER. (tramp-get-remote-path): Use it.
    
    Conflicts:
        lisp/ChangeLog
---
 lisp/ChangeLog |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a13cd14..8174063 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,13 @@
        arg MARKER.
        (tramp-get-remote-path): Use it.
 
+2014-12-27  Stefan Monnier  <address@hidden>
+2014-12-27  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-send-command-and-read): New optional
+       arg MARKER.
+       (tramp-get-remote-path): Use it.
+
 2014-12-27  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-error-with-buffer): Call `message' properly.