diff options
author | John Wiegley <johnw@newartisans.com> | 2010-06-02 23:11:09 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2010-06-02 23:11:09 -0400 |
commit | 626b6a17eb71d4f5308dbedaa53e890c74c1acd1 (patch) | |
tree | b530c8cf1679a4b241c040df195e1b251dfa3062 /src/report.cc | |
parent | cda19829bd1100d6563b48ddb121f2afc1c55d95 (diff) | |
parent | 6ceda8320fcd81376c3b8a8bc81e48b9e87f1926 (diff) | |
download | fork-ledger-626b6a17eb71d4f5308dbedaa53e890c74c1acd1.tar.gz fork-ledger-626b6a17eb71d4f5308dbedaa53e890c74c1acd1.tar.bz2 fork-ledger-626b6a17eb71d4f5308dbedaa53e890c74c1acd1.zip |
Merge branch 'next'
Diffstat (limited to 'src/report.cc')
-rw-r--r-- | src/report.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/report.cc b/src/report.cc index 90de9a3f..cc652f8d 100644 --- a/src/report.cc +++ b/src/report.cc @@ -68,6 +68,13 @@ void report_t::normalize_options(const string& verb) } #endif + if (HANDLED(output_)) { + if (HANDLED(color) && ! HANDLED(force_color)) + HANDLER(color).off(); + if (HANDLED(pager_) && ! HANDLED(force_pager)) + HANDLER(pager_).off(); + } + item_t::use_effective_date = (HANDLED(effective) && ! HANDLED(actual_dates)); |