Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

[regression] %2K prompt expansion no longer works



$ 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




Messages sorted by: Reverse Date, Date, Thread, Author