]> git.eshelyaron.com Git - emacs.git/commitdiff
Adapt last change
authorMichael Albinus <michael.albinus@gmx.de>
Thu, 31 Aug 2023 15:21:23 +0000 (17:21 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Thu, 31 Aug 2023 15:21:23 +0000 (17:21 +0200)
* 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
lisp/net/tramp.el

index a0ed9b71a9a298557a00121e8c46cd26eff8da74..dae7928ba078fff2543dee5391931150d2fa6ab9 100644 (file)
@@ -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
index 754f135c31540b82b1b4514d77952cbdc265d42a..f7842c849fe9c1e2d81600d0c3ee039118004bb1 100644 (file)
@@ -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)