Fix past-the-eol column highlighter getting highlighted as buffer range

Make the column highlighter faces final, and change final logic to
give precedence to the base face when both the base and new face are
final.

Fixes #4669

1 files changed, 4 insertions, 4 deletions

diff --git a/src/display_buffer.hh b/src/display_buffer.hh
index 6d739095..af37b18f 100644
--- a/src/display_buffer.hh
+++ b/src/display_buffer.hh
@@ -24,11 +24,11 @@ struct DisplayAtom : public UseMemoryDomain<MemoryDomain::Display>
 public:
     enum Type { Range, ReplacedRange, Text };
 
-    DisplayAtom(const Buffer& buffer, BufferCoord begin, BufferCoord end)
-        : m_type(Range), m_buffer(&buffer), m_range{begin, end} {}
+    DisplayAtom(const Buffer& buffer, BufferCoord begin, BufferCoord end, Face face = {})
+        : face(face), m_type(Range), m_buffer(&buffer), m_range{begin, end} {}
 
-    DisplayAtom(const Buffer& buffer, BufferCoord begin, BufferCoord end, String str)
-        : m_type(ReplacedRange), m_buffer(&buffer), m_range{begin, end}, m_text{std::move(str)} {}
+    DisplayAtom(const Buffer& buffer, BufferCoord begin, BufferCoord end, String str, Face face = {})
+        : face(face), m_type(ReplacedRange), m_buffer(&buffer), m_range{begin, end}, m_text{std::move(str)} {}
 
     DisplayAtom(String str, Face face)
         : face(face), m_type(Text), m_text(std::move(str)) {}