From 548272fb3ad8c166898edb16f0d7242344bcae98 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 15 Oct 2011 19:11:55 -0400
Subject: [PATCH] Confirmation

- Removed confirmation override imposed by the 'delete' command.  Consistency
  prevails.
---
 src/commands/CmdDelete.cpp | 10 +++++-----
 src/commands/Command.cpp   |  3 +--
 src/en-US.h                |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index 078720c28..3591e52a3 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -40,11 +40,11 @@ extern Context context;
 ////////////////////////////////////////////////////////////////////////////////
 CmdDelete::CmdDelete ()
 {
-  _keyword     = "delete";
-  _usage       = "task <filter> delete <mods>";
-  _description = STRING_CMD_DELETE_USAGE;
-  _read_only   = false;
-  _displays_id = false;
+  _keyword       = "delete";
+  _usage         = "task <filter> delete <mods>";
+  _description   = STRING_CMD_DELETE_USAGE;
+  _read_only     = false;
+  _displays_id   = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 136fc79df..b7b019cbc 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -596,7 +596,7 @@ bool Command::permission (
     return answer;
   }
 
-  // Quantity < bulk modifications have optional confirmation, in the (y/n/a/q)
+  // 1 < Quantity < bulk modifications have optional confirmation, in the (y/n/a/q)
   // style.
   if (quantity < bulk && !confirmation)
      return true;
@@ -608,7 +608,6 @@ bool Command::permission (
   case 1:                           return true;     // yes
   case 2: _permission_all  = true;  return true;     // all
   case 3: _permission_quit = true;  return false;    // quit
-  case 4:                           return false;    // no
   }
 
   return false;  // This line keeps the compiler happy.
diff --git a/src/en-US.h b/src/en-US.h
index 84703bec4..9f131b450 100644
--- a/src/en-US.h
+++ b/src/en-US.h
@@ -815,7 +815,7 @@
   "\n"
 
 // util
-#define STRING_UTIL_CONFIRM_YN       " (y/n) "
+#define STRING_UTIL_CONFIRM_YN       " (yes/no) "
 #define STRING_UTIL_CONFIRM_YES      "yes"
 #define STRING_UTIL_CONFIRM_YES_U    "Yes"
 #define STRING_UTIL_CONFIRM_NO       "no"