From 9c7ca33929864b7042665095cf6eb2be02cac6d0 Mon Sep 17 00:00:00 2001
From: Marie Katrine Ekeberg <5732795+themkat@users.noreply.github.com>
Date: Sun, 14 Aug 2022 21:09:13 +0200
Subject: [PATCH] Make `--no-paging`/`-P` override `--paging=...` if passed as
 a later arg (#2201)

* Make the no-paging option override earlier paging options

* Update CHANGELOG.md

Co-authored-by: Martin Nordholts <enselic@gmail.com>
---
 CHANGELOG.md               |  1 +
 src/bin/bat/clap_app.rs    |  1 +
 tests/integration_tests.rs | 12 ++++++++++++
 3 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 923f26ce..3bbaceb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ## Bugfixes
 
 - Prevent fork nightmare with `PAGER=batcat`. See #2235 (@johnmatthiggins)
+- Make `--no-paging`/`-P` override `--paging=...` if passed as a later arg, see #2201 (@themkat)
 
 ## Other
 
diff --git a/src/bin/bat/clap_app.rs b/src/bin/bat/clap_app.rs
index f9e6cc2a..9e6f4a03 100644
--- a/src/bin/bat/clap_app.rs
+++ b/src/bin/bat/clap_app.rs
@@ -293,6 +293,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
             Arg::with_name("paging")
                 .long("paging")
                 .overrides_with("paging")
+                .overrides_with("no-paging")
                 .takes_value(true)
                 .value_name("when")
                 .possible_values(&["auto", "never", "always"])
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 70d208e3..add0e98f 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -695,6 +695,18 @@ fn alias_pager_disable_long_overrides_short() {
         .stdout(predicate::eq("pager-output\n").normalize());
 }
 
+#[test]
+fn disable_pager_if_disable_paging_flag_comes_after_paging() {
+    bat()
+        .env("PAGER", "echo pager-output")
+        .arg("--paging=always")
+        .arg("-P")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout(predicate::eq("hello world\n").normalize());
+}
+
 #[test]
 fn pager_failed_to_parse() {
     bat()