aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2014-02-10 11:06:07 +0100
committerMichael Albinus2014-02-10 11:06:07 +0100
commit91ea763a41db16daf454afa118c7540d2b97c0af (patch)
tree5cde8d23e366ec47a4458ece80af4457c2d99343
parent575593db501105518d4715e4c2e8d637f9e7208a (diff)
downloademacs-91ea763a41db16daf454afa118c7540d2b97c0af.tar.gz
emacs-91ea763a41db16daf454afa118c7540d2b97c0af.zip
* net/tramp-sh.el (tramp-sh-handle-start-file-process): Do not
quote `tramp-end-of-heredoc'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a2cdabc1f1..06d710e2094 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-02-10 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.el (tramp-sh-handle-start-file-process): Do not
4 quote `tramp-end-of-heredoc'.
5
12014-02-10 Lars Ingebrigtsen <larsi@gnus.org> 62014-02-10 Lars Ingebrigtsen <larsi@gnus.org>
2 7
3 * dired.el (dired-get-marked-files): Doc fix (bug#11534). 8 * 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 8d3c4c2c58b..2a792d786df 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."
2713 (when (stringp program) 2713 (when (stringp program)
2714 (format "cd %s && exec %s env PS1=%s %s" 2714 (format "cd %s && exec %s env PS1=%s %s"
2715 (tramp-shell-quote-argument localname) 2715 (tramp-shell-quote-argument localname)
2716 (if heredoc (format "<<'%s'" tramp-end-of-heredoc) "") 2716 (if heredoc (format "<<%s" tramp-end-of-heredoc) "")
2717 ;; Use a human-friendly prompt, for example for `shell'. 2717 ;; Use a human-friendly prompt, for example for `shell'.
2718 (tramp-shell-quote-argument 2718 (tramp-shell-quote-argument
2719 (format "%s %s" 2719 (format "%s %s"