master 6ebd5aa3376 2/2: Merge from origin/emacs-29

[Michael Albinus]

branch: master
commit 6ebd5aa33765d6d3ffec96f9965d004ad539098e
Merge: af10fe49fbf e11c9f9c6e8
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Merge from origin/emacs-29
    
    e11c9f9c6e8 Handle wrong login program in Tramp
    
    # Conflicts:
    #       lisp/net/tramp-sh.el
---
 lisp/net/tramp-sh.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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