X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=ax.zsh;h=0071767967b2a04e6a8f363b2c1d437cb48e7468;hb=0812611b4afc9be26a8485c49ca4e3d884c168ca;hp=42c2792a6ae9a60a9ff606bff8bc1504a8945355;hpb=0352db4ec2697b1f2016087b897b3447290f8ebe;p=ax-zsh.git

diff --git a/ax.zsh b/ax.zsh
index 42c2792..0071767 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"
@@ -66,7 +70,22 @@ function axzsh_load_plugin {
 		# Read plugin ...
 		[[ -n "$AXZSH_DEBUG" ]] \
 			&& echo "   - $plugin ($type) ..."
-		source "$fname"
+
+		# Note for "external" ("repo/*") plugins and "dumb" terminals:
+		# These (modern?) plugins most probably don't expect such an
+		# unusual old terminal configuration and don't behave well
+		# (echo color sequences, for example). Therefore we DON'T load
+		# any external plugins at all when running on such a terminal:
+		# this results in reduced/disabled functionality, but hopefully
+		# in readable output ...
+
+		case "$fname" in
+			*"/repos/"*)
+				axzsh_is_dumb_terminal || source "$fname"
+				;;
+			*)
+				source "$fname"
+		esac
 
 		if [[ -n "$cache_file" ]]; then
 			# Add plugin data to cache
@@ -74,7 +93,7 @@ function axzsh_load_plugin {
 			case "$fname" in
 				*"/repos/"*)
 					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type): \"$fname\" ...'" >>$cache_file
-					echo "source '$fname'" >>$cache_file
+					echo "axzsh_is_dumb_terminal || source '$fname'" >>$cache_file
 					;;
 				*)
 					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type, cached) ...'" >>$cache_file