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. file to change the default.
.It Fl \-unrealized-losses .It Fl \-unrealized-losses
Allow the user to specify what account name should be used for Allow the user to specify what account name should be used for
unrealized gains. Defaults to unrealized losses. Defaults to
.Sy "Equity:Unrealized Losses" . .Sy "Equity:Unrealized Losses" .
Often set in one's Often set in one's
.Pa ~/.ledgerrc .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} @item --unrealized-losses @var{STR}
Allow the user to specify what account name should be used for 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. Often set in one's @file{~/.ledgerrc} file to change the default.
@item --unround @item --unround

View file

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

View file

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