Merge completions into functions

Completions are nothing more than auto-loadable functions prefixed with
an underscore placed somewhere in $FPATH.

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "modules/completion/completions"]
-	path = modules/completion/completions
-	url = https://github.com/zsh-users/zsh-completions.git
 [submodule "modules/history-substring-search/external"]
 	path = modules/history-substring-search/external
 	url = https://github.com/zsh-users/zsh-history-substring-search.git
 [submodule "modules/syntax-highlighting/external"]
 	path = modules/syntax-highlighting/external
 	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "modules/completion/functions"]
+	path = modules/completion/functions
+	url = https://github.com/zsh-users/zsh-completions.git

helper.zsh

@@ -32,8 +32,8 @@ function omodload {
   # Extended globbing is needed for autoloading of module functions.
   setopt EXTENDED_GLOB
 
-  # Add functions and completions to fpath.
+  # Add functions to fpath.
-  fpath=(${argv:+${OMZ}/modules/${^argv}/{functions,completions}(/FN)} $fpath)
+  fpath=(${argv:+${OMZ}/modules/${^argv}/functions(/FN)} $fpath)
 
   # Load Oh My Zsh functions.
   for ofunction in $OMZ/modules/**/functions/^([_.]*|prompt_*_setup)(.N:t); do

modules/completion/completions

@@ -1 +0,0 @@
-Subproject commit b877df4e7090c9a45da6a4c5f25d8ad172ed2639

modules/completion/functions

@@ -0,0 +1 @@
+Subproject commit 8b89dd9d10e86313f49fafdf88e8540f97346f33