1
0
Fork 0

Fixes loading the functions under older zsh versions

omodule not omodules

omodules
pull/199/head
Ben O'Hara 13 years ago
parent 00348eca51
commit 146852ac4d

@ -38,22 +38,8 @@ function omodload {
# $argv is overridden in the anonymous function. # $argv is overridden in the anonymous function.
omodules=("$argv[@]") omodules=("$argv[@]")
function { # Extended globbing is needed for listing autoloadable function directories.
local ofunction setopt LOCAL_OPTIONS EXTENDED_GLOB
# Extended globbing is needed for listing autoloadable function directories.
setopt LOCAL_OPTIONS EXTENDED_GLOB
# Add functions to fpath.
fpath=(${omodules:+${OMZ}/modules/${^omodules}/functions(/FN)} $fpath)
# Load Oh My Zsh functions.
for ofunction in \
$OMZ/modules/${^omodules}/functions/^([_.]*|prompt_*_setup|README*)(.N:t)
do
autoload -Uz "$ofunction"
done
}
for omodule in "$omodules[@]"; do for omodule in "$omodules[@]"; do
if zstyle -t ":omz:module:$omodule" loaded; then if zstyle -t ":omz:module:$omodule" loaded; then
@ -68,6 +54,15 @@ function omodload {
if (( $? == 0 )); then if (( $? == 0 )); then
zstyle ":omz:module:$omodule" loaded 'yes' zstyle ":omz:module:$omodule" loaded 'yes'
# Add functions to fpath.
fpath=(${omodules:+${OMZ}/modules/${^omodules}/functions(/FN)} $fpath)
# Load Oh My Zsh functions.
for ofunction in \
$OMZ/modules/${^omodules}/functions/^([_.]*|prompt_*_setup|README*)(.N:t)
do
autoload -Uz "$ofunction"
done
else else
zstyle ":omz:module:$omodule" loaded 'no' zstyle ":omz:module:$omodule" loaded 'no'
fi fi

@ -1 +1 @@
Subproject commit 8b89dd9d10e86313f49fafdf88e8540f97346f33 Subproject commit 39e26ca01fabcaa6f20d4638f56f9866a82f2b1f
Loading…
Cancel
Save