Support pmodule-allow-overrides feature (#1780)

main
mattmc3 5 years ago committed by Kaleb Elwert
parent c6efe80152
commit a3a51bdf6c

@ -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
if ! zstyle -t ':prezto:load' pmodule-allow-overrides 'yes'; then
print "$0: conflicting module locations: $locations" print "$0: conflicting module locations: $locations"
continue 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)

@ -18,6 +18,9 @@ zstyle ':prezto:*:*' color 'yes'
# Add additional directories to load prezto modules from # Add additional directories to load prezto modules from
# zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib # zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
# Allow module overrides when pmodule-dirs causes module name collisions
# zstyle ':prezto:load' pmodule-allow-overrides 'yes'
# Set the Zsh modules to load (man zshmodules). # Set the Zsh modules to load (man zshmodules).
# zstyle ':prezto:load' zmodule 'attr' 'stat' # zstyle ':prezto:load' zmodule 'attr' 'stat'

Loading…
Cancel
Save