branch: master commit 591c8fe22b3e0b89fd3bb83328d0b101508721ca Author: Oleh Krehel <ohwoeo...@gmail.com> Commit: Oleh Krehel <ohwoeo...@gmail.com>
ivy.el (ivy-expand-file-if-directory): Fix "/ssh:" regression --- ivy.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ivy.el b/ivy.el index 5a19227..fcac7d6 100644 --- a/ivy.el +++ b/ivy.el @@ -605,9 +605,11 @@ When ARG is t, exit with current text, ignoring the candidates." When this directory doesn't exist, return nil." (when (stringp file-name) (let ((full-name - (file-name-as-directory - (expand-file-name file-name ivy--directory)))) - (when (file-directory-p full-name) + ;; Ignore host name must not match method "ssh" + (ignore-errors + (file-name-as-directory + (expand-file-name file-name ivy--directory))))) + (when (and full-name (file-directory-p full-name)) full-name)))) (defcustom ivy-tab-space nil