From c6bc0845e9517c32921fd34a74903f161a5269db Mon Sep 17 00:00:00 2001 From: Ben O'Hara Date: Sun, 17 Jun 2012 14:58:48 +1000 Subject: [PATCH] Fixes loading the functions under older zsh versions --- helper.zsh | 27 +++++++++++---------------- modules/prompt/init.zsh | 7 ------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/helper.zsh b/helper.zsh index 7c960b20..e6515abc 100644 --- a/helper.zsh +++ b/helper.zsh @@ -38,22 +38,8 @@ function omodload { # $argv is overridden in the anonymous function. omodules=("$argv[@]") - function { - local ofunction - - # 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 - } + # Extended globbing is needed for listing autoloadable function directories. + setopt LOCAL_OPTIONS EXTENDED_GLOB for omodule in "$omodules[@]"; do if zstyle -t ":omz:module:$omodule" loaded; then @@ -68,6 +54,15 @@ function omodload { if (( $? == 0 )); then 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 zstyle ":omz:module:$omodule" loaded 'no' fi diff --git a/modules/prompt/init.zsh b/modules/prompt/init.zsh index 749d706f..a92eb233 100644 --- a/modules/prompt/init.zsh +++ b/modules/prompt/init.zsh @@ -8,13 +8,6 @@ # Load and execute the prompt theming system. autoload -Uz promptinit && promptinit -# Check for the minimum supported version. -min_zsh_version='4.3.10' -if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then - return 1 -fi -unset min_zsh_version - # Load the prompt theme. zstyle -a ':omz:module:prompt' theme 'prompt_argv' if (( $#prompt_argv > 0 )); then