Merge branch '2.4.3' into lexer2

2015-03-25 07:52:36 -04:00
parent 24a1cbefe9 55db1239bd
commit 96922231b8
6 changed files with 17 additions and 5 deletions
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -323,8 +323,8 @@ bool Command::permission (
  }

  // 1 < Quantity < bulk modifications have optional confirmation, in the (y/n/a/q)
-  // style.
-  if (quantity < bulk && (!_needs_confirm || !confirmation))
+  // style. Bulk = 0 denotes infinite bulk.
+  if ((bulk == 0 || quantity < bulk) && (!_needs_confirm || !confirmation))
    return true;

  if (context.verbose ("blank") && !_first_iteration)