From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 23 Oct 2020 14:26:25 +0000 (+0200)
Subject: Fix an error in tramp-sh-handle-make-process.  Dont' merge with master
X-Git-Tag: emacs-27.1.90~104
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8101083c7ab885281cbe1ede717957c8080f7111;p=emacs.git

Fix an error in tramp-sh-handle-make-process.  Dont' merge with master

* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't use heredoc
script whent the argument contains a string.
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 7adfb49a858..19d50fce4c5 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2863,8 +2863,10 @@ STDERR can also be a file name."
 	       ;; command.
 	       (heredoc (and (stringp program)
 			     (string-match-p "sh$" program)
+			     (= (length args) 2)
 			     (string-equal "-c" (car args))
-			     (= (length args) 2)))
+			     ;; Don't if there is a string.
+			     (not (string-match-p "'\\|\"" (cadr args)))))
 	       ;; When PROGRAM is nil, we just provide a tty.
 	       (args (if (not heredoc) args
 		       (let ((i 250))