diff options
author | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-11 11:14:51 +0000 |
---|---|---|
committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-11 11:14:51 +0000 |
commit | 3076ed44d33ac699b306824214951c436c4a7a4e (patch) | |
tree | 2c743b047da4a14c36586dbf5011d80cc09e86b2 /Completion/Core/_main_complete | |
parent | 55b8857726ee7daf75b3dc1c1dd3ca4235868fd3 (diff) | |
download | zsh-3076ed44d33ac699b306824214951c436c4a7a4e.tar.gz zsh-3076ed44d33ac699b306824214951c436c4a7a4e.tar.xz zsh-3076ed44d33ac699b306824214951c436c4a7a4e.zip |
zsh-workers/9677
Diffstat (limited to 'Completion/Core/_main_complete')
-rw-r--r-- | Completion/Core/_main_complete | 57 |
1 files changed, 26 insertions, 31 deletions
diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete index 33a492bae..2381ae76d 100644 --- a/Completion/Core/_main_complete +++ b/Completion/Core/_main_complete @@ -128,8 +128,7 @@ if (( $compstate[nmatches] )); then fi fi fi -elif [[ compstate[matcher] -eq compstate[total_matchers] && - $#_lastdescr -ne 0 ]] && +elif [[ $#_lastdescr -ne 0 ]] && zstyle -s ":completion:${curcontext}:warnings" format format; then local str @@ -148,34 +147,30 @@ elif [[ compstate[matcher] -eq compstate[total_matchers] && compadd -UX "$format" -n '' fi -if [[ compstate[matcher] -eq compstate[total_matchers] || - compstate[nmatches] -ne 0 ]]; then - - # See which tags were or were not used. - - _used_tags=( "${(@)_tried_tags:#${(j:|:)~${(@)_failed_tags//\[/\\[}//\]/\\]}}" ) - _unused_tags=( "${(@)_offered_tags:#${(j:|:)~${(@)_used_tags//\[/\\[}//\]/\\]}}" ) - - # Now call the post-functions. - - for post in "$comppostfuncs[@]"; do - "$post" - done - comppostfuncs=() - - _lastcomp=( "${(@kv)compstate}" ) - _lastcomp[completer]="$comp" - _lastcomp[prefix]="$PREFIX" - _lastcomp[suffix]="$SUFFIX" - _lastcomp[iprefix]="$IPREFIX" - _lastcomp[isuffix]="$ISUFFIX" - _lastcomp[qiprefix]="$QIPREFIX" - _lastcomp[qisuffix]="$QISUFFIX" - _lastcomp[offered_tags]="${(j.:.)_offered_tags}" - _lastcomp[tried_tags]="${(j.:.)_tried_tags}" - _lastcomp[failed_tags]="${(j.:.)_failed_tags}" - _lastcomp[unused_tags]="${(j.:.)_unused_tags}" - _lastcomp[used_tags]="${(j.:.)_used_tags}" -fi +# See which tags were or were not used. + +_used_tags=( "${(@)_tried_tags:#${(j:|:)~${(@)_failed_tags//\[/\\[}//\]/\\]}}" ) +_unused_tags=( "${(@)_offered_tags:#${(j:|:)~${(@)_used_tags//\[/\\[}//\]/\\]}}" ) + +# Now call the post-functions. + +for post in "$comppostfuncs[@]"; do + "$post" +done +comppostfuncs=() + +_lastcomp=( "${(@kv)compstate}" ) +_lastcomp[completer]="$comp" +_lastcomp[prefix]="$PREFIX" +_lastcomp[suffix]="$SUFFIX" +_lastcomp[iprefix]="$IPREFIX" +_lastcomp[isuffix]="$ISUFFIX" +_lastcomp[qiprefix]="$QIPREFIX" +_lastcomp[qisuffix]="$QISUFFIX" +_lastcomp[offered_tags]="${(j.:.)_offered_tags}" +_lastcomp[tried_tags]="${(j.:.)_tried_tags}" +_lastcomp[failed_tags]="${(j.:.)_failed_tags}" +_lastcomp[unused_tags]="${(j.:.)_unused_tags}" +_lastcomp[used_tags]="${(j.:.)_used_tags}" return ret |