diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2016-10-22 21:53:21 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-10-22 21:53:21 -0700 |
| commit | 8e3e72793363a7d209af9c6a98b992e76aecc6c3 (patch) | |
| tree | a9991034b124f1114d9b4f33ad041c0713472776 /Completion/Base/Completer/_user_expand | |
| parent | 39688: Skip out of P_EXACTLY pattern loop if P_PURES. (diff) | |
| download | zsh-8e3e72793363a7d209af9c6a98b992e76aecc6c3.tar zsh-8e3e72793363a7d209af9c6a98b992e76aecc6c3.tar.gz zsh-8e3e72793363a7d209af9c6a98b992e76aecc6c3.tar.bz2 zsh-8e3e72793363a7d209af9c6a98b992e76aecc6c3.tar.lz zsh-8e3e72793363a7d209af9c6a98b992e76aecc6c3.tar.xz zsh-8e3e72793363a7d209af9c6a98b992e76aecc6c3.tar.zst zsh-8e3e72793363a7d209af9c6a98b992e76aecc6c3.zip | |
39710 (cf. Alex George: 39709): handle the %o format in the "all-expansions" tag
Also allow a single unique match to appear in the "expansions" tag of _expand in the same way as _user_expand (users/21955 commit 18200dc0)
Diffstat (limited to 'Completion/Base/Completer/_user_expand')
| -rw-r--r-- | Completion/Base/Completer/_user_expand | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Completion/Base/Completer/_user_expand b/Completion/Base/Completer/_user_expand index 066e2e8e5..ee39bb176 100644 --- a/Completion/Base/Completer/_user_expand +++ b/Completion/Base/Completer/_user_expand @@ -121,9 +121,14 @@ else (( $#space )) && compadd "$expl[@]" -UQ -qS " " -a space (( $#normal )) && compadd "$expl[@]" -UQ -qS "" -a normal fi - if _requested all-expansions expl "all expansions${REPLY:+: $REPLY}"; then + if _requested all-expansions; then local disp dstr + if [[ "$sort" = menu ]]; then + _description all-expansions expl "all expansions${REPLY:+: $REPLY}" "o:$word" + else + _description -V all-expansions expl "all expansions${REPLY:+: $REPLY}" "o:$word" + fi if [[ "${#${exp}}" -ge COLUMNS ]]; then disp=( -ld dstr ) dstr=( "${(r:COLUMNS-5:)exp} ..." ) |