master 098873b: Reorder command-line switches in Tramp

[Michael Albinus]

branch: master
commit 098873b4f25922cd79850e0a985d30ba4c0f780a
Author: Koichi Arakawa <address@hidden>
Commit: Michael Albinus <address@hidden>

    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
---
 lisp/net/tramp-sh.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 26254f8..3c80c58 100644
--- 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)