mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-24 00:46:04 +02:00
Code

47322: allow prefix with ssh cipher completion and add matching control for options

This commit is contained in:
Oliver Kiddle 2020-08-21 17:41:08 +02:00
parent e14e899ab9
commit edb5459d61
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2020-08-21 Oliver Kiddle <opk@zsh.org>
* 47322: Completion/Unix/Command/_ssh: allow prefix with ssh
cipher completion and add matching control for options
2020-08-18 Daniel Shahaf <d.s@daniel.shahaf.name> 2020-08-18 Daniel Shahaf <d.s@daniel.shahaf.name>
* 47323: Completion/Redhat/Command/_rpm: _rpmbuild: Complete * 47323: Completion/Redhat/Command/_rpm: _rpmbuild: Complete

6
Completion/Unix/Command/_ssh
View File

@ -269,8 +269,8 @@ _ssh () {
if compset -P 1 '*='; then if compset -P 1 '*='; then
case "${IPREFIX#-o}" in case "${IPREFIX#-o}" in
(#i)(ciphers|macs|kexalgorithms|hostkeyalgorithms|pubkeyacceptedkeytypes|hostbasedkeytypes)=) (#i)(ciphers|macs|kexalgorithms|hostkeyalgorithms|pubkeyacceptedkeytypes|hostbasedkeytypes)=)
if ! compset -P +; then if ! compset -P '[+-]'; then
_wanted append expl 'append to default' compadd + && ret=0 _wanted prefix expl 'relative to default' compadd - + - && ret=0
fi fi
;; ;;
esac esac
@ -475,7 +475,7 @@ _ssh () {
else else
# old options are after the empty "\"-line # old options are after the empty "\"-line
_wanted values expl 'configure file option' \ _wanted values expl 'configure file option' \
compadd -M 'm:{a-z}={A-Z}' -q -S '=' - \ compadd -M 'm:{a-z}={A-Z} r:[^A-Z]||[A-Z]=* r:|=*' -q -S '=' - \
AddKeysToAgent \ AddKeysToAgent \
AddressFamily \ AddressFamily \
BatchMode \ BatchMode \