X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ax.zsh;h=c5ffeab120dd739f790d565978176188231c0a75;hb=49441735bdf56dc0600ad2f71dbde753ff7f0585;hp=a841af58ccd0d10eb5aea4ccb8580e4ca141a128;hpb=d1529bb40528aafd9bdb98ba5a03d4ecb79d82bb;p=ax-zsh.git

diff --git a/ax.zsh b/ax.zsh
index a841af5..c5ffeab 100644
--- a/ax.zsh
+++ b/ax.zsh
@@ -41,6 +41,10 @@ function axzsh_load_plugin {
 			# Oh My ZSH plugin
 			type="plugin.zsh"
 			fname="$dname/${plugin_short}.plugin.zsh"
+		elif [[ -r "$dname/${plugin_short##zsh-}.plugin.zsh" ]]; then
+			# Oh My ZSH plugin with "zsh-" prefix stripped
+			type="plugin.zsh"
+			fname="$dname/${plugin_short##zsh-}.plugin.zsh"
 		elif [[ -r "$dname/init.zsh" ]]; then
 			# Prezto module
 			type="init.zsh"
@@ -56,6 +60,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 +74,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 +84,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 +134,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: