branch: master commit da85d1e727359d228f677d1c011ff36727420a8e Author: Oleh Krehel <ohwoeo...@gmail.com> Commit: Oleh Krehel <ohwoeo...@gmail.com>
ivy.el: Require TRAMP earlier To make sure we have TRAMP compleiton candidates when expected, require TRAMP as soon as the collection function is `read-file-name-internal'. Fixes #1918 --- ivy.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivy.el b/ivy.el index 6d9527f..c1a5a9c 100644 --- a/ivy.el +++ b/ivy.el @@ -926,7 +926,6 @@ contains a single candidate.") (user (match-string 2 ivy-text)) (rest (match-string 3 ivy-text)) res) - (require 'tramp) (dolist (x (tramp-get-completion-function method)) (setq res (append res (funcall (car x) (cadr x))))) (setq res (delq nil res)) @@ -1979,6 +1978,7 @@ This is useful for recursive `ivy-read'." (all-completions "(" collection predicate))) (all-completions "" collection predicate)))) ((eq collection #'read-file-name-internal) + (require 'tramp) (when (and (equal def initial-input) (member "./" ivy-extra-directories)) (setf (ivy-state-def state) (setq def nil)))