diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-07-18 13:10:07 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-07-18 13:10:07 +0000 |
| commit | 8c1b953b5a6c49d47f55d311d16852f94d2ebeed (patch) | |
| tree | bbd14925f61c99b3aa89067b89e82abbae4f253e /Completion | |
| parent | 40f651019666eba2c3c8a53055f16d28f6ed9385 (diff) | |
| download | zsh-8c1b953b5a6c49d47f55d311d16852f94d2ebeed.tar.gz zsh-8c1b953b5a6c49d47f55d311d16852f94d2ebeed.zip | |
add list-grouped option to make options and such be grouped together if they have the same description; matches with line-display strings can be hidden; hi and du capabalities in complist are only used if set by the user (15407)
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Base/Utility/_describe | 14 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_zstyle | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Completion/Base/Utility/_describe b/Completion/Base/Utility/_describe index a658d16df..a58954f47 100644 --- a/Completion/Base/Utility/_describe +++ b/Completion/Base/Utility/_describe @@ -2,8 +2,8 @@ # This can be used to add options or values with descriptions as matches. -local _opt _expl _tmps _tmpd _tmpmd _tmpms _ret=1 _showd _nm _hide _args -local _type=values _descr +local _opt _expl _tmps _tmpd _tmph _tmpmd _tmpms _tmpmh +local _type=values _descr _ret=1 _showd _nm _hide _args _grp # Get the option. @@ -21,6 +21,11 @@ fi # Do the tests. `showd' is set if the descriptions should be shown. zstyle -T ":completion:${curcontext}:$_type" verbose && _showd=yes +if zstyle -T ":completion:${curcontext}:$_type" list-grouped; then + _grp=(-g) +else + _grp=() +fi _descr="$1" shift @@ -33,12 +38,12 @@ while _tags; do while _next_label "$_type" _expl "$_descr"; do if [[ -n "$_showd" ]]; then - compdescribe -I ' -- ' "$@" + compdescribe -I ' -- ' "$_grp[@]" "$@" else compdescribe -i "$@" fi - while compdescribe -g _args _tmpd _tmpmd _tmps _tmpms; do + while compdescribe -g _args _tmpd _tmpmd _tmph _tmpmh _tmps _tmpms; do # See if we should remove the option prefix characters. @@ -53,6 +58,7 @@ while _tags; do fi compadd "$_args[@]" "$_expl[@]" -ld _tmpd -a _tmpmd && _ret=0 + compadd -n "$_args[@]" "$_expl[@]" -ld _tmph -a _tmpmh && _ret=0 compadd "$_args[@]" "$_expl[@]" -d _tmps -a _tmpms && _ret=0 done done diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle index 37590f0d9..c72109433 100644 --- a/Completion/Zsh/Command/_zstyle +++ b/Completion/Zsh/Command/_zstyle @@ -55,6 +55,7 @@ styles=( last-prompt c:bool list c:listwhen list-colors c: + list-grouped c:bool list-packed c:bool list-prompt c: list-rows-first c:bool |