From d025daa8a99f8500e9c3689f1b1b59d2d6f69c2e Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 7 Aug 2011 17:10:34 +0000 Subject: [PATCH] drop unused SubTotal option --- hledger-vty/Hledger/Vty/Main.hs | 3 +-- hledger/Hledger/Cli.hs | 4 ++-- hledger/Hledger/Cli/Options.hs | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hledger-vty/Hledger/Vty/Main.hs b/hledger-vty/Hledger/Vty/Main.hs index 446c55037..ba53f40b6 100644 --- a/hledger-vty/Hledger/Vty/Main.hs +++ b/hledger-vty/Hledger/Vty/Main.hs @@ -94,7 +94,6 @@ vty :: [Opt] -> [String] -> Journal -> IO () vty opts args j = do v <- mkVty DisplayRegion w h <- display_bounds $ terminal v - let opts' = SubTotal:opts d <- getCurrentDay let a = enter d BalanceScreen args AppState { @@ -102,7 +101,7 @@ vty opts args j = do ,aw=fromIntegral w ,ah=fromIntegral h ,amsg=helpmsg - ,aopts=opts' + ,aopts=opts ,aargs=args ,ajournal=j ,abuf=[] diff --git a/hledger/Hledger/Cli.hs b/hledger/Hledger/Cli.hs index a20ff6c5b..8b31be962 100644 --- a/hledger/Hledger/Cli.hs +++ b/hledger/Hledger/Cli.hs @@ -130,7 +130,7 @@ tests_Hledger_Cli = TestList ] ,"balance report with account pattern o" ~: - ([SubTotal], ["o"]) `gives` + ([], ["o"]) `gives` [" $1 expenses:food" ," $-2 income" ," $-1 gifts" @@ -217,7 +217,7 @@ tests_Hledger_Cli = TestList ] ,"balance report with -E shows zero-balance accounts" ~: - ([SubTotal,Empty], ["assets"]) `gives` + ([Empty], ["assets"]) `gives` [" $-1 assets" ," $1 bank" ," 0 checking" diff --git a/hledger/Hledger/Cli/Options.hs b/hledger/Hledger/Cli/Options.hs index 37ff109e2..64d915f45 100644 --- a/hledger/Hledger/Cli/Options.hs +++ b/hledger/Hledger/Cli/Options.hs @@ -110,7 +110,6 @@ data Opt = | Flat | Drop {value::String} | NoTotal - | SubTotal | DailyOpt | WeeklyOpt | MonthlyOpt