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 29847 invoked from network); 25 Oct 2020 20:12:42 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 25 Oct 2020 20:12:42 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1603656762; b=c28GOMxCch+d6MYCOmXZOWAxxdrAKZmFPT2Yl3HrVIdbDHiEAyWehQYt9uvWUzPtOhArJin2Tm tfZVTckO77yG0UCdP0NkeY6QdGVkQaEDjFn+2WrEZMmimFMphOS6NeumL7wZY8jv3i4tbee+Jl 9TmMmjS8/nzlmebwGb6qbYT2aVYxiOQ+G5Y/Yc3XxuG4slHNAT5vUoZ+o9L7bjBhz+MGRd8ozK hqV7WKwYsBKsguOQyAoTTBBgWuFDdVIqX9xyDB7YjNVwFKm3qeb+qPr8/ld7SyDalbksvdSmXS Hvf+8QHj0z1WgV6Sc62QDmRNOqzGxBMcOAT07iBCkNyynQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (out4-smtp.messagingengine.com) smtp.remote-ip=66.111.4.28; dkim=pass header.d=daniel.shahaf.name header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 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=1603656762; bh=+fx9H/UcY2kQJRxlqeLA0uyitIT41hNqlfNN0jbRtpM=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date:DKIM-Signature: DKIM-Signature:DKIM-Signature; b=qU0z9bJ8JPEG26W42twH0sjnOCYJVv3lMOTrZdwGycNt6QfGPFd1yl/lneAer6Zzb2/Ibk2j1y 2esJA4/zc4UsfQeAivIzBSbuWnK191I1Gwe1Gyn/Sijqrd0o/EiqJ+HfyEbjuKVhvZ+Wtgi+KE 6NS1iqjEggSOAkFca6nymhFMXUwpYQAohGtedh4PWBBniBf56b5lv90kwBw6thXMLluOTdPRbz MHKNjN37xl7O2dsBQfqhqexEJl2GL7XUHUnWWjzaa/arWxa3xTrueo6FJtn0IyPJhiYeUQxqOW u+NqcbDXy2UwuO40IYTaqEhAVSZaPoV0x9DO4x1AMQL+Wg==; 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:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=fnyEKlSDQLtBFxozGQMk0Kkfuatcv3B3fItTKEkuTSI=; b=FiqkcJgDWj9GZCMTjYwhtynDzQ 2wxdyNlhuHDpuftgfaKyh1LdDHEW2LY+qgkpfYKHBjv3m2VDN/j2vCK5Y0DMMb2nSMF0fGOAWMwxl VubwZ45WxwKBUTqAU2/5VfMbAo/Ch5UO80UTR/Nm0jmBQEqUSIHxvBQqR43wbrkmGF1RtwqzjbfAm UusX+UjlTrdwvq7QYdjIFTORsOMk0nN2EuG5fClFjIoou498Hn5/8tub5aHRzDOlijQCIMWMmdlNP eQcTVWDX7P9cJ812HW4lKTrwyEC/Oim2qnib10ViND6k8vrN/kHoO5/+uQ6u2Au7APmSzTValHdnp HtdSv+/g==; Received: from authenticated user by zero.zsh.org with local id 1kWmNZ-0009xA-5i; Sun, 25 Oct 2020 20:12:37 +0000 Authentication-Results: zsh.org; iprev=pass (out4-smtp.messagingengine.com) smtp.remote-ip=66.111.4.28; dkim=pass header.d=daniel.shahaf.name header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58727) by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) id 1kWmNM-0009oz-5u; Sun, 25 Oct 2020 20:12:24 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 764F95C00E4; Sun, 25 Oct 2020 16:12:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 25 Oct 2020 16:12:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:to:cc:subject:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding; s=fm1; bh=fnyEKlSDQLtBFxozGQMk0Kkfua tcv3B3fItTKEkuTSI=; b=jcoUwuWLbiKPrLxAU12IG6dEAwyDxTjwsc1a6Bu8UM yUNa0c4ngw92uLcKSAU5OqdE9bS2TKff4muuvfA0McIneuvO6ovpUSTt9O7gyOKH 0Iuj32nMrWLCrLrxo0aKq8JsiMJKuNUrOtrxKO1ZqOigILYlrhUjp4mIPAg49ltI yvqzmPVsdo/Wam4cPkaS5cEC4WyeBno56bv2Yo2JDmA8SQUv/BgiT3hCXMnmmz4x +dybNPs/Rzs6RxEbVNdV5KnqGalmMv+ECSvRP/MKiX3OUShxo4z1QmnYm2DSkmFU ibMZioHvUCUiroAmWW9yYkjYvMTQap0rW+6o653/bhGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=fm1; bh=fnyEKlSDQLtBFxozGQMk0Kkfuatcv3B3fItTKEkuT SI=; b=TJAGHYi7d6rTgmEZEz+6OQsQZycHm46XqmPaYmEBszNSfqlVLlUigQH44 4hdL0RxOJYupgUbeWE7EYeJk6Sy/iV1FclXfhZ5GoETmOlva6nw0cKYLV9vhXxRL k+v0veNBY9SVs36khP/jsu0v8lWJR+myvY5Yj/SClLxKSLbrSlPN+19Aipsz9ly2 yGwj+oJmqwvC273qaMgO/bvwN4voY++x4XyQPLWbiQyCPp/JNcqBTfbvonCfiXqv Xm9c8Hi+yTSxKHvKLlq/O7KAM73/ZtnRIAMvIGMCwFnuhUwtVb00TRfEcNvJn3UF vsVmIiC92SHRkA6XMWUNp9TE1MX2g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeeggddufeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkjghfofggtgfgsehtqh dttdertdejnecuhfhrohhmpeffrghnihgvlhcuufhhrghhrghfuceougdrshesuggrnhhi vghlrdhshhgrhhgrfhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpedtgeegfffghffhge efgefglefguefgvedvgfeuledthfetudefheejueffveehveenucffohhmrghinhepiihs hhdrohhrghenucfkphepuddtledrieeirddufedrvddvjeenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegurdhssegurghnihgvlhdrshhhrghh rghfrdhnrghmvg X-ME-Proxy: Received: from tarpaulin.shahaf.local2 (bzq-109-66-13-227.red.bezeqint.net [109.66.13.227]) by mail.messagingengine.com (Postfix) with ESMTPA id 00FAF3064674; Sun, 25 Oct 2020 16:12:23 -0400 (EDT) Received: from tarpaulin.shahaf.local2 (localhost [IPv6:::1]) by tarpaulin.shahaf.local2 (Postfix) with ESMTP id 4CK8Jj3cZdzvn; Sun, 25 Oct 2020 20:12:21 +0000 (UTC) Date: Sun, 25 Oct 2020 20:12:19 +0000 From: Daniel Shahaf To: Mikael Magnusson Cc: Zsh hackers list Subject: Re: [regression] %2K prompt expansion no longer works Message-ID: <20201025201219.24ef0ddc@tarpaulin.shahaf.local2> In-Reply-To: References: <20200830111346.xulnbxoqxduetnoz@chazelas.org> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Seq: 47499 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: Archived-At: Mikael Magnusson wrote on Sat, 24 Oct 2020 16:21 +0200: > On 8/30/20, Stephane Chazelas wrote: > > $ print -rnP %2K | hd > > 00000000 1b 5b 34 30 6d |.[40m| > > 00000005 > > =20 > > %K{2} is fine: =20 > > > > $ print -rnP '%K{2}' | hd > > 00000000 1b 5b 34 32 6d |.[42m| > > 00000005 > > > > Introduced by worker:30496 > > (https://www.zsh.org/mla/workers/2012/msg00421.html > > 8a9b141652a0e4157056dc21e36a64ac712a7ee7 git commit). > > > > Oddly, the comment there: > > =20 > >> Well, nobody objected so here's a version with de-duplicated > >> code. The previous patch broke %K, but it works now (passed 1 > >> for is_fg on both paths). =20 > > > > Actually describes the bug here. Looks like Mikael just missed a bit in > > that > > fix. > > > > Should be fixed with: > > > > > > diff --git a/Src/prompt.c b/Src/prompt.c > > index bc9734720..997327e18 100644 > > --- a/Src/prompt.c > > +++ b/Src/prompt.c > > @@ -258,7 +258,7 @@ parsecolorchar(zattr arg, int is_fg) > > bv->fm--; =20 > > } > > } else =20 > > - arg =3D match_colour(NULL, 1, arg); > > + arg =3D match_colour(NULL, is_fg, arg); > > return arg; =20 > > } =20 >=20 > Just noticed that these [unposted] testcases don't pass. Added some > debugging prints and it turns out that %F{green} uses a different code > than specifying the number. Eg, >=20 > echo $F1 $F2 $F3 $F4 | cat -v >=20 > results in >=20 > ^[[38;5;2m ^[[38;5;2m ^[[38;5;2m ^[[32m >=20 Isn't this what Oliver just pointed out in another thread?=C2=A0=E2=80=94 Oliver Kiddle wrote in 47491: > Regarding (1), I just noticed that a new D01prompt test case is failing > on FreeBSD because ${(%):-%F{2}} is not producing the same as > ${(%):-%F{green}}. This is a new test added just last month in 47352. >=20 > This is down to TXT_ATTR_FG_TERMCAP being set for 2 but not for green.