zsh-workers
 help / color / mirror / code / Atom feed
* [regression] %2K prompt expansion no longer works
@ 2020-08-30 11:13 Stephane Chazelas
  2020-08-30 13:17 ` Mikael Magnusson
  2020-10-24 14:21 ` Mikael Magnusson
  0 siblings, 2 replies; 10+ messages in thread
From: Stephane Chazelas @ 2020-08-30 11:13 UTC (permalink / raw)
  To: Zsh hackers list

$ 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;
 }
 
Cheers,
Stephane


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-03-30 20:04 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-30 11:13 [regression] %2K prompt expansion no longer works 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
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

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).