about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-06-03 19:36:16 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-06-03 19:36:16 +0000
commit4ad0a25af110e2afe956bce13e901f78fd9e6bcd (patch)
treed1e3d3c42a0f84d926637066d85b785d4a13038a
parent099dc207fa63dfb9d0bd16c8b084eff00a3761da (diff)
downloadzsh-4ad0a25af110e2afe956bce13e901f78fd9e6bcd.tar.gz
zsh-4ad0a25af110e2afe956bce13e901f78fd9e6bcd.tar.xz
zsh-4ad0a25af110e2afe956bce13e901f78fd9e6bcd.zip
27983: colours could be output twice
-rw-r--r--ChangeLog6
-rw-r--r--Src/prompt.c7
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  <p.w.stephenson@ntlworld.com>
+
+	* 27983: Src/prompt.c: colours could be output twice.
+
 2010-06-03  Peter Stephenson  <pws@csr.com>
 
 	* 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;
     }