summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_zsh17
2 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 14749d9ff..87a2ce490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-02  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+	* 36732: Completion/Unix/Command/_zsh: support -s and -b,
+	and complete script arguments
+
 2015-10-01  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 36737: Src/pattern.c: Ensure we are not dereferencing
diff --git a/Completion/Unix/Command/_zsh b/Completion/Unix/Command/_zsh
index 3b6d7ad4f..a5414670b 100644
--- a/Completion/Unix/Command/_zsh
+++ b/Completion/Unix/Command/_zsh
@@ -1,8 +1,23 @@
 #compdef zsh
 
+local curcontext=$curcontext state state_descr line expl
+typeset -A opt_args
+
 _arguments -S -s : \
   '*-o+[set named option]:option:_options' \
   '*+o+[unset named option]:option:_options' \
+  '(1 -s --shinstdin)'{-s,--shinstdin}'[read commands from standard input]' \
+  '(-)-b[end of option processing, like --]' \
   '(1 -)-c[run a command]:command:_cmdstring' \
   '(-)1:script file:_files' \
-  '*:command arguments' --
+  '*::script arguments:->args' -- && return 0
+
+case $state in
+  (args)
+    if [[ -n ${opt_args[(I)-c|-s|--shinstdin]} ]]; then
+      _files
+    else
+      _normal
+    fi
+    ;;
+esac