diff options
| author | Atte Peltomäki <koston@iki.fi> | 2023-07-20 13:52:08 +0300 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2023-09-20 20:17:09 +0200 |
| commit | d92b1a3547e4d7e602316e12f0a896356579c1ab (patch) | |
| tree | ac12bf6bafc30b198279923716d89d69248e194b | |
| parent | bfc419e0c6dcc796b5171ae6c316fd60ffab8030 (diff) | |
| download | zsh-d92b1a3547e4d7e602316e12f0a896356579c1ab.tar.gz zsh-d92b1a3547e4d7e602316e12f0a896356579c1ab.tar.xz zsh-d92b1a3547e4d7e602316e12f0a896356579c1ab.zip | |
51980: Add glob qualifier grouping operator to completion
Also improve wording in documentation to make glob qualifier grouping easier to find by explicit use of terms 'logical OR' and 'logical AND'.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_globquals | 1 | ||||
| -rw-r--r-- | Doc/Zsh/expn.yo | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 44171d558..71e1b2f76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,13 @@ 2023-09-20 Oliver Kiddle <opk@zsh.org> + * Atte Peltomäki: 51980: Completion/Zsh/Type/_globquals, + Doc/Zsh/expn.yo: Add glob qualifier grouping operator to completion + * Jörg Sommer: 52102: Completion/Debian/Command/_apt: Add subcommand autopurge to apt completion - * Wesley Schwengle: 52141: Completion/Unix/Command/_git: add trailer - token completion for git commit --trailer + * Wesley Schwengle: 52141: Completion/Unix/Command/_git: + add trailer token completion for git commit --trailer * 52163: Completion/Unix/Command/_zfs: completion update for OpenZFS 2.2 diff --git a/Completion/Zsh/Type/_globquals b/Completion/Zsh/Type/_globquals index bc3165eba..beb47ed30 100644 --- a/Completion/Zsh/Type/_globquals +++ b/Completion/Zsh/Type/_globquals @@ -268,6 +268,7 @@ case $state in "P:prepend word" "Y:+ at most ARG matches" "[:+ range of files" + ",:logical OR" "):end of qualifiers" "\::modifier" ) diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo index 5be40bf25..86a5f70c8 100644 --- a/Doc/Zsh/expn.yo +++ b/Doc/Zsh/expn.yo @@ -3117,9 +3117,10 @@ so both can be used on the same glob expression; for example by writing ) enditem() -More than one of these lists can be combined, separated by commas. The -whole list matches if at least one of the sublists matches (they are -`or'ed, the qualifiers in the sublists are `and'ed). Some qualifiers, +Multiple consecutive qualifiers are joined into a list by implicit logical AND. +More than one of these lists can be combined using comma `tt(,)' as logical OR. +The whole list matches if at least one of the sublists matches. +Some qualifiers, however, affect all matches generated, independent of the sublist in which they are given. These are the qualifiers `tt(M)', `tt(T)', `tt(N)', `tt(D)', `tt(n)', `tt(o)', `tt(O)' and the subscripts given |