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,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 32673 invoked from network); 8 Apr 2021 02:12:55 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 8 Apr 2021 02:12:55 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1617847975; b=RB1qdVA3ndimW9jUdWft61yI/Sykyc7J/NONfAlFWsVEOa8sbBVQIaCrpYDFQ/mWsk/OrkTPdA ueuGv4wg4fFw7ihQ+Tzgw6EICOnNrq8TD7uGoM6Vo8qv6Lofx85iU9vD9KfCNLnGQC2ClEZUah niTGSZbQex8zoTikrbau4z/o0P22XVgeKDTm2BEPipwA9KjqUxUSm6+0s2SwBiGQ6n9VQ5ceqO Hd838t/u3nQDqcgs3zKhwT9s1o7FtN4WZpj4+k20V3Sny5avoe1us7alL6AgMXpx4n0PKZxora s3gu7DHzuOZXcrONpEGAAhdkLbg02GJLRuqwWbWxM8Cy4Q==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (out1-smtp.messagingengine.com) smtp.remote-ip=66.111.4.25; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20200801; t=1617847975; bh=5hwnPKZUspR/2fxoVC5cllg33gTFZuqlKUGRsIvPlQA=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:In-Reply-To:Content-Transfer-Encoding:Content-Type: MIME-Version:References:Message-ID:Subject:To:From:Date:DKIM-Signature: DKIM-Signature:DKIM-Signature; b=xI8V8Ds3OTNYxqcdRy5Rew1w9iGVvnwas3YNTNtir7O7p/7583ZJ9wERcaL1o/Q7+/+OcxSMqV eRFjbB44V66gZv/t6+tnv/3j4bt4PPH8HRPjqWWPrWfc8NH6GnPsT/yh0JC+elfehQuLnp3tP8 KlpoLX0UrrwkZGkW8lNbRl10tJnUGZdjIj5MbMBYgP1g7wYbEgizcqy/ql6RQwN+DkuctuSeMc 3UOc60+5B6gnTNqs+k7UWtnui66gY2j8v8W7QbQFtqQnnLQResbfvrgparH2mgYWXq32jpf7Du hY5xiRz3PJYcITZIMAdSu50um3YvEp3AP0Q8I4Zf4sI3sQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:In-Reply-To:Content-Transfer-Encoding :Content-Type:MIME-Version:References: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; bh=NqSMh4V+cONBnZxPxcmWmq85aY26isfQ001gA/KUiUw=; b=m2RQbXBkiHOcpD4GFxB/Fk9Aau f8gHGqJIY/wmJAlIZtgPL0HIXfywO6H4kz1Lr3wBHCZFDE6ZeHK6ztjXYpKG4FE6AYH5LYuOFbmrF zlJOPzKm12JcDy0U/LqhyjIPqnTEeDihMO9f1LRHDCO2SzIOBRJWyQQDgsptHqFczlqD+wxjkqoLb +IGdUXpvF3WwwN5puY58neA3GAzHHgTbL1b1NN8KUC7xpjyczxYCYaGX2G7k4fmCbZ5fHWBN6lcSh PWyqI9NISf86dD4bAb2Zem48s/EJaU46lO+cCP3pYNN8XoiqmO793/1Lfe9BTkwrQxZxaslMET6cy eAJQgIEg==; Received: from authenticated user by zero.zsh.org with local id 1lUKA9-0009n8-80; Thu, 08 Apr 2021 02:12:53 +0000 Authentication-Results: zsh.org; iprev=pass (out1-smtp.messagingengine.com) smtp.remote-ip=66.111.4.25; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36681) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1lUK9t-0009YJ-OV; Thu, 08 Apr 2021 02:12:38 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 7A7AF5C009A; Wed, 7 Apr 2021 22:12:36 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 07 Apr 2021 22:12:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:to:subject:message-id:references :mime-version:content-type:content-transfer-encoding :in-reply-to; s=fm3; bh=NqSMh4V+cONBnZxPxcmWmq85aY26isfQ001gA/KU iUw=; b=aiq6WQZYNhvBAm00aqXzrlPKsvw5QDnoH2IUGZaSVSbWFy6/NNNZqBSP qcQ9Vs14koa3U/78xY9eN/xm5ccg6dclqoi3fPPoeZuiSnb14cWSf+wsV7LJ7GqD bbjEwMYwl9OQaI1g/ga/DMIfpOmJNg2CUhmtGxCYAY74df4weTmXvlR2ScibYIvy 80qTKP8vetk3wAbzBK6Flnt/OBYXhN97HQ8GC+DWgqf/6oPwMcHe37J58h0hTj5c tIrGcx5JefPwcRZqt6FRqBnWcqoEjvwxdUxtoKH/5mnoRPyAxgHbpy8ANbENv1tb yQaefKReM7+pjAceGvZuxnNG59ZM4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=NqSMh4V+cONBnZxPxcmWmq85aY26isfQ001gA/KUi Uw=; b=tUN/s2xFA6RrI1n+XCOAm2Pu9XalJxQfu2u1tbWNn6OmYvxId7p7nku0e WoNusY7kwDnrFs4IMaijCaB5LLq33n/NAhrU1ESe0a1KErSAa9Y42z52+yNSmO4E 3VbcDYiKZtdhaCJGq9KSIG5JLzhRqICR00ORRshy7h2uYrmUYJrjJUxy6L7whucn ztM85y5mUnU1V2H93urCK47U+75F3nEjnOgxWN5mZk9LaEiOIVvJ59Y39+IoFa55 WjYos4NX4gj5rI7N2mtauaE9N6GVHU15iC6NCa9e26dsygQjV6y23ssygdS/8UWc oCPYNMn2bxUi0auwBSbGoo3ALK+7A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejkedgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggugfgjfgesth ektddttderudenucfhrhhomhepffgrnhhivghlucfuhhgrhhgrfhcuoegurdhssegurghn ihgvlhdrshhhrghhrghfrdhnrghmvgeqnecuggftrfgrthhtvghrnhepgfelhedtffeuhf egueelfeffjeegtddtleehvddvueeihfevgfdvgffhvedvkeetnecukfhppeejledrudek vddrfeeirddukedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepugdrshesuggrnhhivghlrdhshhgrhhgrfhdrnhgrmhgv X-ME-Proxy: Received: from tarpaulin.shahaf.local2 (bzq-79-182-36-181.red.bezeqint.net [79.182.36.181]) by mail.messagingengine.com (Postfix) with ESMTPA id D611624005E for ; Wed, 7 Apr 2021 22:12:35 -0400 (EDT) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4FG4Xd1MKwzmK; Thu, 8 Apr 2021 02:12:33 +0000 (UTC) Date: Thu, 8 Apr 2021 02:12:33 +0000 From: Daniel Shahaf To: Zsh hackers list Subject: Re: PATCH: _perl_modules assumes it's called by perl Message-ID: <20210408021233.GA15176@tarpaulin.shahaf.local2> References: <20210329150644.GA30806@tarpaulin.shahaf.local2> <728536af-2738-4cdb-bc56-f64b2ab8be30@www.fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <728536af-2738-4cdb-bc56-f64b2ab8be30@www.fastmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Seq: 48436 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: Daniel Shahaf wrote on Mon, Mar 29, 2021 at 15:28:52 +0000: > Bart Schaefer wrote on Mon, 29 Mar 2021 15:16 +00:00: > > On Mon, Mar 29, 2021 at 8:07 AM Daniel Shahaf wrote: > > > > > \> + if [[ $service == (perl|perldoc) ]]; then > > > + perl=${${(Q)words[1]}%doc} > > > > This still needs to be checked with "whence perl" to make [[ -n $perl > > ]] have the (intended but messed up) previous semantics. > > > > I otherwise agree with the intent of the patch. > > Thanks for the review. So, just add «whence -- $perl >/dev/null || perl=» after the quoted assignment? Interdiff: diff --git a/Completion/Unix/Type/_perl_modules b/Completion/Unix/Type/_perl_modules index 02b43366a..3e11de9ea 100644 --- a/Completion/Unix/Type/_perl_modules +++ b/Completion/Unix/Type/_perl_modules @@ -61,8 +61,8 @@ _perl_modules () { fi local perl perl_modules - if [[ $service == (perl|perldoc) ]]; then - perl=${${(Q)words[1]}%doc} + if [[ $service == (perl|perldoc) ]] && whence -- ${${(Q)words[1]}%doc} >/dev/null; then + perl=$_ perl_modules=_${${perl//[^[:alnum:]]/_}#_}_modules$with_pod elif whence perl > /dev/null; then perl=perl