From e435c1655bc5c2be2aeab1782d000f9660558bfa Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Jan 2014 14:01:03 -0500
Subject: [PATCH] Removed Feature

- Old-style color names including underscores are no longer supported.
---
 ChangeLog      |  1 +
 NEWS           |  1 +
 src/legacy.cpp | 27 ++-------------------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c43a71e4..3f895cd82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Features
  + Removed deprecated 'push', 'pull' and 'merge' commands.
  + Removed version 1.x column name support.
  + Removed version 1.x sort column support.
+ + Old-style color names including underscores are no longer supported.
 
 Bugs
  + #1473 Make TASK_RCDIR customizable (thanks to Elias Probst).
diff --git a/NEWS b/NEWS
index e2929f27b..eb4928425 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Removed features in 2.4.0
 
   - Version 1.x column names no longer supported.
   - Version 1.x sort columns no longer supported.
+  - Old-style color names including underscores are no longer supported.
 
 Known Issues
 
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 2876d280a..85f083ff5 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -76,32 +76,9 @@ void legacySortColumnMap (std::string& name)
 ////////////////////////////////////////////////////////////////////////////////
 std::string legacyCheckForDeprecatedColor ()
 {
-  std::vector <std::string> deprecated;
-  std::map <std::string, std::string>::const_iterator it;
-  for (it = context.config.begin (); it != context.config.end (); ++it)
-  {
-    if (it->first.find ("color.") != std::string::npos)
-    {
-      std::string value = context.config.get (it->first);
-      if (value.find ("_") != std::string::npos)
-        deprecated.push_back (it->first);
-    }
-  }
+  // 2014-01-26: Color defs containing '_' removed.
 
-  std::stringstream out;
-  if (deprecated.size ())
-  {
-    out << STRING_CONFIG_DEPRECATED_US
-        << "\n";
-
-    std::vector <std::string>::iterator it2;
-    for (it2 = deprecated.begin (); it2 != deprecated.end (); ++it2)
-      out << "  " << *it2 << "=" << context.config.get (*it2) << "\n";
-
-    out << "\n";
-  }
-
-  return out.str ();
+  return "";
 }
 
 ////////////////////////////////////////////////////////////////////////////////