Merge from origin/emacs-29
e11c9f9c6e
Handle wrong login program in Tramp
# Conflicts:
# lisp/net/tramp-sh.el
This commit is contained in:
commit
6ebd5aa337
1 changed files with 1 additions and 1 deletions
|
@ -5354,7 +5354,7 @@ connection if a previous connection has died for some reason."
|
|||
"2>" (tramp-get-remote-null-device previous-hop))
|
||||
?l (concat remote-shell " " extra-args " -i"))
|
||||
;; A restricted shell does not allow "exec".
|
||||
(when r-shell '("&&" "exit" "||" "exit")))
|
||||
(when r-shell '("&&" "exit")) '("||" "exit"))
|
||||
" "))
|
||||
|
||||
;; Send the command.
|
||||
|
|
Loading…
Add table
Reference in a new issue