Merge branch '1.9.3' of tasktools.org:task into 1.9.3

Conflicts:
	src/Config.cpp
This commit is contained in:
Johannes Schlatow
2010-09-02 01:53:25 +02:00
27 changed files with 663 additions and 338 deletions

View File

@@ -812,6 +812,7 @@ int handleShow (std::string &outs)
"import.synonym.id import.synonym.uuid complete.all.projects complete.all.tags "
"search.case.sensitive hooks active.indicator tag.indicator recurrence.indicator "
"recurrence.limit list.all.projects list.all.tags undo.style verbose "
"rule.precedence.color "
#ifdef FEATURE_SHELL
"shell.prompt "
#endif
@@ -2032,7 +2033,7 @@ int handleColor (std::string &outs)
// actual colors.
if (*item != "_forcecolor" &&
*item != "color" &&
item->find ("color") != std::string::npos)
item->find ("color") == 0)
{
int row = table.addRow ();
table.addCell (row, 0, *item);