diff options
author | Barton E. Schaefer <schaefer@zsh.org> | 2015-06-06 12:35:52 -0700 |
---|---|---|
committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-06-06 12:35:52 -0700 |
commit | a253ada08b43fafa25d6af2cc3c0bf248df50970 (patch) | |
tree | 8c76edd9f61382e3bc8f6e9c58742f47c3bb19e7 /Completion/Base/Core/_main_complete | |
parent | 229bc3cc74bfa8d6c23a02a3e0e89d7f08467dd1 (diff) | |
download | zsh-a253ada08b43fafa25d6af2cc3c0bf248df50970.tar.gz zsh-a253ada08b43fafa25d6af2cc3c0bf248df50970.tar.xz zsh-a253ada08b43fafa25d6af2cc3c0bf248df50970.zip |
35163: move "show-ambiguity" style to _setup so that more precise context can be applied
Diffstat (limited to 'Completion/Base/Core/_main_complete')
-rw-r--r-- | Completion/Base/Core/_main_complete | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Completion/Base/Core/_main_complete b/Completion/Base/Core/_main_complete index 977ab49ee..c023268b3 100644 --- a/Completion/Base/Core/_main_complete +++ b/Completion/Base/Core/_main_complete @@ -36,7 +36,8 @@ local func funcs ret=1 tmp _compskip format nm call match min max i num\ _saved_list="${compstate[list]}" \ _saved_insert="${compstate[insert]}" \ _saved_colors="$ZLS_COLORS" \ - _saved_colors_set=${+ZLS_COLORS} + _saved_colors_set=${+ZLS_COLORS} \ + _ambiguous_color='' # _precommand sets this to indicate we are following a precommand modifier local -a precommands @@ -349,12 +350,11 @@ elif [[ nm -eq 0 && -z "$_comp_mesg" && compadd -x "$mesg" fi -if zstyle -s ":completion:${curcontext}:" show-ambiguity tmp; then - local prefix=${${compstate[unambiguous]}[1,${compstate[unambiguous_cursor]}-1]} +if [[ -n "$_ambiguous_color" ]]; then local toquote='[=\(\)\|~^?*[\]#<>]' - [[ $tmp = (yes|true|on) ]] && tmp=4 + local prefix=${${compstate[unambiguous]}[1,${compstate[unambiguous_cursor]}-1]} [[ -n $prefix ]] && - _comp_colors+=( "=(#i)${prefix[1,-2]//?/(}${prefix[1,-2]//(#m)?/${MATCH/$~toquote/\\$MATCH}|)}${prefix[-1]//(#m)$~toquote/\\$MATCH}(#b)(?|)*==$tmp" ) + _comp_colors+=( "=(#i)${prefix[1,-2]//?/(}${prefix[1,-2]//(#m)?/${MATCH/$~toquote/\\$MATCH}|)}${prefix[-1]//(#m)$~toquote/\\$MATCH}(#b)(?|)*==$_ambiguous_color" ) fi [[ "$_comp_force_list" = always || |