From 626f89c263f6b13b5a31d3f5e4ac8a503e1e4f44 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 20 Oct 2013 14:53:30 -0400
Subject: [PATCH] Deprecated Feature Removal

- Removed deprecated 'edit.verbose' setting, in favor of the 'edit' verbosity
  token..
---
 ChangeLog                | 2 ++
 doc/man/taskrc.5.in      | 7 -------
 src/commands/CmdEdit.cpp | 3 +--
 src/commands/CmdShow.cpp | 1 -
 src/legacy.cpp           | 3 +--
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50b0d92be..873c82d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 Features
  + Removed deprecated 'echo.command' setting, in favor of the 'header' and
    'affected' verbosity tokens.
+ + Removed deprecated 'edit.verbose' setting, in favor of the 'edit' verbosity
+   token..
 
 Bugs
 
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index fccd46560..5081f0db4 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -222,13 +222,6 @@ command is used. Taskwarrior will first look for this configuration variable. If
 found, it is used.  Otherwise it will look for the $VISUAL or $EDITOR
 environment variables, before it defaults to using "vi".
 
-.TP
-.B edit.verbose=on
-When set to on (the default), helpful explanatory comments are added to the
-edited file when using the "task edit ..." command.  Setting this to off means
-that you would see a smaller, more compact representation of the task, with no
-help text.  Deprecated - use verbosity token 'edit'.
-
 .TP
 .B reserved.lines=1
 This is the number of lines reserved at the bottom of the screen for the shell
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 8e49eaebb..1863b12b3 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -160,8 +160,7 @@ std::string CmdEdit::formatDuration (
 std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
 {
   std::stringstream before;
-  bool verbose = context.verbose ("edit") ||
-                 context.config.getBoolean ("edit.verbose"); // Deprecated 2.0
+  bool verbose = context.verbose ("edit");
 
   if (verbose)
     before << "# " << STRING_EDIT_HEADER_1 << "\n"
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index cb43e944c..669ed50c4 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -146,7 +146,6 @@ int CmdShow::execute (std::string& output)
     " displayweeknumber"
     " dom"
     " due"
-    " edit.verbose"                      // Deprecated 2.0
     " editor"
     " exit.on.missing.db"
     " expressions"
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 8cf1c3508..c678412fd 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -148,8 +148,7 @@ std::string legacyCheckForDeprecatedVariables ()
         it->first.substr (it->first.length () - 12) == ".annotations")
       deprecated.push_back (it->first);
 
-    if (it->first == "edit.verbose"      ||
-        it->first == "next"              ||
+    if (it->first == "next"              ||
         it->first == "annotations"       ||
         it->first == "export.ical.class")
       deprecated.push_back (it->first);