aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2023-09-01 13:49:22 +0200
committerMichael Albinus2023-09-01 13:49:22 +0200
commiteeb7f2bc12bbd14a16e250e3897afa0151dd1d26 (patch)
tree4c65c4701eeecff0890c3926a7964cc6929dc945
parentaa4868017043e60c0875e40e0a67ac1365a477b0 (diff)
downloademacs-eeb7f2bc12bbd14a16e250e3897afa0151dd1d26.tar.gz
emacs-eeb7f2bc12bbd14a16e250e3897afa0151dd1d26.zip
Fix tramp-completion-multi-hop-methods handling
* lisp/net/tramp-container.el (tramp-completion-multi-hop-methods): Add methods properly. * lisp/net/tramp.el (tramp-completion-multi-hop-methods): Fix :type.
-rw-r--r--lisp/net/tramp-container.el4
-rw-r--r--lisp/net/tramp.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/tramp-container.el b/lisp/net/tramp-container.el
index dae7928ba07..2e9ddc64bd3 100644
--- a/lisp/net/tramp-container.el
+++ b/lisp/net/tramp-container.el
@@ -414,8 +414,8 @@ see its function help for a description of the format."
414 tramp-flatpak-method 414 tramp-flatpak-method
415 '((tramp-flatpak--completion-function ""))) 415 '((tramp-flatpak--completion-function "")))
416 416
417(add-to-list 'tramp-completion-multi-hop-methods 417 (add-to-list 'tramp-completion-multi-hop-methods tramp-docker-method)
418 `(,tramp-docker-method ,tramp-podman-method)) 418 (add-to-list 'tramp-completion-multi-hop-methods tramp-podman-method)
419 419
420 ;; Default connection-local variables for Tramp. 420 ;; Default connection-local variables for Tramp.
421 421
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f7842c849fe..3cd71ab4e71 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3012,7 +3012,7 @@ for all methods. Resulting data are derived from default settings."
3012(defcustom tramp-completion-multi-hop-methods nil 3012(defcustom tramp-completion-multi-hop-methods nil
3013 "Methods for which to provide completions over multi-hop connections." 3013 "Methods for which to provide completions over multi-hop connections."
3014 :version "30.1" 3014 :version "30.1"
3015 :type 'boolean) 3015 :type '(repeat (string :tag "Method name")))
3016 3016
3017(defcustom tramp-completion-use-auth-sources auth-source-do-cache 3017(defcustom tramp-completion-use-auth-sources auth-source-do-cache
3018 "Whether to use `auth-source-search' for completion of user and host names. 3018 "Whether to use `auth-source-search' for completion of user and host names.