From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 15 Mar 2018 15:11:14 +0000 (+0100)
Subject: Improve robustness in tramp-sh.el
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c6e52fa31e1f55634bab524a3702f6f1913fd134;p=emacs.git

Improve robustness in tramp-sh.el

* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
Wrap both echo calls in parentheses, in order to avoid double prompt.
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index f619ac30633..0cdf42de68a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4175,7 +4175,7 @@ process to set up.  VEC specifies the connection."
 	      cs-encode
 	      (coding-system-change-eol-conversion
 	       cs-encode (if (string-match "^Darwin" uname) 'mac 'unix)))
-	(tramp-send-command vec "echo foo ; echo bar" t)
+	(tramp-send-command vec "(echo foo ; echo bar)" t)
 	(goto-char (point-min))
 	(when (search-forward "\r" nil t)
 	  (setq cs-decode (coding-system-change-eol-conversion cs-decode 'dos)))