From 0fce4e831e8d553cfc70bab8edef1862efa086f4 Mon Sep 17 00:00:00 2001 From: thdox Date: Sun, 22 Feb 2015 11:44:23 +0100 Subject: --force-color does not require anymore --color. This was reported as Bug #1109 --- src/report.cc | 3 +++ test/baseline/opt-color.test | 2 +- test/regress/727B2DF8.test | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/report.cc b/src/report.cc index 78ccac51..b2162034 100644 --- a/src/report.cc +++ b/src/report.cc @@ -64,6 +64,9 @@ void report_t::normalize_options(const string& verb) if (HANDLED(color) && ! isatty(STDOUT_FILENO)) HANDLER(color).off(); } + else { + HANDLER(color).on("?normalize"); + } if (! HANDLED(force_pager)) { if (HANDLED(pager_) && ! isatty(STDOUT_FILENO)) HANDLER(pager_).off(); diff --git a/test/baseline/opt-color.test b/test/baseline/opt-color.test index a7d702bd..bc4cb48c 100644 --- a/test/baseline/opt-color.test +++ b/test/baseline/opt-color.test @@ -2,7 +2,7 @@ Assets:Investments:Vanguard:VMMXX 0.350 VMMXX @ $1.00 Income:Dividends:Vanguard:VMMXX $-0.35 -test bal --color --force-color +test bal --force-color 0.350 VMMXX Assets:Investments:Vanguard:VMMXX $-0.35 Income:Dividends:Vanguard:VMMXX -------------------- diff --git a/test/regress/727B2DF8.test b/test/regress/727B2DF8.test index 0c32d660..ad2b903f 100644 --- a/test/regress/727B2DF8.test +++ b/test/regress/727B2DF8.test @@ -43,7 +43,7 @@ N $ Assets:Bank:Checking ; :AnotherTag: -test reg --color --force-color +test reg --force-color 04-May-01 Checking balance Assets:Bank:Checking  $1,000.00 $1,000.00 Equit:Opening Balances $-1,000.00 0 04-May-03 Investment balance Assets:Brokerage  50 AAPL 50 AAPL -- cgit v1.2.3