about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2016-09-04 19:25:58 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2016-09-06 23:49:07 +0000
commit30bb9fe7b770304422a4958f76b0cec0b918a89a (patch)
treeba5a5392461bce89a9e0c208c74170b08c818ac8
parent73c0e8d4e679ed681acc4883234324c7676cc676 (diff)
downloadzsh-30bb9fe7b770304422a4958f76b0cec0b918a89a.tar.gz
zsh-30bb9fe7b770304422a4958f76b0cec0b918a89a.tar.xz
zsh-30bb9fe7b770304422a4958f76b0cec0b918a89a.zip
39174: _ssh: Fix completion of ProxyCommand option.
The incumbent code would discard the first word of the value of the
ProxyCommand option.  Stop doing so.  With that removed the remaining
two lines were equivalent to _cmdstring, so just call it directly.
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_ssh5
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4643eda77..974781c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-09-06  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 39174: Completion/Unix/Command/_ssh: Fix completion of
+	ProxyCommand option.
+
 	* 39173: Doc/Zsh/compsys.yo, README, Src/Zle/computil.c:
 	_arguments: Escape colons and backslashes in $opt_args
 	unambiguously.
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 727fd35f4..7b2cdd8e1 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -382,10 +382,7 @@ _ssh () {
               '2' && ret=0
           ;;
         (#i)proxycommand=*)
-          compset -q
-          shift 1 words
-          (( CURRENT-- ))
-          _normal && ret=0
+          _cmdstring && ret=0
           ;;
         (#i)rekeylimit=*)
           _message -e 'maximum number of bytes transmitted before renegotiating session key'