|
|
@ -98,15 +98,17 @@ function pmodload {
|
|
|
|
else
|
|
|
|
else
|
|
|
|
locations=(${pmodule_dirs:+${^pmodule_dirs}/$pmodule(-/FN)})
|
|
|
|
locations=(${pmodule_dirs:+${^pmodule_dirs}/$pmodule(-/FN)})
|
|
|
|
if (( ${#locations} > 1 )); then
|
|
|
|
if (( ${#locations} > 1 )); then
|
|
|
|
print "$0: conflicting module locations: $locations"
|
|
|
|
if ! zstyle -t ':prezto:load' pmodule-allow-overrides 'yes'; then
|
|
|
|
continue
|
|
|
|
print "$0: conflicting module locations: $locations"
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
fi
|
|
|
|
elif (( ${#locations} < 1 )); then
|
|
|
|
elif (( ${#locations} < 1 )); then
|
|
|
|
print "$0: no such module: $pmodule"
|
|
|
|
print "$0: no such module: $pmodule"
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# Grab the full path to this module
|
|
|
|
# Grab the full path to this module
|
|
|
|
pmodule_location=${locations[1]}
|
|
|
|
pmodule_location=${locations[-1]}
|
|
|
|
|
|
|
|
|
|
|
|
# Add functions to $fpath.
|
|
|
|
# Add functions to $fpath.
|
|
|
|
fpath=(${pmodule_location}/functions(/FN) $fpath)
|
|
|
|
fpath=(${pmodule_location}/functions(/FN) $fpath)
|
|
|
|