From 098873b4f25922cd79850e0a985d30ba4c0f780a Mon Sep 17 00:00:00 2001 From: Koichi Arakawa Date: Mon, 28 Oct 2019 09:49:59 +0100 Subject: [PATCH] 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 26254f87fe1..3c80c583099 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) -- 2.39.5