From 2b4b73ae8e450c995ccccc93fcf6d2b73ea18862 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sun, 20 Sep 2015 11:34:13 +0100 Subject: Remove the default_face parameter of parse_display_line No need to define a default face there, we will pass a default face to UserInterface::draw_status later. --- src/display_buffer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/display_buffer.cc') diff --git a/src/display_buffer.cc b/src/display_buffer.cc index 3bf2f1b4..61078657 100644 --- a/src/display_buffer.cc +++ b/src/display_buffer.cc @@ -253,13 +253,13 @@ void DisplayBuffer::optimize() line.optimize(); } -DisplayLine parse_display_line(StringView line, Face default_face) +DisplayLine parse_display_line(StringView line) { DisplayLine res; bool was_antislash = false; auto pos = line.begin(); String content; - Face face = default_face; + Face face; for (auto it = line.begin(), end = line.end(); it != end; ++it) { const char c = *it; @@ -279,7 +279,7 @@ DisplayLine parse_display_line(StringView line, Face default_face) auto closing = std::find(it+1, end, '}'); if (closing == end) throw runtime_error("unclosed face definition"); - face = merge_faces(default_face, get_face({it+1, closing})); + face = get_face({it+1, closing}); it = closing; pos = closing + 1; } -- cgit v1.2.3