zsh-workers
 help / color / mirror / code / Atom feed
From: "Atte Peltomäki" <koston@iki.fi>
To: zsh-workers@zsh.org
Subject: [PATCH] Add glob qualifier grouping operator to completion
Date: Thu, 20 Jul 2023 13:52:08 +0300	[thread overview]
Message-ID: <egj6ohaj5xye37qhy7xz37cgx7x54qpa7eivj2twsefprlptap@xuqmuf3cppjf> (raw)

Also improve wording in documentation to make glob qualifier grouping
easier to find by explicit use of terms 'logical OR' and 'logical AND'.
---
 Completion/Zsh/Type/_globquals | 1 +
 Doc/Zsh/expn.yo                | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

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 7bc736470..742a31870 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -3079,9 +3079,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 consequtive 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

-- 
Atte Peltomäki
"Your effort to remain what you are is what limits you"


             reply	other threads:[~2023-07-20 10:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-20 10:52 Atte Peltomäki [this message]
2023-07-22 23:01 ` Bart Schaefer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=egj6ohaj5xye37qhy7xz37cgx7x54qpa7eivj2twsefprlptap@xuqmuf3cppjf \
    --to=koston@iki.fi \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).