[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b71beb7ae7c 2/2: Adapt last change
From: |
Michael Albinus |
Subject: |
master b71beb7ae7c 2/2: Adapt last change |
Date: |
Thu, 31 Aug 2023 11:21:37 -0400 (EDT) |
branch: master
commit b71beb7ae7c60a5c5af608420d28fdda5265a264
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Adapt last change
* lisp/net/tramp-container.el (tramp-completion-multi-hop-methods):
Add "docker" and "podman".
* lisp/net/tramp.el (tramp-completion-multi-hop-methods):
Adapt docstring. Use nil as initial value.
---
lisp/net/tramp-container.el | 6 +++++-
lisp/net/tramp.el | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lisp/net/tramp-container.el b/lisp/net/tramp-container.el
index a0ed9b71a9a..dae7928ba07 100644
--- a/lisp/net/tramp-container.el
+++ b/lisp/net/tramp-container.el
@@ -166,7 +166,8 @@ METHOD is the Tramp method to be used for \"ps\", either
This function is used by `tramp-set-completion-function', please
see its function help for a description of the format."
(let ((default-directory
- (or (and (member method tramp-completion-multi-hop-methods)
tramp--last-hop-directory)
+ (or (and (member method tramp-completion-multi-hop-methods)
+ tramp--last-hop-directory)
tramp-compat-temporary-file-directory))
(program (tramp-get-method-parameter
(make-tramp-file-name :method method) 'tramp-login-program))
@@ -413,6 +414,9 @@ see its function help for a description of the format."
tramp-flatpak-method
'((tramp-flatpak--completion-function "")))
+(add-to-list 'tramp-completion-multi-hop-methods
+ `(,tramp-docker-method ,tramp-podman-method))
+
;; Default connection-local variables for Tramp.
(defconst tramp-kubernetes-connection-local-default-variables
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 754f135c315..f7842c849fe 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3009,8 +3009,8 @@ This function is added always in
`tramp-get-completion-function'
for all methods. Resulting data are derived from default settings."
`((,(tramp-find-user method nil nil) ,(tramp-find-host method nil nil))))
-(defcustom tramp-completion-multi-hop-methods `(,tramp-docker-method
,tramp-podman-method)
- "Methods for which to attempt to provide completions over multi-hop
connections."
+(defcustom tramp-completion-multi-hop-methods nil
+ "Methods for which to provide completions over multi-hop connections."
:version "30.1"
:type 'boolean)