diff options
| author | Michael Albinus | 2020-10-23 16:31:56 +0200 |
|---|---|---|
| committer | Michael Albinus | 2020-10-23 16:31:56 +0200 |
| commit | 46f5d2867cf73a845d582eeb8929ae51b78eae55 (patch) | |
| tree | 9d018ab9c1c2b9937152486a8c5b23b7d5cbcedf | |
| parent | 49bc8586b7abc8e1e36027ca5eec0d0488a27474 (diff) | |
| download | emacs-46f5d2867cf73a845d582eeb8929ae51b78eae55.tar.gz emacs-46f5d2867cf73a845d582eeb8929ae51b78eae55.zip | |
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.
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
1 files changed, 3 insertions, 1 deletions
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." | |||
| 2850 | ;; command. | 2850 | ;; command. |
| 2851 | (heredoc (and (stringp program) | 2851 | (heredoc (and (stringp program) |
| 2852 | (string-match-p "sh$" program) | 2852 | (string-match-p "sh$" program) |
| 2853 | (= (length args) 2) | ||
| 2853 | (string-equal "-c" (car args)) | 2854 | (string-equal "-c" (car args)) |
| 2854 | (= (length args) 2))) | 2855 | ;; Don't if there is a string. |
| 2856 | (not (string-match-p "'\\|\"" (cadr args))))) | ||
| 2855 | ;; When PROGRAM is nil, we just provide a tty. | 2857 | ;; When PROGRAM is nil, we just provide a tty. |
| 2856 | (args (if (not heredoc) args | 2858 | (args (if (not heredoc) args |
| 2857 | (let ((i 250)) | 2859 | (let ((i 250)) |