From 358e9957a45b7a0689029ec014b56c37691cf939 Mon Sep 17 00:00:00 2001 From: Vitalie Spinu Date: Tue, 19 Nov 2013 18:52:35 -0800 Subject: [PATCH 1/1] make ido-make-dir-list-1 show known host allow missing end slash with tramp directories --- lisp/ido.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/ido.el b/lisp/ido.el index 42b3607..08c9c47 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -3672,13 +3672,15 @@ in this list." (defun ido-make-dir-list-1 (dir &optional merged) "Return list of non-ignored subdirs in DIR. If MERGED is non-nil, each subdir is cons'ed with DIR." - (and (or (ido-is-tramp-root dir) (file-directory-p dir)) - (delq nil - (mapcar - (lambda (name) - (and (ido-final-slash name) (not (ido-ignore-item-p name ido-ignore-directories)) - (if merged (cons name dir) name))) - (ido-file-name-all-completions dir))))) + (let ((tramp-root (ido-is-tramp-root dir))) + (and (or tramp-root (file-directory-p dir)) + (delq nil + (mapcar + (lambda (name) + (and (or tramp-root (ido-final-slash dir)) + (not (ido-ignore-item-p name ido-ignore-directories)) + (if merged (cons name dir) name))) + (ido-file-name-all-completions dir)))))) (defun ido-make-dir-list (default) "Return the current list of directories. -- 1.8.1.2