summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2005-07-13 09:04:36 +0000
committerJohn Wiegley <johnw@newartisans.com>2008-04-13 02:41:15 -0400
commit46978b2d5d64755678bb7d6d7572b77ec30b2235 (patch)
tree08224e47a0b050af91f9a8bce9ba26acccd1950b
parent557e103b2e33fefc702d93e95ba8a0cb56b4efa0 (diff)
downloadfork-ledger-46978b2d5d64755678bb7d6d7572b77ec30b2235.tar.gz
fork-ledger-46978b2d5d64755678bb7d6d7572b77ec30b2235.tar.bz2
fork-ledger-46978b2d5d64755678bb7d6d7572b77ec30b2235.zip
(regexps_to_predicate): Don't modify the display predicate for balance
commands if a payee regexp is being processed.
-rw-r--r--config.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/config.cc b/config.cc
index 0e9d3c74..885c37db 100644
--- a/config.cc
+++ b/config.cc
@@ -128,7 +128,7 @@ regexps_to_predicate(config_t& config, const std::string& command,
add_predicate = 1;
}
- if (i != 1 && command == "b") {
+ if (i != 1 && command == "b" && account_regexp) {
if (! config.display_predicate.empty())
config.display_predicate += "&";
else if (! config.show_empty)
@@ -182,11 +182,11 @@ void config_t::process_options(const std::string& command,
if (*i == "--")
break;
- regexps_to_predicate(*this, command, arg, i, true,
+ regexps_to_predicate(*this, command, arg, i++, true,
(command == "b" && ! show_subtotal &&
display_predicate.empty()));
if (i != args_end)
- regexps_to_predicate(*this, command, ++i, args_end);
+ regexps_to_predicate(*this, command, i, args_end);
}
// Setup the default value for the display predicate