From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 15873 invoked from network); 20 Jul 2023 10:52:51 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 20 Jul 2023 10:52:51 -0000 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1689850371; b=JSFP0OfrgLr1Mz3L04ZHPFjtri/SOSSGczgJ/5I4k4CJ64WSrFohZ6no2YRcDGVvUznsA6hOHl bte6ZNtlG0YFg0ZypHjHaAYfYF4BhmMfpwQ6ZC0OX0V4EUuqCkZ/knLyT6PiniO1HYDc2JJlyK sB5hp56R8Ee1AIvj3ZyWhsPtlTW/00RVCsXU5zJUBC2pPvWSLskRCNrNgt6Hjqy88a2TDA02yl zqSvY2WNM/dVNaR1sZ+fXhaGRVTx+BOB1JJ9NKZ/3RgAhpuFF4T4EGHIQY3VDdZCCxSS+Do/Co JVEs1iTxrFSpQv+dPwmx5CaAo+PimIRBNnayaVLPgBit6g==; ARC-Authentication-Results: i=2; zsh.org; iprev=pass (lahtoruutu.iki.fi) smtp.remote-ip=185.185.170.37; dkim=pass header.d=iki.fi header.s=lahtoruutu header.a=rsa-sha256; dmarc=none header.from=iki.fi; arc=pass (i=1) header.s=lahtoruutu arc.oldest-pass=1 smtp.remote-ip=185.185.170.37 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1689850371; bh=1FXmRp1uZR8ySSc2p/g9kxYIixRlZibHi8dbzPcF0l8=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version: Message-ID:Subject:To:From:Date:DKIM-Signature:DKIM-Signature; b=W6pGxPnKLfMn5LTT0cPUN4jyNLpVsLHkrybgzmsVA+WzGn7MeS4CMmSsfj4HWps2rNKsI1BMxS D7bmF4KHVnJkZ+KebmnYjMzvUG7HtI5GqwlznkfQCu/Jnwaaer529kDWz8Dczq44FK+jTUsHEE Ph8K6Lj60Ii+HkN0bRyV40nCcf1AaKiRP5XL/lLVgO7nt/S1JMn7ETIue+xQIUbpC+gnBZRf7Y 8fECzPjjRbyl5gHBbXR2ErfUxeniMm7AYB5Frpa7E5q4rE76JS6AW0J/tTBNsDwhsxypj/rAGe KDBOjGGMkVbawjtieMTICTWuYf6GDFobVo3OW4bHvnlEFA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:Subject:To:From:Date:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=LUTAch7O5cpw/z0sLz1X6hZNzF0elcswu2eT56pjG28=; b=DOn+9ObvZMLFfdlZA4gYJl+3Pc SVrT+OgALnt5bKsJCiXhcJ5jypOHCed3Xk7LnGRukuKx+INb3u1ZqjdS5giC2maaEGsS9eSTGBctQ WBedqwjZ9B3ThFFfXga69k/ExT7sCYWiJI8p+DUSgb4gjhke+BBuQGx8j//sotWW7mkyhaT6GTSxI o7zNkD9WQlwSxuDMBCwlLYCeE0LfsgckM30QQpmyS5o5YecgJ197wjqqF+AK/0SIWf+JxX4LUz/AQ aOdq9ZmV6AD3QyWZLfpDXUz/0d2VxgvZ5nD8YSxirJ6+H8KkGAjUzGV8YUk+kEyuHzBrvVIZQXoVA 7byl44Yg==; Received: by zero.zsh.org with local id 1qMRH8-0004t4-Mx; Thu, 20 Jul 2023 10:52:50 +0000 Authentication-Results: zsh.org; iprev=pass (lahtoruutu.iki.fi) smtp.remote-ip=185.185.170.37; dkim=pass header.d=iki.fi header.s=lahtoruutu header.a=rsa-sha256; dmarc=none header.from=iki.fi; arc=pass (i=1) header.s=lahtoruutu arc.oldest-pass=1 smtp.remote-ip=185.185.170.37 Received: from lahtoruutu.iki.fi ([185.185.170.37]:52700) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1qMRGT-0004YQ-OW; Thu, 20 Jul 2023 10:52:12 +0000 Received: from moose (unknown [83.148.245.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: koston) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4R68dh51Nrz49Py8 for ; Thu, 20 Jul 2023 13:52:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1689850328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUTAch7O5cpw/z0sLz1X6hZNzF0elcswu2eT56pjG28=; b=dnIOZHAuxqAcwCVWot8iDhmdfki2az0/t5AcI90dMkS3nZEyRDoqhquMdIZBQLULmNPAbd gbsrCV+KsO810sC/ImKHoQGjJoSfOuYgVjOhbFtrMmwOrFbwvx6C7Wid8gawe0ygvwh8EB F1/gng7wkKGdqCFz6A1E+hMSDteuMLpqxs4s44g/M7hz15ayptvRfSuJDm9r5RzRz9eeUY iL54Did7ZPqQ+86OPTILJ0sMIqzbUjkDYYPVehhSZyNSmO3nV5wbryj8GBjKqLFKH8W2ek aK6Fx5bdHN55iQ3offiB9LU+kJJ83Te1HMfdlzb/nOPMNCiFIHamnxoxmAtekw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1689850328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUTAch7O5cpw/z0sLz1X6hZNzF0elcswu2eT56pjG28=; b=vXvZ2DgCZW+uq13MuePloAouoXlflyxIHGoiq1IahXESNnq4YoqTKpaEK/EEmjmtQMhgpd Jp74q50dYiLTY295ki/UAhdAw+w/ahyhD4mSnxisL4ODQ4YOfdkFTXzP0/Xp+C33OiAUoM FI7Uug2Xid4qZ4eu0FVrQZZCZnir9X7JAE+X+fuF6er6kZ1fUdkFcI0jVEQHp3so12txLW jQNpd+c98gkb8T5heDZZjqQQghbd5QI8XJ+MhiPmzwFY3ApV8vJiqvlm8Otl923KD74Ny8 7LA4WMIgFALKwi8cWL7nPgL8yjUNAFW1YAcnm63kAR2u3goSbPOyJJSPA4Z0nA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=koston smtp.mailfrom=koston@iki.fi ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1689850328; a=rsa-sha256; cv=none; b=vs/Z8gAyMFMoN3gwyHrGOTByfpECwt8xCa+LNTSdErMoZsnwqyqfdr6A2QTwpd3vJB76vM 6qi+ZWlLbrko3alWggmCpEha6U3SGVmuRKrCle0QHrPi9IT8sIDxo5NVLMQegD3zF0Sr+F eSyS/N3QKwx9hrQMmHJ02T76m7rPAia711KdyfYRT04FMuxvjU7TuzXfnpDO8QuX/bCMz2 V59G1NWqnZeFX9wyk3+Bb74g/YInw7Z94/M+ENipgHoX7eNYjVZ3JAEe7N21k7k3IL3Yio 4zzIrfUMBI16oHgMG/8VxRYxi12bdEp6cjvPsm4MOC+XjAGwMwrQlBVQeIZSEw== Date: Thu, 20 Jul 2023 13:52:08 +0300 From: Atte =?utf-8?Q?Peltom=C3=A4ki?= To: zsh-workers@zsh.org Subject: [PATCH] Add glob qualifier grouping operator to completion Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Seq: 51980 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: 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"