Revert previous patch, it introduces other problems.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06d710e2094dabfd16d399e352dbdf72da6b2b8a..6a2cdabc1f12800d02e662bae64e45ea93a79ad5 100644 (file)
--- 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 2a792d786dfd87ae728ad26939c0bfad20259f92..8d3c4c2c58b5627031ec68d64d4e0daa5a4b49ab 100644 (file)
--- 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"