about summary refs log tree commit diff
path: root/Completion/Unix/Command/_sh
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@zsh.org>2013-10-13 10:59:52 -0700
committerBart Schaefer <schaefer@zsh.org>2013-10-13 10:59:52 -0700
commit332924513bade9bae205bd8ffd5d0e3f8e8e1d62 (patch)
treeda57173ab6013d0f85e9760447c18a34c3633f93 /Completion/Unix/Command/_sh
parent5faab39a7e87d180e52bb6ebb9bf101f176cc40b (diff)
parentd5ba3ed24579bb12df958c09224367e16e70bad2 (diff)
downloadzsh-332924513bade9bae205bd8ffd5d0e3f8e8e1d62.tar.gz
zsh-332924513bade9bae205bd8ffd5d0e3f8e8e1d62.tar.xz
zsh-332924513bade9bae205bd8ffd5d0e3f8e8e1d62.zip
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Diffstat (limited to 'Completion/Unix/Command/_sh')
-rw-r--r--Completion/Unix/Command/_sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/Completion/Unix/Command/_sh b/Completion/Unix/Command/_sh
index 7258e4260..104c7576c 100644
--- a/Completion/Unix/Command/_sh
+++ b/Completion/Unix/Command/_sh
@@ -5,10 +5,7 @@ if [[ $service == zsh ]]; then
   if [[ ${words[CURRENT-1]} == -o ]]; then
     _options
     # no other possibilities
-    return 0
-  fi
-  if _arguments -S -s -- '*:'; then
-    return 0
+    return
   fi
 fi
 
@@ -25,3 +22,9 @@ else
   fi
   _default
 fi
+
+local ret=$?
+
+[[ $service == zsh ]] && _arguments -S -s -- '*:' && ret=0
+
+return ret