5 files changed, 17 insertions, 6 deletions
diff --git a/Completion/Zsh/Command/_compinit b/Completion/Zsh/Command/_compinit
new file mode 100644
index 000000000..eed4dacb8
--- /dev/null
+++ b/Completion/Zsh/Command/_compinit
@@ -0,0 +1,9 @@
+#compdef compinit
+
+_arguments : \
+  '(-i -u)-C[bypass security and dump-file checks]' \
+  '-d+[automatically create dump file / specify dump-file path]::dump file:_files' \
+  "-D[don't automatically create dump file]" \
+  '(-C -u)-i[ignore insecure files]' \
+  "(-C -i)-u[don't check for insecure files]" \
+  "-w[explain why dump file isn't loaded]"
diff --git a/Completion/Zsh/Command/_emulate b/Completion/Zsh/Command/_emulate
index d6fb0c3d9..a16738cdb 100644
--- a/Completion/Zsh/Command/_emulate
+++ b/Completion/Zsh/Command/_emulate
@@ -1,8 +1,9 @@
 #compdef emulate
 
-_arguments -C -s \
-  '-L[set local_options and local_traps as well]' \
+_arguments -s -S -A '-*' : \
+  '(2 3)-l[list options to be set or unset]' \
+  '(2 3)-L[set local_options and local_traps as well]' \
   '-R[reset all options instead of only those needed for script portability]' \
   '1:shell to emulate:(zsh sh ksh csh)' \
-  '2:specify optional command:(-c)' \
-  '3:command:_cmdstring'
+  '(-l -L)2:specify optional command:(-c)' \
+  '(-l -L)3: :_cmdstring'
diff --git a/Completion/Zsh/Command/_set b/Completion/Zsh/Command/_set
index 27c7f3c7d..720c667a9 100644
--- a/Completion/Zsh/Command/_set
+++ b/Completion/Zsh/Command/_set
@@ -21,5 +21,5 @@ noglob _arguments -s -S \
   {-,+}d[no-globalrcs] {-,+}e[errexit] {-,+}f[no-rcs] {-,+}g[histignorespace] \
   {-,+}h[histignoredups] {-,+}i[interactive] {-,+}k[interactivecomments] \
   {-,+}l[login] {-,+}m[monitor] {-,+}n[no-exec] {-,+}p[privileged] \
-  {-,+}r[restricted] {-,+}t[singlecommand] {-,+}u[no-unset] {-,+}v[verbose] \
+  {-,+}t[singlecommand] {-,+}u[no-unset] {-,+}v[verbose] \
   {-,+}w[chaselinks] {-,+}x[xtrace] {-,+}y[shwordsplit]
diff --git a/Completion/Zsh/Command/_zparseopts b/Completion/Zsh/Command/_zparseopts
index ae81937c1..cc5e28a9a 100644
--- a/Completion/Zsh/Command/_zparseopts
+++ b/Completion/Zsh/Command/_zparseopts
@@ -13,6 +13,7 @@ _arguments -A '-*' : \
   '-G[enable GNU-style parsing]' \
   '-K[preserve contents of arrays/associations when specs are not matched]' \
   '-M[enable mapping among equivalent options with opt1=opt2 spec form]' \
+  '-n+[specify program name for usage errors]:program name' \
   '-v+[specify array from which to parse options]:array:_parameters -g "*array*"' \
   '(-)-[end zparseopts options; specs follow]' \
   '*: :->spec' \
diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle
index 0c81c2f2e..9bba030c8 100644
--- a/Completion/Zsh/Command/_zstyle
+++ b/Completion/Zsh/Command/_zstyle
@@ -339,7 +339,7 @@ while (( $#state )); do
 	ctop=c
 	;;
 
-	(:chwpd:*)
+	(:chpwd:*)
 	ctop=d
 	;;