From 4a6a974adb6b03c8efc17dd7cf7b1796f24a28a6 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 25 Feb 2025 15:50:35 +0100 Subject: [PATCH] Fix bug in Tramp argument computing * lisp/net/tramp-sh.el (tramp-ssh-or-plink-options): Return always a string. (Bug#76553) (cherry picked from commit c2d20946059bb78d7ab40060dbdc829c59a16bde) --- lisp/net/tramp-sh.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index c78234e57a3..03030f311f3 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4958,7 +4958,10 @@ Goes through the list `tramp-inline-compress-commands'." ;; ControlPersist option is introduced in OpenSSH 5.6. (when (and (not (eq tramp-use-connection-share 'suppress)) (tramp-ssh-option-exists-p vec "ControlPersist=no")) - " -o ControlPersist=no"))))))) + " -o ControlPersist=no"))))) + + ;; Return a string, whatsoever. + (t ""))) (defun tramp-scp-strict-file-name-checking (vec) "Return the strict file name checking argument of the local scp." -- 2.39.5