From fd6c7637e49d6ff1f7f475943685c1b3aab5c76a Mon Sep 17 00:00:00 2001
From: einfachIrgendwer0815
 <85333734+einfachIrgendwer0815@users.noreply.github.com>
Date: Sat, 21 Oct 2023 21:58:57 +0200
Subject: [PATCH 1/4] Partially revert "Make -pp override --paging and vice
 versa when passed as a later argument. (#2660)"

This partially reverts commit e2bf85e749d87459e3fced697af5cd9cc96eeb8c.
---
 src/bin/bat/clap_app.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/bin/bat/clap_app.rs b/src/bin/bat/clap_app.rs
index 33dde9801b..c0669c0fc4 100644
--- a/src/bin/bat/clap_app.rs
+++ b/src/bin/bat/clap_app.rs
@@ -81,7 +81,6 @@ pub fn build_app(interactive_output: bool) -> Command {
             Arg::new("plain")
                 .overrides_with("plain")
                 .overrides_with("number")
-                .overrides_with("paging")
                 .short('p')
                 .long("plain")
                 .action(ArgAction::Count)
@@ -306,7 +305,6 @@ pub fn build_app(interactive_output: bool) -> Command {
                 .long("paging")
                 .overrides_with("paging")
                 .overrides_with("no-paging")
-                .overrides_with("plain")
                 .value_name("when")
                 .value_parser(["auto", "never", "always"])
                 .default_value("auto")

From e667415deff1a8150db6cc1fc5e8db701827261d Mon Sep 17 00:00:00 2001
From: einfachIrgendwer0815
 <85333734+einfachIrgendwer0815@users.noreply.github.com>
Date: Sat, 21 Oct 2023 22:16:59 +0200
Subject: [PATCH 2/4] Add tests against issue #2731

---
 tests/integration_tests.rs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index c083a941ba..2a192cdba1 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -1020,6 +1020,31 @@ fn enable_pager_if_pp_flag_comes_before_paging() {
         .stdout(predicate::eq("pager-output\n").normalize());
 }
 
+#[test]
+fn paging_does_not_override_simple_plain() {
+    bat()
+        .env("PAGER", "echo pager-output")
+        .arg("--decorations=always")
+        .arg("--plain")
+        .arg("--paging=never")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout(predicate::eq("hello world\n"));
+}
+
+#[test]
+fn simple_plain_does_not_override_paging() {
+    bat()
+        .env("PAGER", "echo pager-output")
+        .arg("--paging=always")
+        .arg("--plain")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout(predicate::eq("pager-output\n"));
+}
+
 #[test]
 fn pager_failed_to_parse() {
     bat()

From c9fd0f3cf0e042c1c070e01e06bc8249b35a644a Mon Sep 17 00:00:00 2001
From: einfachIrgendwer0815
 <85333734+einfachIrgendwer0815@users.noreply.github.com>
Date: Fri, 18 Oct 2024 11:43:33 +0200
Subject: [PATCH 3/4] Add partial override of -pp and --paging

---
 src/bin/bat/app.rs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/bin/bat/app.rs b/src/bin/bat/app.rs
index d662866875..9a78c94973 100644
--- a/src/bin/bat/app.rs
+++ b/src/bin/bat/app.rs
@@ -97,12 +97,30 @@ impl App {
     pub fn config(&self, inputs: &[Input]) -> Result<Config> {
         let style_components = self.style_components()?;
 
+        let extra_plain = self.matches.get_count("plain") > 1;
+        let plain_last_index = self
+            .matches
+            .indices_of("plain")
+            .and_then(Iterator::max)
+            .unwrap_or_default();
+        let paging_last_index = self
+            .matches
+            .indices_of("paging")
+            .and_then(Iterator::max)
+            .unwrap_or_default();
+
         let paging_mode = match self.matches.get_one::<String>("paging").map(|s| s.as_str()) {
-            Some("always") => PagingMode::Always,
+            Some("always") => {
+                // Disable paging if the second -p (or -pp) is specified after --paging=always
+                if extra_plain && plain_last_index > paging_last_index {
+                    PagingMode::Never
+                } else {
+                    PagingMode::Always
+                }
+            }
             Some("never") => PagingMode::Never,
             Some("auto") | None => {
                 // If we have -pp as an option when in auto mode, the pager should be disabled.
-                let extra_plain = self.matches.get_count("plain") > 1;
                 if extra_plain || self.matches.get_flag("no-paging") {
                     PagingMode::Never
                 } else if inputs.iter().any(Input::is_stdin) {

From ac082ab64b3536d463ec922c838474f8979f1726 Mon Sep 17 00:00:00 2001
From: einfachIrgendwer0815
 <85333734+einfachIrgendwer0815@users.noreply.github.com>
Date: Fri, 18 Oct 2024 12:44:53 +0200
Subject: [PATCH 4/4] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2ec2da9b5..a0e46c13cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Fix handling of inputs with combined ANSI color and attribute sequences, see #2185 and #2856 (@eth-p)
 - Fix panel width when line 10000 wraps, see #2854 (@eth-p)
 - Fix compile issue of `time` dependency caused by standard library regression #3045 (@cyqsimon)
+- Fix override behavior of --plain and --paging, see issue #2731 and PR #3108 (@einfachIrgendwer0815)
 
 ## Other