about summary refs log tree commit diff
path: root/Completion/Core/_setup
diff options
context:
space:
mode:
Diffstat (limited to 'Completion/Core/_setup')
-rw-r--r--Completion/Core/_setup5
1 files changed, 4 insertions, 1 deletions
diff --git a/Completion/Core/_setup b/Completion/Core/_setup
index b3b2bdb33..4c45cc271 100644
--- a/Completion/Core/_setup
+++ b/Completion/Core/_setup
@@ -3,12 +3,15 @@
 local val nm="$compstate[nmatches]"
 
 if zstyle -a ":completion:${curcontext}:$1" list-colors val; then
-  zmodload -e zsh/complist || zmodload -i zsh/complist
+  zmodload -i zsh/complist
   if [[ "$1" = default ]]; then
     ZLS_COLORS="${(j.:.)${(@)val:gs/:/\\\:}}"
   else
     eval "ZLS_COLORS=\"(${1})\${(j.:(${1}).)\${(@)val:gs/:/\\\:}}:\${ZLS_COLORS}\""
   fi
+elif [[ "$1" = default && -n "$ZLS_COLORS$ZLS_COLOURS" ]]; then
+  zmodload -i zsh/complist
+  ZLS_COLORS="$ZLS_COLORS$ZLS_COLOURS"
 fi
 
 if zstyle -s ":completion:${curcontext}:$1" list-packed val; then