From 344178c208fa58fbd7115cdb057937331f08290d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ellis=20Keny=C5=91?= Date: Tue, 21 Feb 2023 23:28:34 +0000 Subject: [PATCH] fix(vertico): docker-tramp => tramp-container Amend: 1b9f93859ffb Ref: #6986 --- modules/completion/vertico/config.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el index 1180abaf6..ec417355c 100644 --- a/modules/completion/vertico/config.el +++ b/modules/completion/vertico/config.el @@ -184,13 +184,18 @@ orderless." ("C-x C-d" . consult-dir) ("C-x C-j" . consult-dir-jump-file)) :config - (when (and (< emacs-major-version 29) (modulep! :tools docker)) + (when (modulep! :tools docker) (defun +vertico--consult-dir-docker-hosts () "Get a list of hosts from docker." - (when (require 'docker-tramp nil t) + (when (if (>= emacs-major-version 29) + (require 'tramp-container nil t) + (setq-local docker-tramp-use-names t) + (require 'docker-tramp nil t)) (let ((hosts) - (docker-tramp-use-names t)) - (dolist (cand (docker-tramp--parse-running-containers)) + (docker-query-fn #'docker-tramp--parse-running-containers)) + (when (>= emacs-major-version 29) + (setq docker-query-fn #'tramp-docker--completion-function)) + (dolist (cand (funcall docker-query-fn)) (let ((user (unless (string-empty-p (car cand)) (concat (car cand) "@"))) (host (car (cdr cand))))