From c98420666ca530f3d1128f5eba4e4ea87f6d942c Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Tue, 15 Feb 2000 09:25:42 +0000 Subject: zsh-workers/9733 --- Completion/Core/_main_complete | 9 ++++++++- Completion/Core/_setup | 10 +++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'Completion/Core') diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete index 62ba446b0..3f71e2554 100644 --- a/Completion/Core/_main_complete +++ b/Completion/Core/_main_complete @@ -45,7 +45,14 @@ fi _setup default _def_menu_style=( "$_last_menu_style[@]" - ${SELECTMIN+select${SELECTMIN:+\=$SELECTMIN}} ) + +# We can't really do that because the current value of $SELECTMIN +# may be the one set by this function. +# There is a similar problem with $ZLS_COLORS in _setup. + +# ${SELECTMIN+select${SELECTMIN:+\=$SELECTMIN}} + + ) _last_menu_style=() # Get the names of the completers to use in the positional parameters. diff --git a/Completion/Core/_setup b/Completion/Core/_setup index 4c45cc271..408b5abfe 100644 --- a/Completion/Core/_setup +++ b/Completion/Core/_setup @@ -9,9 +9,13 @@ if zstyle -a ":completion:${curcontext}:$1" list-colors val; then 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" + +# Here is the problem mentioned in _main_complete. + +# 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