]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix error in tramp-sh-handle-make-process
authorMichael Albinus <michael.albinus@gmx.de>
Fri, 23 Oct 2020 14:31:56 +0000 (16:31 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Fri, 23 Oct 2020 14:31:56 +0000 (16:31 +0200)
* 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

index 15eab0a4de5a182ed137ebfd7e0edc9b814b4d48..2c7c6dae755c3e299bd00c2fb68910eb544df061 100644 (file)
@@ -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))