diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-02-10 14:22:14 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-02-10 14:22:14 +0100 |
| commit | 5cef7abdbc231cb6b84595c34a4d9dc302dc9e34 (patch) | |
| tree | 1ffb0e9ca0d5c38fdea6ed1363edd6f8c7cd87c7 | |
| parent | 2fc17d30abf94e5f366a867434a5254c49dbf72f (diff) | |
| download | emacs-5cef7abdbc231cb6b84595c34a4d9dc302dc9e34.tar.gz | |
Revert previous patch, it introduces other problems.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
2 files changed, 1 insertions, 6 deletions
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" |