Merge branch 'next'

1 files changed, 4 insertions, 5 deletions

diff --git a/src/report.cc b/src/report.cc
index 7f31b615..e6194541 100644
--- a/src/report.cc
+++ b/src/report.cc
@@ -225,16 +225,13 @@ value_t report_t::fn_truncated(call_scope_t& scope)
 
 value_t report_t::fn_justify(call_scope_t& scope)
 {
-  interactive_t args(scope, "vl&lbbs");
+  interactive_t args(scope, "vl&lbb");
   std::ostringstream out;
   args.value_at(0)
     .print(out, args.get<int>(1),
 	   args.has(2) ? args.get<int>(2) : -1,
 	   args.has(3) ? args.get<bool>(3) : false,
-	   args.has(4) ? args.get<bool>(4) : false,
-	   args.has(5) ? args.get<string>(5) :
-	   (HANDLED(date_format_) ?
-	    HANDLER(date_format_).str() : optional<string>()));
+	   args.has(4) ? args.get<bool>(4) : false);
   return string_value(out.str());
 }
 
@@ -506,6 +503,7 @@ option_t<report_t> * report_t::lookup_option(const char * p)
     OPT(abbrev_len_);
     else OPT(account_);
     else OPT(actual);
+    else OPT(actual_dates);
     else OPT(add_budget);
     else OPT(amount_);
     else OPT(amount_data);
@@ -592,6 +590,7 @@ option_t<report_t> * report_t::lookup_option(const char * p)
     OPT_CH(collapse);
     else OPT(no_color);
     else OPT(no_total);
+    else OPT(now_);
     break;
   case 'o':
     OPT(only_);