diff options
| author | Oliver Kiddle <opk@zsh.org> | 2016-06-18 00:15:11 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2016-06-18 00:15:11 +0200 |
| commit | 2f67cd514fef304ac40d49e5bb9c40bcee31664a (patch) | |
| tree | 36d281ae2af7dc2a5d00c8be3f3afeb9b40c2b77 | |
| parent | bce43df70d1b09d9480dca36e6dd2641facdb6f0 (diff) | |
| download | zsh-2f67cd514fef304ac40d49e5bb9c40bcee31664a.tar.gz zsh-2f67cd514fef304ac40d49e5bb9c40bcee31664a.tar.xz zsh-2f67cd514fef304ac40d49e5bb9c40bcee31664a.zip | |
38707: strip suffix for glob qualifier completion
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Unix/Type/_files | 1 | ||||
| -rw-r--r-- | Completion/Unix/Type/_path_files | 1 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_globquals | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 26cf8861a..9a7f1db05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2016-06-18 Oliver Kiddle <opk@zsh.org> + * 38707: Completion/Zsh/Type/_globquals, + Completion/Unix/Type/_files, Completion/Unix/Type/_path_files: + strip suffix for glob qualifier completion + * 38703: Completion/Unix/Command/_su: support su options on macOS 2016-06-16 Peter Stephenson <p.stephenson@samsung.com> diff --git a/Completion/Unix/Type/_files b/Completion/Unix/Type/_files index fe0780a57..69878242f 100644 --- a/Completion/Unix/Type/_files +++ b/Completion/Unix/Type/_files @@ -7,6 +7,7 @@ local ret=1 # we don't want to complete them multiple times (for each file pattern). if _have_glob_qual $PREFIX; then compset -p ${#match[1]} + compset -S '[^\)\|\~]#(|\))' if [[ $_comp_caller_options[extendedglob] == on ]] && compset -P '\#'; then _globflags && ret=0 else diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files index 14c4cc753..6a1e89f05 100644 --- a/Completion/Unix/Type/_path_files +++ b/Completion/Unix/Type/_path_files @@ -17,6 +17,7 @@ local -a match mbegin mend if _have_glob_qual $PREFIX; then local ret=1 compset -p ${#match[1]} + compset -S '[^\)\|\~]#(|\))' if [[ $_comp_caller_options[extendedglob] == on ]] && compset -P '\#'; then _globflags && ret=0 else diff --git a/Completion/Zsh/Type/_globquals b/Completion/Zsh/Type/_globquals index 2523eb333..ed9c008a1 100644 --- a/Completion/Zsh/Type/_globquals +++ b/Completion/Zsh/Type/_globquals @@ -125,7 +125,7 @@ while [[ -n $PREFIX ]]; do alts+=("senses:sense:compadd -E 0 -d sdisp -S '' - + '' -") fi specmap=( M months w weeks h hours m minutes s seconds '(|+|-|d)' days) - alts+=('digits:digit ('${${specmap[(K)$timespec]}:-invalid time specifier}'):_dates -f ${${timespec/[-+]/d}:-d} -S ""' ) + alts+=('digits:digit ('${${specmap[(K)${timespec:-d}]}:-invalid time specifier}'):_dates -f ${${timespec/[-+]/d}:-d} -S ""' ) _alternative $alts return fi |