Reorder command-line switches in Tramp

* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
`tramp-encoding-command-interactive' must be the last command-line
switch, at least for bash.  (Bug#37953)

Copyright-paperwork-exempt: yes

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 26254f87fe1ef22fe55f7f8c17736e64000ab697..3c80c583099bf56954f822438b06ff7b0dc5d080 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4877,9 +4877,9 @@ connection if a previous connection has died for some reason."
                           (tramp-get-connection-buffer vec)
                           (append
                            (list tramp-encoding-shell)
+                           (and extra-args (split-string extra-args))
                            (and tramp-encoding-command-interactive
-                                (list tramp-encoding-command-interactive))
-                           (and extra-args (split-string extra-args)))))))
+                                (list tramp-encoding-command-interactive)))))))
 
                ;; Set sentinel and query flag.  Initialize variables.
                (set-process-sentinel p #'tramp-process-sentinel)