diff --git a/ChangeLog b/ChangeLog index b0cb0a284..167801a8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ - TW-1596 taskwarrior can't compile FreeBSD 9.3 32bit environment (thanks to ribbon) +- TW-1603 Priority color precedence changed since it is a UDA, should be lowered + again (thanks to Jens Erat). - The 'obfuscate' setting, if set to '1' will replace all text with 'xxx'. ------ current release --------------------------- diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme index 4be91c28c..55495ce73 100644 --- a/doc/rc/dark-16.theme +++ b/doc/rc/dark-16.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme index 4ced70b88..f947c1554 100644 --- a/doc/rc/dark-256.theme +++ b/doc/rc/dark-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme index acbc2388f..8405d54c5 100644 --- a/doc/rc/dark-blue-256.theme +++ b/doc/rc/dark-blue-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-gray-256.theme b/doc/rc/dark-gray-256.theme index 27cc78673..4475b7911 100644 --- a/doc/rc/dark-gray-256.theme +++ b/doc/rc/dark-gray-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-gray-blue-256.theme b/doc/rc/dark-gray-blue-256.theme index ef5489fe0..10c45ec66 100644 --- a/doc/rc/dark-gray-blue-256.theme +++ b/doc/rc/dark-gray-blue-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme index c26378dcd..72da1544f 100644 --- a/doc/rc/dark-green-256.theme +++ b/doc/rc/dark-green-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme index 7af1d7475..30e7b4667 100644 --- a/doc/rc/dark-red-256.theme +++ b/doc/rc/dark-red-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-violets-256.theme b/doc/rc/dark-violets-256.theme index aff6e7060..0fda4b17e 100644 --- a/doc/rc/dark-violets-256.theme +++ b/doc/rc/dark-violets-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme index f3a0b1735..5985c88b7 100644 --- a/doc/rc/dark-yellow-green.theme +++ b/doc/rc/dark-yellow-green.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme index cc04a84a8..739529b26 100644 --- a/doc/rc/light-16.theme +++ b/doc/rc/light-16.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme index c4f6d25f2..c07b62e67 100644 --- a/doc/rc/light-256.theme +++ b/doc/rc/light-256.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/no-color.theme b/doc/rc/no-color.theme index 216446939..a5a5bc433 100644 --- a/doc/rc/no-color.theme +++ b/doc/rc/no-color.theme @@ -24,7 +24,7 @@ # ############################################################################### -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # This is a theme that disables all default colors # It can be used as template for other themes diff --git a/doc/rc/solarized-dark-256.theme b/doc/rc/solarized-dark-256.theme index 1f411aadc..bb722b158 100644 --- a/doc/rc/solarized-dark-256.theme +++ b/doc/rc/solarized-dark-256.theme @@ -41,7 +41,7 @@ # # Taskwarrior solarized-dark-256 theme created by Stefan A. Keel. -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/doc/rc/solarized-light-256.theme b/doc/rc/solarized-light-256.theme index 6f77ea98d..2bbb363d2 100644 --- a/doc/rc/solarized-light-256.theme +++ b/doc/rc/solarized-light-256.theme @@ -41,7 +41,7 @@ # # Taskwarrior solarized-dark-256 theme created by Stefan A. Keel. -rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged +rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda. # General decoration color.label= diff --git a/src/Config.cpp b/src/Config.cpp index a158b2a05..f4132b385 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -166,7 +166,7 @@ std::string Config::_defaults = "color=on # Enable color\n" #if defined(LINUX) || defined(DARWIN) "\n" - "rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged\n" + "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n" "\n" "# General decoration\n" "color.label=\n" @@ -240,7 +240,7 @@ std::string Config::_defaults = "\n" #else "\n" - "rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged\n" + "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n" "\n" "# General decoration\n" "color.label=\n" @@ -329,7 +329,7 @@ std::string Config::_defaults = "# Here is the rule precedence order, highest to lowest.\n" "# Note that these are just the color rule names, without the leading 'color.'\n" "# and any trailing '.value'.\n" - "rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.\n" + "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n" "\n" "#default.project=foo # Default project for 'add' command\n" "#default.due=eom # Default due date for 'add' command\n"