From 427d2620248ca3ef3fbda3190ecce8432348d832 Mon Sep 17 00:00:00 2001
From: Pierre Carru <pierre.carru@gmail.com>
Date: Thu, 28 Aug 2014 15:37:22 +0100
Subject: [PATCH] New function pmodload_path loads pmodules from specified path
 pmodload uses pmodload_path with the default module location

---
 init.zsh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/init.zsh b/init.zsh
index 75adfe51..502594cb 100644
--- a/init.zsh
+++ b/init.zsh
@@ -23,15 +23,22 @@ unset min_zsh_version
 
 # Loads Prezto modules.
 function pmodload {
+  pmodload_path "${ZDOTDIR:-$HOME}/.zprezto/modules" "$argv[@]"
+}
+
+function pmodload_path {
   local -a pmodules
+  local modules_path
   local pmodule
   local pfunction_glob='^([_.]*|prompt_*_setup|README*)(-.N:t)'
 
+  modules_path="${argv[1]}"
+  shift
   # $argv is overridden in the anonymous function.
   pmodules=("$argv[@]")
 
   # Add functions to $fpath.
-  fpath=(${pmodules:+${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions(/FN)} $fpath)
+  fpath=(${pmodules:+${modules_path}/${^pmodules}/functions(/FN)} $fpath)
 
   function {
     local pfunction
@@ -40,7 +47,7 @@ function pmodload {
     setopt LOCAL_OPTIONS EXTENDED_GLOB
 
     # Load Prezto functions.
-    for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions/$~pfunction_glob; do
+    for pfunction in ${modules_path}/${^pmodules}/functions/$~pfunction_glob; do
       autoload -Uz "$pfunction"
     done
   }
@@ -49,19 +56,19 @@ function pmodload {
   for pmodule in "$pmodules[@]"; do
     if zstyle -t ":prezto:module:$pmodule" loaded 'yes' 'no'; then
       continue
-    elif [[ ! -d "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule" ]]; then
+    elif [[ ! -d "${modules_path}/$pmodule" ]]; then
       print "$0: no such module: $pmodule" >&2
       continue
     else
-      if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh" ]]; then
-        source "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh"
+      if [[ -s "${modules_path}/$pmodule/init.zsh" ]]; then
+        source "${modules_path}/$pmodule/init.zsh"
       fi
 
       if (( $? == 0 )); then
         zstyle ":prezto:module:$pmodule" loaded 'yes'
       else
         # Remove the $fpath entry.
-        fpath[(r)${ZDOTDIR:-$HOME}/.zprezto/modules/${pmodule}/functions]=()
+        fpath[(r)${modules_path}/${pmodule}/functions]=()
 
         function {
           local pfunction
@@ -71,7 +78,7 @@ function pmodload {
           setopt LOCAL_OPTIONS EXTENDED_GLOB
 
           # Unload Prezto functions.
-          for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/functions/$~pfunction_glob; do
+          for pfunction in ${modules_path}/$pmodule/functions/$~pfunction_glob; do
             unfunction "$pfunction"
           done
         }