* [PATCH] make ido show known tramp host in read-directory-name
@ 2013-11-20 3:10 Vitalie Spinu
2013-11-20 13:29 ` Stefan Monnier
0 siblings, 1 reply; 3+ messages in thread
From: Vitalie Spinu @ 2013-11-20 3:10 UTC (permalink / raw
To: emacs-devel
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
Hi,
Ido doesn't show known hosts with read-directory-name with tramp
directories. For example /ssh: or /ftp: show completions on
read-file-name, but not on read-directory-name. This simple patch fixes
that.
If I am not mistaken this was also a request of bug#10911:
http://emacs.1067599.n5.nabble.com/bug-10911-24-0-94-ido-read-directory-name-should-offer-known-hosts-for-completion-td4703.html
Vitalie
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-make-ido-make-dir-list-1-show-known-host.patch --]
[-- Type: text/x-diff, Size: 997 bytes --]
From eeb19169db1e0b3223abfe0e9ed3e76ddcbaa21a Mon Sep 17 00:00:00 2001
From: Vitalie Spinu <spinuvit@gmail.com>
Date: Tue, 19 Nov 2013 18:52:35 -0800
Subject: [PATCH 1/1] make ido-make-dir-list-1 show known host
ido-final-slash checks for tramp directory and acts accordingly, but
it never gets the full directory name when it is called from
ido-make-dir-list-1.
---
lisp/ido.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/ido.el b/lisp/ido.el
index 42b3607..f6104a6 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3676,7 +3676,8 @@ If MERGED is non-nil, each subdir is cons'ed with DIR."
(delq nil
(mapcar
(lambda (name)
- (and (ido-final-slash name) (not (ido-ignore-item-p name ido-ignore-directories))
+ (and (ido-final-slash (concat dir name))
+ (not (ido-ignore-item-p name ido-ignore-directories))
(if merged (cons name dir) name)))
(ido-file-name-all-completions dir)))))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] make ido show known tramp host in read-directory-name
2013-11-20 3:10 [PATCH] make ido show known tramp host in read-directory-name Vitalie Spinu
@ 2013-11-20 13:29 ` Stefan Monnier
2013-11-20 21:44 ` Vitalie Spinu
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Monnier @ 2013-11-20 13:29 UTC (permalink / raw
To: Vitalie Spinu; +Cc: emacs-devel
> + (and (ido-final-slash (concat dir name))
Can expand-file-name be used here instead of concat?
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] make ido show known tramp host in read-directory-name
2013-11-20 13:29 ` Stefan Monnier
@ 2013-11-20 21:44 ` Vitalie Spinu
0 siblings, 0 replies; 3+ messages in thread
From: Vitalie Spinu @ 2013-11-20 21:44 UTC (permalink / raw
To: Stefan Monnier; +Cc: emacs-devel
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
>>> Stefan Monnier on Wed, 20 Nov 2013 08:29:17 -0500 wrote:
>> + (and (ido-final-slash (concat dir name))
> Can expand-file-name be used here instead of concat?
Not really. The dir is like /ssh: and the name is like "amazon:". The
concat is for ido-final-slash to see that the name actually contains the
tramp root.
The following patch is probably a cleaner implementation of the same
idea:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-make-ido-make-dir-list-1-show-known-host.patch --]
[-- Type: text/x-diff, Size: 1467 bytes --]
From 358e9957a45b7a0689029ec014b56c37691cf939 Mon Sep 17 00:00:00 2001
From: Vitalie Spinu <spinuvit@gmail.com>
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-20 21:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-20 3:10 [PATCH] make ido show known tramp host in read-directory-name Vitalie Spinu
2013-11-20 13:29 ` Stefan Monnier
2013-11-20 21:44 ` Vitalie Spinu
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.