diff options
| -rw-r--r-- | doc/ledger.1 | 2 | ||||
| -rw-r--r-- | doc/ledger3.texi | 2 | ||||
| -rw-r--r-- | src/global.cc | 11 | ||||
| -rwxr-xr-x | test/CheckBaselineTests.py | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/doc/ledger.1 b/doc/ledger.1 index f4ee9625..b674cb6a 100644 --- a/doc/ledger.1 +++ b/doc/ledger.1 @@ -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 diff --git a/doc/ledger3.texi b/doc/ledger3.texi index bbb8e515..441b15d1 100644 --- a/doc/ledger3.texi +++ b/doc/ledger3.texi @@ -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 diff --git a/src/global.cc b/src/global.cc index bdaabd5a..e4ebe6f5 100644 --- a/src/global.cc +++ b/src/global.cc @@ -110,7 +110,7 @@ global_scope_t::~global_scope_t() void global_scope_t::parse_init(path init_file) { TRACE_START(init, 1, "Read initialization file"); - + parse_context_stack_t parsing_context; parsing_context.push(init_file); parsing_context.get_current().journal = session().journal.get(); @@ -122,13 +122,13 @@ void global_scope_t::parse_init(path init_file) throw_(parse_error, _f("Transactions found in initialization file '%1%'") % init_file); } - + TRACE_FINISH(init, 1); } void global_scope_t::read_init() { - // if specified on the command line init_file_ is filled in + // if specified on the command line init_file_ is filled in // global_scope_t::handle_debug_options. If it was specified on the command line // fail if the file doesn't exist. If no init file was specified // on the command-line then try the default values, but don't fail if there @@ -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"); } @@ -499,7 +502,7 @@ void handle_debug_options(int argc, char * argv[]) } else if (i + 1 < argc && std::strcmp(argv[i], "--debug") == 0) { #if DEBUG_ON - _log_level = LOG_DEBUG; + _log_level = LOG_DEBUG; _log_category = argv[i + 1]; i++; #endif diff --git a/test/CheckBaselineTests.py b/test/CheckBaselineTests.py index 1439cda4..f0eb2646 100755 --- a/test/CheckBaselineTests.py +++ b/test/CheckBaselineTests.py @@ -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' ] |