diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-15 09:45:33 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-15 09:45:33 +0000 |
| commit | 854c9fdafa2d0c63442d98cce1b87c0ec51c8cde (patch) | |
| tree | 07b4fd92a19a49614ed1ccc113f46a09d714d604 /Completion | |
| parent | df3478da4e559af872e9ea813320bfa6876fb933 (diff) | |
| download | zsh-854c9fdafa2d0c63442d98cce1b87c0ec51c8cde.tar.gz zsh-854c9fdafa2d0c63442d98cce1b87c0ec51c8cde.tar.xz zsh-854c9fdafa2d0c63442d98cce1b87c0ec51c8cde.zip | |
zsh-workers/8272
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Base/_describe | 2 | ||||
| -rw-r--r-- | Completion/Base/_values | 9 | ||||
| -rw-r--r-- | Completion/Core/compinit | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/Completion/Base/_describe b/Completion/Base/_describe index c0b3d7174..2bb32ad35 100644 --- a/Completion/Base/_describe +++ b/Completion/Base/_describe @@ -50,7 +50,7 @@ shift if [[ -n "$showd" ]]; then compdescribe -I ' -- ' "$@" else - compdescribe -i ' -- ' "$@" + compdescribe -i "$@" fi [[ -n "$isopt" && "$compconfig[option_prefix]" = hide* ]] && hide=yes diff --git a/Completion/Base/_values b/Completion/Base/_values index 549c71ff8..0c8f19a9f 100644 --- a/Completion/Base/_values +++ b/Completion/Base/_values @@ -82,13 +82,8 @@ if compvalues -i "$@"; then eval ws\=\( "${action[3,-3]}" \) - if [[ -n "$compconfig[describe_values]" && - "$compconfig[describe_values]" != *\!${cmd}* ]] && - compdisplay tmp ' -- ' "$ws[@]"; then - compadd "$expl[@]" -M 'r:|[_-]=* r:|=*' -ld tmp - "${(@)ws%%:*}" - else - compadd "$expl[@]" - "${(@)ws%%:*}" - fi + _describe "$descr" ws -M 'r:|[_-]=* r:|=*' + elif [[ "$action" = \(*\) ]]; then # Anything inside `(...)' is added directly. diff --git a/Completion/Core/compinit b/Completion/Core/compinit index 914c446b2..2e470c1f8 100644 --- a/Completion/Core/compinit +++ b/Completion/Core/compinit @@ -78,10 +78,6 @@ while [[ $# -gt 0 && $1 = -[dDf] ]]; do fi done -# Load the helper module. - -zmodload computil - # The associative array containing the definitions for the commands. # Definitions for patterns will be stored in the normal arrays `_patcomps' # and `_postpatcomps'. |