diff options
author | Oliver Kiddle <opk@zsh.org> | 2017-10-11 01:23:53 +0200 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2017-10-11 01:23:53 +0200 |
commit | 04a7dca3b0aa7659846e66415a2021b1562492f5 (patch) | |
tree | 43e341073477569deaace6a1f3d5912748b01ea3 | |
parent | 233c0e89032950a031c7e559b4f71944d49e4664 (diff) | |
download | zsh-04a7dca3b0aa7659846e66415a2021b1562492f5.tar.gz zsh-04a7dca3b0aa7659846e66415a2021b1562492f5.tar.xz zsh-04a7dca3b0aa7659846e66415a2021b1562492f5.zip |
41831: fix compset usage in ogg123 completion and tweak where compset -p is a better choice than -P
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Completion/Unix/Command/_less | 2 | ||||
-rw-r--r-- | Completion/Unix/Command/_vorbis | 2 | ||||
-rw-r--r-- | Completion/Unix/Type/_tilde_files | 2 | ||||
-rw-r--r-- | Completion/Zsh/Type/_globquals | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index e7d6e988a..0c80025ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-10-10 Oliver Kiddle <opk@zsh.org> + * 41831: Completion/Unix/Type/_tilde_files, + Completion/Unix/Command/_less, Completion/Unix/Command/_vorbis, + Completion/Zsh/Type/_globquals: fix compset usage in ogg123 + completion and tweak where compset -p is a better choice than -P + * 41835: Src/Zle/complete.c: handle multibyte characters with compset -p and -s diff --git a/Completion/Unix/Command/_less b/Completion/Unix/Command/_less index 9092010f2..7f01952d2 100644 --- a/Completion/Unix/Command/_less +++ b/Completion/Unix/Command/_less @@ -91,7 +91,7 @@ _arguments -S -s -A "[-+]*" \ if [[ -n "$state" ]]; then case $state in prompts) - if compset -P \?; then + if compset -p 1; then _message -e prompt else _describe 'prompt' '( diff --git a/Completion/Unix/Command/_vorbis b/Completion/Unix/Command/_vorbis index eee4f7a5e..cb3e3f9d8 100644 --- a/Completion/Unix/Command/_vorbis +++ b/Completion/Unix/Command/_vorbis @@ -79,7 +79,7 @@ case $service in esac if [[ $state = devopts ]]; then - if compset -p '*:'; then + if compset -P '*:'; then _message -e value value else _wanted devopts expl 'device option' \ diff --git a/Completion/Unix/Type/_tilde_files b/Completion/Unix/Type/_tilde_files index b1b3b37f0..0ee12332b 100644 --- a/Completion/Unix/Type/_tilde_files +++ b/Completion/Unix/Type/_tilde_files @@ -29,7 +29,7 @@ case "$PREFIX" in _files "$@" -W "$user" ;; \~*) - compset -P '?' + compset -p 1 local -a expl=( "$@" ) _alternative -O expl users:user:_users named-directories:'named directory':'compadd -k nameddirs' ;; diff --git a/Completion/Zsh/Type/_globquals b/Completion/Zsh/Type/_globquals index a904bdf0d..c855b540e 100644 --- a/Completion/Zsh/Type/_globquals +++ b/Completion/Zsh/Type/_globquals @@ -167,7 +167,7 @@ while [[ -n $PREFIX ]]; do ([oO]) # complete/skip sort spec - if ! compset -P "?"; then + if ! compset -p 1; then alts=( "n:lexical order of name" "L:size of file" |