From f73f0a8cbd8f66340817ab8b143f5a4459380647 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Sun, 5 Dec 2021 09:44:03 -0500 Subject: Fix blame background colors These had been broken by ec08c4de76ff26046a0cebc70a54f5c42fbfb835 --- src/handlers/blame.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/handlers/blame.rs b/src/handlers/blame.rs index 2cf6547f..ec27ecda 100644 --- a/src/handlers/blame.rs +++ b/src/handlers/blame.rs @@ -37,12 +37,12 @@ impl<'a> StateMachine<'a> { let mut style = match paint::parse_style_sections(&self.raw_line, self.config).first() { - Some((style, _)) => { + Some((style, _)) if style != &Style::default() => { // Something like `blame.coloring = highlightRecent` is in effect; honor // the color from git, subject to map-styles. *style } - None => { + _ => { // Compute the color ourselves. let color = self.get_color(blame.commit, previous_commit, is_repeat); // TODO: This will often be pointlessly updating a key with the -- cgit v1.2.3