From: Mikael Magnusson <mikachu@gmail.com>
To: Daniel Shahaf <d.s@daniel.shahaf.name>
Cc: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: [regression] %2K prompt expansion no longer works
Date: Sun, 25 Oct 2020 22:29:44 +0100 [thread overview]
Message-ID: <CAHYJk3QedKBSPo=pP+t0Lv4g=SUYKQvEqqdb8pg732n9xYbLeg@mail.gmail.com> (raw)
In-Reply-To: <20201025201219.24ef0ddc@tarpaulin.shahaf.local2>
On 10/25/20, Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
> Mikael Magnusson wrote on Sat, 24 Oct 2020 16:21 +0200:
>> On 8/30/20, Stephane Chazelas <stephane@chazelas.org> wrote:
>> > $ print -rnP %2K | hd
>> > 00000000 1b 5b 34 30 6d |.[40m|
>> > 00000005
>> >
>> > %K{2} is fine:
>> >
>> > $ 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:
>> >
>> >> 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).
>> >
>> > 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--;
>> > }
>> > } else
>> > - arg = match_colour(NULL, 1, arg);
>> > + arg = match_colour(NULL, is_fg, arg);
>> > return arg;
>> > }
>>
>> 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,
>>
>> echo $F1 $F2 $F3 $F4 | cat -v
>>
>> results in
>>
>> ^[[38;5;2m ^[[38;5;2m ^[[38;5;2m ^[[32m
>>
>
> Isn't this what Oliver just pointed out in another thread? —
>
> 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.
>>
>> This is down to TXT_ATTR_FG_TERMCAP being set for 2 but not for green.
It is, I'm not reading that thread though :).
--
Mikael Magnusson
next prev parent reply other threads:[~2020-10-25 21:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-30 11:13 Stephane Chazelas
2020-08-30 13:17 ` Mikael Magnusson
2020-10-24 14:21 ` Mikael Magnusson
2020-10-25 20:12 ` Daniel Shahaf
2020-10-25 21:29 ` Mikael Magnusson [this message]
2020-10-26 7:29 ` Stephane Chazelas
2020-10-29 23:09 ` Oliver Kiddle
2020-10-30 0:42 ` Bart Schaefer
2020-10-30 9:11 ` Peter Stephenson
2021-03-30 20:03 ` Oliver Kiddle
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='CAHYJk3QedKBSPo=pP+t0Lv4g=SUYKQvEqqdb8pg732n9xYbLeg@mail.gmail.com' \
--to=mikachu@gmail.com \
--cc=d.s@daniel.shahaf.name \
--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).