axemojy.axzshtheme: Add support for "~/.system_emoji" file

[ax-zsh.git] / ax.zsh

diff --git a/ax.zsh b/ax.zsh
index a841af58ccd0d10eb5aea4ccb8580e4ca141a128..42c2792a6ae9a60a9ff606bff8bc1504a8945355 100644 (file)
--- a/ax.zsh
+++ b/ax.zsh
@@ -56,6 +56,10 @@ function axzsh_load_plugin {
                [[ -n "$AXZSH_DEBUG" ]] \
                        && echo "   - $plugin ($type): functions ..."
                axzsh_fpath+=("$dname/functions")
+
+               # Add function path to cache file.
+               [[ -n "$cache_file" ]] \
+                       && echo "axzsh_fpath+=('$dname/functions')" >>$cache_file
        fi
 
        if [[ -r "$fname" ]]; then
@@ -66,7 +70,7 @@ function axzsh_load_plugin {
 
                if [[ -n "$cache_file" ]]; then
                        # Add plugin data to cache
-                       printf "# BEGIN: %s\ninit()\n{\n" "$fname" >>"$cache_file"
+                       printf "# BEGIN: %s\nax_plugin_init()\n{\n" "$fname" >>"$cache_file"
                        case "$fname" in
                                *"/repos/"*)
                                        echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type): \"$fname\" ...'" >>$cache_file
@@ -76,7 +80,7 @@ function axzsh_load_plugin {
                                        echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type, cached) ...'" >>$cache_file
                                        "$cat_cmd" "$fname" >>"$cache_file"
                        esac
-                       printf "}\ninit\n# END: %s\n\n" "$fname" >>"$cache_file"
+                       printf "}\nax_plugin_init\n# END: %s\n\n" "$fname" >>"$cache_file"
                fi
        fi
 
@@ -126,6 +130,7 @@ if [[ -r "$cache_file" ]]; then
        [[ -n "$AXZSH_DEBUG" ]] \
                && echo "   - Reading cache file \"$cache_file\" ..."
        source "$cache_file"
+       unfunction ax_plugin_init
 else
        # No cache file available.
        # Setup list of plugins to load: