summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2002-09-03 19:05:27 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2002-09-03 19:05:27 +0000
commit30aa9063e8163ac77e61caa32169e5c1f8d2e16b (patch)
treeae3d2f4071412fe2d3d425b19eae88974e9a07b7
parentf4065b138b32af4943971c1c88ac467b97c86fde (diff)
downloadzsh-30aa9063e8163ac77e61caa32169e5c1f8d2e16b.tar.gz
zsh-30aa9063e8163ac77e61caa32169e5c1f8d2e16b.zip
pass -F option through to ssh when getting remote files for scp completion
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_ssh4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b91d17e4..5fc46a72c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2002-09-03 Oliver Kiddle <opk@zsh.org>
+ * Thomas Köhler: 176xx: Completion/Unix/Command/_ssh: also pass
+ through -F option
+
* 17607: Completion/Unix/Command/_ssh: pass through options such as
the port number to ssh when getting remote files for scp
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 692a9b5cf..bdd457266 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -5,7 +5,7 @@ _remote_files () {
local expl remfiles remdispf remdispd args suf ret=1
if zstyle -T ":completion:${curcontext}:" remote-access; then
- zparseopts -D -E -a args p: 1 2 4 6
+ zparseopts -D -E -a args p: 1 2 4 6 F:
remfiles=(${(M)${(f)"$(ssh $args -a -x ${words[CURRENT]%%:*} ls -d1F ${PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)})
compset -P '*/'
compset -S '/*' || suf='remote file'
@@ -263,7 +263,7 @@ _ssh () {
;;
file)
if compset -P '*:'; then
- _remote_files ${(kv)opt_args[(I)-[P1246]]/-P/-p} && ret=0
+ _remote_files ${(kv)~opt_args[(I)-[FP1246]]/-P/-p} && ret=0
elif compset -P '*@'; then
_wanted hosts expl host _ssh_hosts -S: && ret=0
else