diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-12-09 21:13:51 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-12-09 21:13:51 +0000 |
| commit | 42120c197bb5f1d01d61ab326c972d8555e24a79 (patch) | |
| tree | 738cfb8bd58a66642377e7f61834b14a1a8f9457 | |
| parent | 9987b3034d5a311080f98d6a33bb51a15a23a83b (diff) | |
| download | zsh-interrupt_abort.tar.gz zsh-interrupt_abort.tar.xz zsh-interrupt_abort.zip | |
33942: always block to fix ZLS_COLORS interrupt_abort
Ensures we get the right state of $ZLS_COLORS at the end of _main_complete even if there's an interrupt. However, the "right state" is a bit messy as it depends on styles.
| -rw-r--r-- | Completion/Base/Core/_main_complete | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Completion/Base/Core/_main_complete b/Completion/Base/Core/_main_complete index 91b68fe5d..23b91d3a6 100644 --- a/Completion/Base/Core/_main_complete +++ b/Completion/Base/Core/_main_complete @@ -43,6 +43,8 @@ local -a precommands typeset -U _lastdescr _comp_ignore _comp_colors +{ + [[ -z "$curcontext" ]] && curcontext=::: zstyle -s ":completion:${curcontext}:" insert-tab tmp || tmp=yes @@ -349,17 +351,20 @@ fi ( "$_comp_force_list" = ?* && nm -ge _comp_force_list ) ]] && compstate[list]="${compstate[list]//messages} force" -if [[ "$compstate[old_list]" = keep ]]; then - if [[ $_saved_colors_set = 1 ]]; then - ZLS_COLORS="$_saved_colors" +} always { + # Stuff we always do to clean up. + if [[ "$compstate[old_list]" = keep ]]; then + if [[ $_saved_colors_set = 1 ]]; then + ZLS_COLORS="$_saved_colors" + else + unset ZLS_COLORS + fi + elif (( $#_comp_colors )); then + ZLS_COLORS="${(j.:.)_comp_colors}" else unset ZLS_COLORS fi -elif (( $#_comp_colors )); then - ZLS_COLORS="${(j.:.)_comp_colors}" -else - unset ZLS_COLORS -fi +} # Now call the post-functions. |