From fa58c24c66e10a53a80194bded1c3c552f2ccfd5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 4 Jul 2014 11:02:10 -0400
Subject: [PATCH] Deprecation

- Removed deprecated 'report.X.limit' feature.
---
 ChangeLog           | 1 +
 NEWS                | 2 ++
 doc/man/taskrc.5.in | 5 -----
 src/legacy.cpp      | 6 ------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d08f8204c..6000fdb23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -140,6 +140,7 @@
 - Display debug/release build type in the diagnostics command.
 - Removed obsolete task-faq.5 and task-tutorial.5 man pages.
 - French localization (thanks to leowzukw).
+- Removed deprecated 'report.X.limit' feature.
 
 ------ current release ---------------------------
 
diff --git a/NEWS b/NEWS
index 616879713..54c15d5e0 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,8 @@ Removed features in 2.4.0
   - Removed the 'tasksh' program from the Taskwarrior distribution. It is now
     a separate project.
   - Removed the 'complete.all.projects' setting that was not used.
+  - Removed support for 'report.X.limit', which can now be set in the report
+    filter 'limit:N'.
 
 Known Issues
 
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 11699e61b..f896b0042 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1199,11 +1199,6 @@ report. See the
 .B annotations
 variable for details on the possible values.  Deprecated.
 
-.TP
-.B report.X.limit
-An optional value to a report limiting the number of displayed tasks in the
-generated report.  Deprecated.
-
 .TP
 Taskwarrior comes with a number of predefined reports, which are:
 
diff --git a/src/legacy.cpp b/src/legacy.cpp
index da9e63ccb..dc0dd30fd 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -88,12 +88,6 @@ std::string legacyCheckForDeprecatedVariables ()
   std::map <std::string, std::string>::const_iterator it;
   for (it = context.config.begin (); it != context.config.end (); ++it)
   {
-    // report.*.limit
-    if (it->first.length () > 13 &&
-        it->first.substr (0, 7) == "report." &&
-        it->first.substr (it->first.length () - 6) == ".limit")
-      deprecated.push_back (it->first);
-
     // report.*.annotations
     if (it->first.length () > 19 &&
         it->first.substr (0, 7) == "report." &&