Merge branch 'master' into 1.4.0

This commit is contained in:
Paul Beckingham 2008-06-24 01:23:30 -04:00
commit 2d21558a5a

View file

@ -242,7 +242,10 @@ std::string decode (color c)
////////////////////////////////////////////////////////////////////////////////
std::string colorize (color fg, color bg, const std::string& input)
{
return decode (fg) + decode (bg) + input + decode (off);
if (fg != nocolor || bg != nocolor)
return decode (fg) + decode (bg) + input + decode (off);
return input;
}
////////////////////////////////////////////////////////////////////////////////