From 4ad0a25af110e2afe956bce13e901f78fd9e6bcd Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 3 Jun 2010 19:36:16 +0000 Subject: 27983: colours could be output twice --- ChangeLog | 6 +++++- Src/prompt.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b35137970..daa8403fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-06-03 Peter Stephenson + + * 27983: Src/prompt.c: colours could be output twice. + 2010-06-03 Peter Stephenson * 27994: Src/params.c: better error message when failing to @@ -13199,5 +13203,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4990 $ +* $Revision: 1.4991 $ ***************************************************** diff --git a/Src/prompt.c b/Src/prompt.c index afb9777a0..a91ac541f 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -1925,8 +1925,13 @@ set_colour_attribute(int atr, int fg_bg, int flags) } else { tputs(tgoto(tcstr[tc], colour, colour), 1, putshout); } + /* That worked. */ + return; } - /* for 0 to 7 assume standard ANSI works, otherwise it won't. */ + /* + * Nope, that didn't work. + * If 0 to 7, assume standard ANSI works, otherwise it won't. + */ if (colour > 7) return; } -- cgit 1.4.1