From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Sat, 27 Dec 2014 16:16:44 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2631^2~15^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e66744d4c4bd94bb7e34f4243de0213334a31c5;p=emacs.git

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
---

6e66744d4c4bd94bb7e34f4243de0213334a31c5
diff --cc lisp/ChangeLog
index a13cd142780,ed08c9fbdbb..81740630e2a
--- a/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