diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
| commit | 55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (patch) | |
| tree | b820b7c4b064e5d430439839768aa5b855ce3a4a /src/textual.cc | |
| parent | 3f00f8362c2fdfae1dbb6517bc29c75e308bc4f0 (diff) | |
| parent | 60059750061fe59c83adc869f36335a083955608 (diff) | |
| download | fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.gz fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.bz2 fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.zip | |
Merge branch 'next'
Diffstat (limited to 'src/textual.cc')
| -rw-r--r-- | src/textual.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/textual.cc b/src/textual.cc index 6e2c919f..8d4294a6 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -442,8 +442,8 @@ void instance_t::default_commodity_directive(char * line) void instance_t::default_account_directive(char * line) { - journal.basket = account_stack.front()->find_account(skip_ws(line + 1)); - journal.basket->add_flags(ACCOUNT_KNOWN); + journal.bucket = account_stack.front()->find_account(skip_ws(line + 1)); + journal.bucket->add_flags(ACCOUNT_KNOWN); } void instance_t::price_conversion_directive(char * line) @@ -487,17 +487,8 @@ void instance_t::option_directive(char * line) *p++ = '\0'; } -#if 0 - if (! process_option(pathname.string(), line + 2, scope, p, line) && - ! dynamic_cast<session_t *>(&scope)) { - if (std::strlen(line + 2) == 1) - throw_(option_error, _("Illegal option -%1") << line + 2); - else - throw_(option_error, _("Illegal option --%1") << line + 2); - } -#else - process_option(pathname.string(), line + 2, scope, p, line); -#endif + if (! process_option(pathname.string(), line + 2, scope, p, line)) + throw_(option_error, _("Illegal option --%1") << line + 2); } void instance_t::automated_xact_directive(char * line) |