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

diff --cc lisp/ChangeLog
index a13cd1427804641e5532466f22353708559fe54d,ed08c9fbdbb42328aa637192d7856a5dba3cf3af..81740630e2a16ebda2f5a2e6e46f631e15aa85ea
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -4,7 -4,11 +4,14 @@@
        arg MARKER.
        (tramp-get-remote-path): Use it.
  
 -2014-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+ 
 -      * subr.el (redisplay-dont-pause): Mark as obsolete.
++      * net/tramp-sh.el (tramp-send-command-and-read): New optional
++      arg MARKER.
++      (tramp-get-remote-path): Use it.
+ 
 -2014-12-17  Michael Albinus  <michael.albinus@gmx.de>
 +2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
  
        * net/tramp.el (tramp-error-with-buffer): Call `message' properly.
        (tramp-accept-process-output): Use nil as argument for