5 files changed, 25 insertions, 7 deletions
diff --git a/Completion/Zsh/Command/_alias b/Completion/Zsh/Command/_alias
new file mode 100644
index 000000000..98ae94046
--- /dev/null
+++ b/Completion/Zsh/Command/_alias
@@ -0,0 +1,8 @@
+#compdef alias
+
+_arguments -C -s -A "-*" -S \
+  '-+g[list or define global aliases]' \
+  '-+r[list or define regular aliases]' \
+  '-+m[print aliases matching specified pattern]' \
+  '-L[print each alias in the form of calls to alias]' \
+  '*::alias definition:_aliases -S ='
diff --git a/Completion/Zsh/Command/_fc b/Completion/Zsh/Command/_fc
index 40d88db27..bcbb4928e 100644
--- a/Completion/Zsh/Command/_fc
+++ b/Completion/Zsh/Command/_fc
@@ -1,13 +1,13 @@
 #compdef fc history r
 
-local expl fc_common fc_hist fc_r
+local fc_common fc_hist fc_r
 
 fc_common=(
   '(-A -R -W -I)-r[reverse order of the commands]'
   '(-A -R -W -I -e)-n[suppress line numbers]'
   '(-A -R -W -I)*::commands:_command_names -e' )
 
-fc_hist=( \
+fc_hist=(
   '(-A -R -W -I)-m[treat first argument as a pattern]'
   '(-A -R -W -I -e -f -E -i)-d[print time-stamps]'
   '(-A -R -W -I -e -d -E -i)-f[mm/dd/yyyy format time-stamps]'
@@ -19,13 +19,13 @@ fc_r='(-A -R -W -I -e)-l[list resulting commands on stdout]'
 
 case $service in
   history)
-    _arguments -C -s -S "$fc_common[@]" "$fc_hist[@]" && return 0
+    _arguments -s -S "$fc_common[@]" "$fc_hist[@]" && return 0
   ;;
   r)
-    _arguments -C -s -S "$fc_common[@]" "$fc_r" && return 0
+    _arguments -s -S "$fc_common[@]" "$fc_r" && return 0
   ;;
   *)
-  _arguments -C -s -S \
+  _arguments -s -S \
     '(-A -R -W -I -l -n -d -f -E -i -D)-e[specify editor to invoke]:editor to invoke:_command_names -e' \
     '(-l -m -e -r -n -d -f -E -i -D -A -W *)-R[read history from file]:history file:_files' \
     '(-l -m -e -r -n -d -f -E -i -D -R -W *)-A[append history to file]:history file:_files' \
diff --git a/Completion/Zsh/Command/_jobs_builtin b/Completion/Zsh/Command/_jobs_builtin
new file mode 100644
index 000000000..39ddb8a45
--- /dev/null
+++ b/Completion/Zsh/Command/_jobs_builtin
@@ -0,0 +1,10 @@
+#compdef jobs
+
+_arguments -C -s \
+  "(-d -l -p -r -s *)-Z[specify string to replace shell's argument and environment with]:string" \
+  '(-Z)-d[show directory from which to job was started]' \
+  '(-Z)-l[list process IDs]' \
+  '(-Z)-p[list process groups]' \
+  '(-Z -s)-r[list only running jobs]' \
+  '(-Z -r)-s[list only stopped jobs]' \
+  '(-Z)*::job:_jobs'
diff --git a/Completion/Zsh/Type/_aliases b/Completion/Zsh/Type/_aliases
index db8e31678..30e091d98 100644
--- a/Completion/Zsh/Type/_aliases
+++ b/Completion/Zsh/Type/_aliases
@@ -1,4 +1,4 @@
-#compdef alias unalias
+#compdef unalias
 
 local expl sel args opts
 
diff --git a/Completion/Zsh/Type/_jobs_fg b/Completion/Zsh/Type/_jobs_fg
index 4db38045e..e0f3012ef 100644
--- a/Completion/Zsh/Type/_jobs_fg
+++ b/Completion/Zsh/Type/_jobs_fg
@@ -1,3 +1,3 @@
-#compdef disown fg jobs
+#compdef disown fg
 
 _jobs