From ef8987b4e846659c346553aa0c5b6778cc82f442 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Sun, 3 Feb 2019 23:35:06 +0100
Subject: [PATCH] Read in the theme before cleaning up ...

It was wrong to source the theme file last, because 99_cleanup undefines
some functions that can be used by themes -- even by the default theme!
---
 ax.zsh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ax.zsh b/ax.zsh
index a13707b..d7f8098 100644
--- a/ax.zsh
+++ b/ax.zsh
@@ -175,21 +175,21 @@ else
 
 	# Read in all the plugins for the current "type":
 	for plugin ($plugin_list); do
-		axzsh_load_plugin "$plugin" "$script_type" "$cache_file"
-	done
-
-	# Read the "theme file", if any and in "zshrc" stage:
-	if [[ "$script_type" = "zshrc" ]]; then
-		if [[ -r "$AXZSH_THEME" ]]; then
-			source "$AXZSH_THEME"
-			if [[ -n "$cache_file" ]]; then
-				# Include the theme into the new cache file:
-				echo "# BEGIN Theme" >>"$cache_file"
-				echo 'source "$AXZSH_THEME"' >>"$cache_file"
-				echo "# END Theme" >>"$cache_file"
+		# Read the "theme file", if any and in "zshrc" stage.
+		# This must be done before 99_cleanup is run!
+		if [[ "$plugin:t" == "99_cleanup" && "$script_type" = "zshrc" ]]; then
+			if [[ -r "$AXZSH_THEME" ]]; then
+				source "$AXZSH_THEME"
+				if [[ -n "$cache_file" ]]; then
+					# Source the theme in the new cache file:
+					echo "# BEGIN Theme" >>"$cache_file"
+					echo 'source "$AXZSH_THEME"' >>"$cache_file"
+					echo "# END Theme" >>"$cache_file"
+				fi
 			fi
 		fi
-	fi
+		axzsh_load_plugin "$plugin" "$script_type" "$cache_file"
+	done
 fi
 
 # Clean up ...
-- 
2.39.2