emacs-diffs
[Top][All Lists]
Advanced

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

emacs-27 8101083 1/2: Fix an error in tramp-sh-handle-make-process. Dont


From: Michael Albinus
Subject: emacs-27 8101083 1/2: Fix an error in tramp-sh-handle-make-process. Dont' merge with master
Date: Fri, 23 Oct 2020 10:27:02 -0400 (EDT)

branch: emacs-27
commit 8101083c7ab885281cbe1ede717957c8080f7111
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    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.
---
 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 7adfb49..19d50fc 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))



reply via email to

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