From cf5fb88b39c30d7f0612d524cb7b526776aed2cb Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Fri, 30 Mar 2012 15:45:44 -0400
Subject: [PATCH] [Fix #76] Load Zsh functions, modules in zshrc

---
 init.zsh        | 26 +++++++++++++++++---------
 templates/zshrc |  8 +++++++-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/init.zsh b/init.zsh
index 9514646..87e757a 100644
--- a/init.zsh
+++ b/init.zsh
@@ -30,6 +30,20 @@ fpath=(
   $fpath
 )
 
+# Autoload Zsh modules.
+zstyle -a ':omz:load' module 'zsh_modules'
+for zsh_module in "$zsh_modules[@]"; do
+  zmodload "${(z)zsh_module}"
+done
+unset zsh_modules zsh_module
+
+# Autoload Zsh functions.
+zstyle -a ':omz:load' function 'zsh_functions'
+for zsh_function in "$zsh_functions[@]"; do
+  autoload -Uz "$zsh_function"
+done
+unset zsh_functions zsh_function
+
 # Load and initialize the completion system ignoring insecure directories.
 autoload -Uz compinit && compinit -i
 
@@ -45,12 +59,6 @@ source "${0:h}/spectrum.zsh"
 source "${0:h}/alias.zsh"
 source "${0:h}/utility.zsh"
 
-# Autoload Zsh functions.
-autoload -Uz age
-autoload -Uz zargs
-autoload -Uz zcalc
-autoload -Uz zmv
-
 # Source plugins defined in ~/.zshrc.
 for plugin in "$plugins[@]"; do
   if [[ ! -d "${0:h}/plugins/$plugin" ]]; then
@@ -70,12 +78,12 @@ unset plugin plugins
 # Autoload Oh My Zsh functions.
 for fdir in "$fpath[@]"; do
   if [[ "$fdir" == ${0:h}/(|*/)functions ]]; then
-    for func in $fdir/[^_.]*(N.:t); do
-      autoload -Uz $func
+    for omz_function in $fdir/[^_.]*(N.:t); do
+      autoload -Uz "$omz_function"
     done
   fi
 done
-unset fdir func
+unset fdir omz_function
 
 # Set environment variables for launchd processes.
 if [[ "$OSTYPE" == darwin* ]]; then
diff --git a/templates/zshrc b/templates/zshrc
index deced37..22deb61 100644
--- a/templates/zshrc
+++ b/templates/zshrc
@@ -20,7 +20,13 @@ zstyle ':omz:*:*' color 'yes'
 # Auto set the tab and window titles.
 zstyle ':omz:terminal' auto-title 'yes'
 
-# Set the plugins to load (see $OMZ/plugins/).
+# Set the Zsh modules to load (man zshmodules).
+# zstyle ':omz:load' module 'attr' 'stat'
+
+# Set the Zsh functions to load (man zshcontrib).
+# zstyle ':omz:load' function 'zargs' 'zmv'
+
+# Set the plugins to load (browse plugins).
 zstyle ':omz:load' plugin 'archive' 'git'
 
 # Set the prompt theme to load.