diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-02-25 15:29:59 -0500 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-02-25 15:29:59 -0500 |
commit | 06fb28b16eb4b6170c2e2c0cf1f673730309509b (patch) | |
tree | 785adf7225d02701b4b0418c61ef0c0c3a24848b /src/delta | |
parent | 8984d7bb5cc1d34cae4ec31696974a9e9f0dca44 (diff) | |
parent | ea4b98e6577ad4311e4eb4d2384c82f0d870b5ba (diff) |
Merge pull request #2671 from 0xAX/move-pager-open-to-one-place
tree-wide: merge pager_open_if_enabled() to the pager_open()
Diffstat (limited to 'src/delta')
-rw-r--r-- | src/delta/delta.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/delta/delta.c b/src/delta/delta.c index 202a030c54..b4f0ecff2d 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -85,14 +85,6 @@ static enum { (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN | SHOW_EXTENDED) } arg_flags = 0; -static void pager_open_if_enabled(void) { - - if (arg_no_pager) - return; - - pager_open(false); -} - static int equivalent(const char *a, const char *b) { _cleanup_free_ char *x = NULL, *y = NULL; @@ -610,7 +602,7 @@ int main(int argc, char *argv[]) { else if (arg_diff) arg_flags |= SHOW_OVERRIDDEN; - pager_open_if_enabled(); + pager_open(arg_no_pager, false); if (optind < argc) { int i; |