summaryrefslogtreecommitdiff
path: root/src/global.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-02-08 19:54:39 -0400
committerJohn Wiegley <johnw@newartisans.com>2009-02-08 19:54:39 -0400
commit4f5799c216df4a1b57bc5c59f286a685b0f77448 (patch)
treeda0f9ad92191808ed4dad1c0b566276e836470bc /src/global.cc
parent455b6e27cbede32571af20f21d47817fdadfd330 (diff)
downloadfork-ledger-4f5799c216df4a1b57bc5c59f286a685b0f77448.tar.gz
fork-ledger-4f5799c216df4a1b57bc5c59f286a685b0f77448.tar.bz2
fork-ledger-4f5799c216df4a1b57bc5c59f286a685b0f77448.zip
If a ledger file is specified in .ledgerrc, ignore the environment.
Diffstat (limited to 'src/global.cc')
-rw-r--r--src/global.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/global.cc b/src/global.cc
index 33c8fcd8..939a51b2 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -60,8 +60,9 @@ global_scope_t::global_scope_t(char ** envp)
// Before processing command-line options, we must notify the session object
// that such options are beginning, since options like -f cause a complete
// override of files found anywhere else.
- session().now_at_command_line(false);
+ session().set_flush_on_next_data_file(true);
read_environment_settings(envp);
+ session().set_flush_on_next_data_file(true);
read_init();
}
@@ -144,7 +145,7 @@ void global_scope_t::report_error(const std::exception& err)
void global_scope_t::execute_command(strings_list args, bool at_repl)
{
- session().now_at_command_line(true);
+ session().set_flush_on_next_data_file(true);
// Process the command verb, arguments and options
args = read_command_arguments(report(), args);