From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 10 Feb 2014 13:22:14 +0000 (+0100)
Subject: Revert previous patch, it introduces other problems.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~37
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cef7abdbc231cb6b84595c34a4d9dc302dc9e34;p=emacs.git

Revert previous patch, it introduces other problems.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06d710e2094..6a2cdabc1f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2014-02-10  Michael Albinus  <michael.albinus@gmx.de>
-
-	* net/tramp-sh.el (tramp-sh-handle-start-file-process): Do not
-	quote `tramp-end-of-heredoc'.
-
 2014-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* dired.el (dired-get-marked-files): Doc fix (bug#11534).
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 2a792d786df..8d3c4c2c58b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2713,7 +2713,7 @@ the result will be a local, non-Tramp, filename."
 	    (when (stringp program)
 	      (format "cd %s && exec %s env PS1=%s %s"
 		      (tramp-shell-quote-argument localname)
-		      (if heredoc (format "<<%s" tramp-end-of-heredoc) "")
+		      (if heredoc (format "<<'%s'" tramp-end-of-heredoc) "")
 		      ;; Use a human-friendly prompt, for example for `shell'.
 		      (tramp-shell-quote-argument
 		       (format "%s %s"