Merge commit '61156c861818642fb624932af3c7c7b63b14a5b3' into next

This commit is contained in:
Craig Earls 2015-04-30 22:07:27 -07:00
commit 5f03a94b52
4 changed files with 11 additions and 7 deletions

View file

@ -960,7 +960,7 @@ Often set in one's
file to change the default.
.It Fl \-unrealized-losses
Allow the user to specify what account name should be used for
unrealized gains. Defaults to
unrealized losses. Defaults to
.Sy "Equity:Unrealized Losses" .
Often set in one's
.Pa ~/.ledgerrc

View file

@ -6752,7 +6752,7 @@ Often set in one's @file{~/.ledgerrc} file to change the default.
@item --unrealized-losses @var{STR}
Allow the user to specify what account name should be used for
unrealized gains. Defaults to @samp{"Equity:Unrealized Losses"}.
unrealized losses. Defaults to @samp{"Equity:Unrealized Losses"}.
Often set in one's @file{~/.ledgerrc} file to change the default.
@item --unround

View file

@ -144,6 +144,9 @@ void global_scope_t::read_init()
} else {
if (const char * home_var = std::getenv("HOME")) {
init_file = (path(home_var) / ".ledgerrc");
if (! exists(init_file)) {
init_file = ("./.ledgerrc");
}
} else {
init_file = ("./.ledgerrc");
}

View file

@ -26,17 +26,18 @@ class CheckBaselineTests (CheckOptions):
'file',
'force-color',
'force-pager',
'generated',
'help',
'import',
'no-color',
'no-pager',
'options',
'price-exp',
'revalued-total',
'seed',
'trace',
'verbose',
'verify',
'verify-memory',
'version'
]