Merge from origin/emacs-29

e11c9f9c6e Handle wrong login program in Tramp

# Conflicts:
#	lisp/net/tramp-sh.el
This commit is contained in:
Michael Albinus 2024-01-28 11:51:51 +01:00
commit 6ebd5aa337

View file

@ -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.