emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 46f5d28: Fix error in tramp-sh-handle-make-process


From: Michael Albinus
Subject: master 46f5d28: Fix error in tramp-sh-handle-make-process
Date: Fri, 23 Oct 2020 10:32:03 -0400 (EDT)

branch: master
commit 46f5d2867cf73a845d582eeb8929ae51b78eae55
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    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.
---
 lisp/net/tramp-sh.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 15eab0a..2c7c6da 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]