summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKoichi Arakawa <arakawa@pp.iij4u.or.jp>2019-10-28 09:49:59 +0100
committerMichael Albinus <michael.albinus@gmx.de>2019-10-28 09:49:59 +0100
commit098873b4f25922cd79850e0a985d30ba4c0f780a (patch)
treeeca77d95286d7fcd90dde538f2ff5473a6a35377 /lisp
parent7e30076225cebe85f7e60802f471b421a369abd7 (diff)
downloademacs-098873b4f25922cd79850e0a985d30ba4c0f780a.tar.gz
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
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp-sh.el4
1 files 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)