summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2011-05-27 14:48:06 +0000
committerMikael Magnusson <mikachu@gmail.com>2011-05-27 14:48:06 +0000
commit2865dc2157fa6b78a8ef1171ab28e7fb1169308a (patch)
treeccd697182ee5657d9763fb11688e4991dd39aa18
parent3214cf0a74976e8b8d2b5dc1013666d7b9b95a9a (diff)
downloadzsh-2865dc2157fa6b78a8ef1171ab28e7fb1169308a.tar.gz
zsh-2865dc2157fa6b78a8ef1171ab28e7fb1169308a.zip
29334: complete with _arguments -- for zsh
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_sh5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4acbd582c..c97b026d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
_comp_caller_options and use it in completions that want to
check values of options that are overwritten by _comp_options.
+ * 29334: Completion/Unix/Command/_sh: Complete options for zsh with
+ _arguments --.
+
2011-05-27 Barton E. Schaefer <schaefer@zsh.org>
* 29382: Src/Modules/curses.c: apply 29374 to zccmd_input too.
@@ -14858,5 +14861,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5339 $
+* $Revision: 1.5340 $
*****************************************************
diff --git a/Completion/Unix/Command/_sh b/Completion/Unix/Command/_sh
index 9e72a2918..7258e4260 100644
--- a/Completion/Unix/Command/_sh
+++ b/Completion/Unix/Command/_sh
@@ -5,7 +5,10 @@ if [[ $service == zsh ]]; then
if [[ ${words[CURRENT-1]} == -o ]]; then
_options
# no other possibilities
- return
+ return 0
+ fi
+ if _arguments -S -s -- '*:'; then
+ return 0
fi
fi