about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_ssh2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f627547b9..fc3a3fc75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-07  Clint Adams  <clint@zsh.org>
 
+	* 27579: Completion/Unix/Command/_ssh: allow ssh -S argument to
+	follow immediately the option letter.
+
 	* 27578: Completion/Linux/Command/_ionice: allow ionice -c and -n
 	arguments to immediately follow the option letters.
 
@@ -12550,5 +12553,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4855 $
+* $Revision: 1.4856 $
 *****************************************************
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index b7b407e2f..eb5947ce0 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -77,7 +77,7 @@ _ssh () {
       '(-x -Y)-X[enable (untrusted) X11 forwarding]' \
       '(-x -X)-Y[enable trusted X11 forwarding]' \
       '-M[master mode for connection sharing]' \
-      '-S:path to control socket:_files' \
+      '-S+:path to control socket:_files' \
       '-O:multiplex control command:(check exit)' \
       '*-L[specify local port forwarding]:local port forwarding:->forward' \
       '*-R[specify remote port forwarding]:remote port forwarding:->forward' \