From e6cc1ece7fed93fd31ca4e7f7726de034ede887c Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Tue, 15 Feb 2000 09:07:09 +0000
Subject: zsh-workers/9731

---
 Completion/Core/_setup | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Completion/Core/_setup')

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
-- 
cgit 1.4.1