From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 23 Oct 2020 14:31:56 +0000 (+0200)
Subject: Fix error in tramp-sh-handle-make-process
X-Git-Tag: emacs-28.0.90~5463
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=46f5d2867cf73a845d582eeb8929ae51b78eae55;p=emacs.git

Fix error in tramp-sh-handle-make-process

* 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 15eab0a4de5..2c7c6dae755 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2850,8 +2850,10 @@ implementation will be used."
 		 ;; 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))