Browse Source

Support pmodule-allow-overrides feature (#1780)

master
mattmc3 5 years ago committed by Kaleb Elwert
parent
commit
baefcbd398
  1. 4
      init.zsh
  2. 3
      runcoms/zpreztorc

4
init.zsh

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

3
runcoms/zpreztorc

@ -18,6 +18,9 @@ zstyle ':prezto:*:*' color 'yes' @@ -18,6 +18,9 @@ zstyle ':prezto:*:*' color 'yes'
# Add additional directories to load prezto modules from
# 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).
# zstyle ':prezto:load' zmodule 'attr' 'stat'

Loading…
Cancel
Save