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, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8df4fca33..5508e834d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-14  Clint Adams  <clint@zsh.org>
+
+	* Jörg Sommer: 25882: Completion/Unix/Command/_ssh: run ssh with
+	-oBatchMode=yes.
+
 2008-10-14  Peter Stephenson  <pws@csr.com>
 
 	* 25893: Doc/Zsh/compwid.yo: matcher "m:{a-z}={A-Z}" still
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index c52b38c3e..293732cfd 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -10,7 +10,7 @@ _remote_files () {
     then rempat="${PREFIX%%[^./][^/]#}\*"
     else rempat="${(q)PREFIX%%[^./][^/]#}\*"
     fi
-    remfiles=(${(M)${(f)"$(_call_program files ssh $args -a -x ${IPREFIX%:} ls -d1FL "$rempat" 2>/dev/null)"}%%[^/]#(|/)})
+    remfiles=(${(M)${(f)"$(_call_program files ssh -o BatchMode=yes $args -a -x ${IPREFIX%:} ls -d1FL "$rempat" 2>/dev/null)"}%%[^/]#(|/)})
     compset -P '*/'
     compset -S '/*' || suf='remote file'