mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-23 04:51:12 +02:00
Code Releases Activity

users/14076 + workers/26906: Completion/Unix/Command/_ssh: fix autoremoval

Browse source 
of some suffixes.
This commit is contained in:
Bart Schaefer 2009-04-30 18:02:08 +00:00
parent d853f4cd12
commit 7125514c46
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,10 @@
2009-04-30 Barton E. Schaefer <schaefer@zsh.org>
* users/14076 (tweaked per 26906): Completion/Unix/Command/_ssh:
Add -q or -r: options to some compadd argument lists to properly
handle suffix removal when completing ssh option names or remote
host references in file names.
2009-04-30 Peter Stephenson <pws@csr.com>
* c.f. 26895: Test/D07/multibyte.ztst: restrict the sorting test
@ -11644,5 +11651,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4674 $
* $Revision: 1.4675 $
*****************************************************

10
Completion/Unix/Command/_ssh
View file

@ -228,7 +228,7 @@ _ssh () {
esac
else
_wanted values expl 'configure file option' \
compadd -M 'm:{a-z}={A-Z}' -S '=' - \
compadd -M 'm:{a-z}={A-Z}' -qS '=' - \
AddressFamily \
AFSTokenPassing BatchMode BindAddress \
ChallengeResponseAuthentication CheckHostIP \
@ -294,12 +294,12 @@ _ssh () {
_remote_files ${(kv)~opt_args[(I)-[FP1246]]/-P/-p} && ret=0
elif compset -P '*@'; then
suf=( -S '' )
compset -S ':*' || suf=( -S : )
compset -S ':*' || suf=( -r: -S: )
_wanted hosts expl 'remote host name' _ssh_hosts $suf && ret=0
else
_alternative \
'files:: _files' \
'hosts:remote host name:_ssh_hosts -S:' \
'hosts:remote host name:_ssh_hosts -r: -S:' \
'users:user:_ssh_users -qS@' && ret=0
fi
;;
@ -307,10 +307,10 @@ _ssh () {
if compset -P '*:'; then
_remote_files && ret=0
elif compset -P '*@'; then
_wanted hosts expl host _ssh_hosts -S: && ret=0
_wanted hosts expl host _ssh_hosts -r: -S: && ret=0
else
_alternative \
'hosts:remote host name:_ssh_hosts -S:' \
'hosts:remote host name:_ssh_hosts -r: -S:' \
'users:user:_ssh_users -qS@' && ret=0
fi
;;