[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master da85d1e 016/399: ivy.el: Require TRAMP earlier

From: Oleh Krehel
Subject: [elpa] master da85d1e 016/399: ivy.el: Require TRAMP earlier
Date: Sat, 20 Jul 2019 14:56:39 -0400 (EDT)

branch: master
commit da85d1e727359d228f677d1c011ff36727420a8e
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el: Require TRAMP earlier
    To make sure we have TRAMP compleiton candidates when expected,
    require TRAMP as soon as the collection function is
    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))
-         (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)))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]