From c746724dcf2f67290ca42efbd1a1a96f382f2c48 Mon Sep 17 00:00:00 2001
From: Yoichi Nakayama <yoichi.nakayama@gmail.com>
Date: Thu, 3 Mar 2022 07:16:13 +0900
Subject: [PATCH 1/2] New option caret-encode to avoid the display issue with
 git add -p

---
 README.md                       |  2 +-
 src/cli.rs                      |  7 +++++++
 src/config.rs                   |  2 ++
 src/delta.rs                    | 11 -----------
 src/options/set.rs              |  1 +
 src/paint.rs                    | 14 ++++++++++++++
 src/tests/test_example_diffs.rs |  5 +++--
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c2240e858..cb0ab9977 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
     pager = delta
 
 [interactive]
-    diffFilter = delta --color-only
+    diffFilter = delta --color-only --caret-encode
 
 [delta]
     navigate = true  # use n and N to move between diff sections
diff --git a/src/cli.rs b/src/cli.rs
index 15efd15ee..e340ad087 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -323,6 +323,13 @@ pub struct Opt {
     /// If a relativized file path exceeds this width then the diff stat will be misaligned.
     pub diff_stat_align_width: usize,
 
+    #[clap(long = "caret-encode")]
+    /// Replace control characters in output with caret notation.
+    ///
+    /// This option is supposed to be used in interactive.diffFilter configuration for `git add -p`
+    /// where raw control characters result in strange display.
+    pub caret_encode: bool,
+
     #[clap(long = "features", value_name = "FEATURES")]
     /// Names of delta features to activate (space-separated).
     ///
diff --git a/src/config.rs b/src/config.rs
index e06d84af5..ed00e98ee 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -70,6 +70,7 @@ pub struct Config {
     pub blame_palette: Vec<String>,
     pub blame_separator_style: Option<Style>,
     pub blame_timestamp_format: String,
+    pub caret_encode: bool,
     pub color_only: bool,
     pub commit_regex: Regex,
     pub commit_style: Style,
@@ -268,6 +269,7 @@ impl From<cli::Opt> for Config {
             blame_separator_format: parse_blame_line_numbers(&opt.blame_separator_format),
             blame_separator_style: styles.remove("blame-separator-style"),
             blame_timestamp_format: opt.blame_timestamp_format,
+            caret_encode: opt.caret_encode,
             commit_style: styles["commit-style"],
             color_only: opt.color_only,
             commit_regex,
diff --git a/src/delta.rs b/src/delta.rs
index 7ba29973b..905919a8d 100644
--- a/src/delta.rs
+++ b/src/delta.rs
@@ -182,17 +182,6 @@ impl<'a> StateMachine<'a> {
     fn ingest_line(&mut self, raw_line_bytes: &[u8]) {
         // TODO: retain raw_line as Cow
         self.raw_line = String::from_utf8_lossy(raw_line_bytes).to_string();
-        // When a file has \r\n line endings, git sometimes adds ANSI escape sequences between the
-        // \r and \n, in which case byte_lines does not remove the \r. Remove it now.
-        if let Some(cr_index) = self.raw_line.rfind('\r') {
-            if ansi::strip_ansi_codes(&self.raw_line[cr_index + 1..]).is_empty() {
-                self.raw_line = format!(
-                    "{}{}",
-                    &self.raw_line[..cr_index],
-                    &self.raw_line[cr_index + 1..]
-                );
-            }
-        }
         if self.config.max_line_length > 0
             && self.raw_line.len() > self.config.max_line_length
             // Do not truncate long hunk headers
diff --git a/src/options/set.rs b/src/options/set.rs
index 57d95b27d..a755e4f34 100644
--- a/src/options/set.rs
+++ b/src/options/set.rs
@@ -132,6 +132,7 @@ pub fn set_options(
             blame_palette,
             blame_separator_style,
             blame_timestamp_format,
+            caret_encode,
             color_only,
             commit_decoration_style,
             commit_regex,
diff --git a/src/paint.rs b/src/paint.rs
index 709d7d6c6..116d8c1f9 100644
--- a/src/paint.rs
+++ b/src/paint.rs
@@ -213,6 +213,20 @@ impl<'p> Painter<'p> {
                 painted_prefix(state.clone(), config),
                 config,
             );
+            if config.caret_encode {
+                for n in 0..32 {
+                    // HT(0x09), LF(0x0a), ESC(0x1b) are skipped
+                    if n != 0x09 && n != 0x0a && n != 0x1b {
+                        line = line.replace(
+                            &char::from_u32(n).unwrap().to_string(),
+                            &format!(
+                                "\x1b[7m^{}\x1b[27m",
+                                &char::from_u32(n + 64).unwrap().to_string()
+                            ),
+                        );
+                    }
+                }
+            }
             let (bg_fill_mode, fill_style) =
                 Painter::get_should_right_fill_background_color_and_fill_style(
                     diff_sections,
diff --git a/src/tests/test_example_diffs.rs b/src/tests/test_example_diffs.rs
index 0db309778..2150d7d96 100644
--- a/src/tests/test_example_diffs.rs
+++ b/src/tests/test_example_diffs.rs
@@ -292,13 +292,14 @@ commit 94907c0f136f46dc46ffae2dc92dca9af7eb7c2e
     }
 
     #[test]
-    fn test_orphan_carriage_return_is_stripped() {
-        let config = integration_test_utils::make_config_from_args(&[]);
+    fn test_carriage_return_is_replaced_with_caret_notation() {
+        let config = integration_test_utils::make_config_from_args(&["--caret-encode"]);
         let output = integration_test_utils::run_delta(
             GIT_DIFF_SINGLE_HUNK_WITH_SEQUENCE_OF_CR_ESCAPE_SEQUENCES_LF,
             &config,
         );
         assert!(output.bytes().all(|b: u8| b != b'\r'));
+        assert!(output.contains("\x1b[7m^M\x1b[27m"));
     }
 
     #[test]

From 4ac5035342fab6d38a7c7820b73926337fa1b7f6 Mon Sep 17 00:00:00 2001
From: Yoichi Nakayama <yoichi.nakayama@gmail.com>
Date: Sat, 5 Mar 2022 23:20:22 +0900
Subject: [PATCH 2/2] Change the default behavior instead of adding options

---
 README.md                       |  2 +-
 src/cli.rs                      |  7 -------
 src/config.rs                   |  2 --
 src/options/set.rs              |  1 -
 src/paint.rs                    | 23 +++++++++++------------
 src/tests/test_example_diffs.rs |  2 +-
 6 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index cb0ab9977..c2240e858 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
     pager = delta
 
 [interactive]
-    diffFilter = delta --color-only --caret-encode
+    diffFilter = delta --color-only
 
 [delta]
     navigate = true  # use n and N to move between diff sections
diff --git a/src/cli.rs b/src/cli.rs
index e340ad087..15efd15ee 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -323,13 +323,6 @@ pub struct Opt {
     /// If a relativized file path exceeds this width then the diff stat will be misaligned.
     pub diff_stat_align_width: usize,
 
-    #[clap(long = "caret-encode")]
-    /// Replace control characters in output with caret notation.
-    ///
-    /// This option is supposed to be used in interactive.diffFilter configuration for `git add -p`
-    /// where raw control characters result in strange display.
-    pub caret_encode: bool,
-
     #[clap(long = "features", value_name = "FEATURES")]
     /// Names of delta features to activate (space-separated).
     ///
diff --git a/src/config.rs b/src/config.rs
index ed00e98ee..e06d84af5 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -70,7 +70,6 @@ pub struct Config {
     pub blame_palette: Vec<String>,
     pub blame_separator_style: Option<Style>,
     pub blame_timestamp_format: String,
-    pub caret_encode: bool,
     pub color_only: bool,
     pub commit_regex: Regex,
     pub commit_style: Style,
@@ -269,7 +268,6 @@ impl From<cli::Opt> for Config {
             blame_separator_format: parse_blame_line_numbers(&opt.blame_separator_format),
             blame_separator_style: styles.remove("blame-separator-style"),
             blame_timestamp_format: opt.blame_timestamp_format,
-            caret_encode: opt.caret_encode,
             commit_style: styles["commit-style"],
             color_only: opt.color_only,
             commit_regex,
diff --git a/src/options/set.rs b/src/options/set.rs
index a755e4f34..57d95b27d 100644
--- a/src/options/set.rs
+++ b/src/options/set.rs
@@ -132,7 +132,6 @@ pub fn set_options(
             blame_palette,
             blame_separator_style,
             blame_timestamp_format,
-            caret_encode,
             color_only,
             commit_decoration_style,
             commit_regex,
diff --git a/src/paint.rs b/src/paint.rs
index 116d8c1f9..eb54212ef 100644
--- a/src/paint.rs
+++ b/src/paint.rs
@@ -213,18 +213,17 @@ impl<'p> Painter<'p> {
                 painted_prefix(state.clone(), config),
                 config,
             );
-            if config.caret_encode {
-                for n in 0..32 {
-                    // HT(0x09), LF(0x0a), ESC(0x1b) are skipped
-                    if n != 0x09 && n != 0x0a && n != 0x1b {
-                        line = line.replace(
-                            &char::from_u32(n).unwrap().to_string(),
-                            &format!(
-                                "\x1b[7m^{}\x1b[27m",
-                                &char::from_u32(n + 64).unwrap().to_string()
-                            ),
-                        );
-                    }
+            // Replace control characters in output with caret notation.
+            for n in 0..32 {
+                // HT(0x09), LF(0x0a), ESC(0x1b) are skipped
+                if n != 0x09 && n != 0x0a && n != 0x1b {
+                    line = line.replace(
+                        &char::from_u32(n).unwrap().to_string(),
+                        &format!(
+                            "\x1b[7m^{}\x1b[27m",
+                            &char::from_u32(n + 64).unwrap().to_string()
+                        ),
+                    );
                 }
             }
             let (bg_fill_mode, fill_style) =
diff --git a/src/tests/test_example_diffs.rs b/src/tests/test_example_diffs.rs
index 2150d7d96..49420e25f 100644
--- a/src/tests/test_example_diffs.rs
+++ b/src/tests/test_example_diffs.rs
@@ -293,7 +293,7 @@ commit 94907c0f136f46dc46ffae2dc92dca9af7eb7c2e
 
     #[test]
     fn test_carriage_return_is_replaced_with_caret_notation() {
-        let config = integration_test_utils::make_config_from_args(&["--caret-encode"]);
+        let config = integration_test_utils::make_config_from_args(&[]);
         let output = integration_test_utils::run_delta(
             GIT_DIFF_SINGLE_HUNK_WITH_SEQUENCE_OF_CR_ESCAPE_SEQUENCES_LF,
             &config,