diff options
| author | Michael Albinus | 2024-01-28 11:51:51 +0100 |
|---|---|---|
| committer | Michael Albinus | 2024-01-28 11:51:51 +0100 |
| commit | 6ebd5aa33765d6d3ffec96f9965d004ad539098e (patch) | |
| tree | ed15e7889c450aef97575f2b204abac4b64c5ef2 | |
| parent | af10fe49fbfcdbe3100b9fdbede3750eb2506930 (diff) | |
| parent | e11c9f9c6e843779c4b69097490dd78de522a79d (diff) | |
| download | emacs-6ebd5aa33765d6d3ffec96f9965d004ad539098e.tar.gz emacs-6ebd5aa33765d6d3ffec96f9965d004ad539098e.zip | |
Merge from origin/emacs-29
e11c9f9c6e8 Handle wrong login program in Tramp
# Conflicts:
# lisp/net/tramp-sh.el
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index de515e40345..6bb1d976ec5 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -5354,7 +5354,7 @@ connection if a previous connection has died for some reason." | |||
| 5354 | "2>" (tramp-get-remote-null-device previous-hop)) | 5354 | "2>" (tramp-get-remote-null-device previous-hop)) |
| 5355 | ?l (concat remote-shell " " extra-args " -i")) | 5355 | ?l (concat remote-shell " " extra-args " -i")) |
| 5356 | ;; A restricted shell does not allow "exec". | 5356 | ;; A restricted shell does not allow "exec". |
| 5357 | (when r-shell '("&&" "exit" "||" "exit"))) | 5357 | (when r-shell '("&&" "exit")) '("||" "exit")) |
| 5358 | " ")) | 5358 | " ")) |
| 5359 | 5359 | ||
| 5360 | ;; Send the command. | 5360 | ;; Send the command. |