output: Use short ANSI clr sequence

vincentdephily · Apr 9, 2024 · 5426dab · 5426dab
1 parent 8beaea1
commit 5426dab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -157,8 +157,8 @@ impl Conf {
                   unmerge: AnsiStr::from(if color { "\x1B[1;31m" } else { "<<< " }),
                   dur: AnsiStr::from(if color { "\x1B[1;35m" } else { "" }),
                   cnt: AnsiStr::from(if color { "\x1B[2;33m" } else { "" }),
-                  clr: AnsiStr::from(if color { "\x1B[0m" } else { "" }),
-                  lineend: if color { b"\x1B[0m\n" } else { b"\n" },
+                  clr: AnsiStr::from(if color { "\x1B[m" } else { "" }),
+                  lineend: if color { b"\x1B[m\n" } else { b"\n" },
                   header: sel!(cli, toml, header, (), false)?,
                   dur_t: sel!(cli, toml, duration, (), DurationStyle::Hms)?,
                   date_offset: offset,

diff --git a/src/table.rs b/src/table.rs
@@ -249,8 +249,8 @@ mod test {
         let mut t = Table::<2>::new(&conf).align_left(0);
         t.row([&[&"123"], &[&1]]);
         t.row([&[&conf.merge, &1, &conf.dur, &2, &conf.cnt, &3, &conf.clr], &[&1]]);
-        let res = "123  1\x1B[0m\n\
-                   \x1B[1;32m1\x1B[1;35m2\x1B[2;33m3\x1B[0m  1\x1B[0m\n";
+        let res = "123  1\x1B[m\n\
+                   \x1B[1;32m1\x1B[1;35m2\x1B[2;33m3\x1B[m  1\x1B[m\n";
         let (l1, l2) = res.split_once('\n').expect("two lines");
         assert_eq!(Ansi::strip(l1, 100), "123  1");
         assert_eq!(Ansi::strip(l1, 100), Ansi::strip(l2, 100));