From 57baad4afde8d1bab4040c5a5cbe8a5b367bceba Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Sat, 7 Apr 2018 15:36:39 +1000
Subject: Make FaceRegistry scoped

set-face now takes a scope argument, and faces can be overridden on
a buffer or window basis.

colorscheme apply on global scope, which should be good enough for
now.

Fixes #1411
---
 src/display_buffer.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/display_buffer.cc')

diff --git a/src/display_buffer.cc b/src/display_buffer.cc
index a634ff5b..20b5588c 100644
--- a/src/display_buffer.cc
+++ b/src/display_buffer.cc
@@ -3,6 +3,7 @@
 #include "assert.hh"
 #include "buffer.hh"
 #include "buffer_utils.hh"
+#include "face_registry.hh"
 #include "utf8.hh"
 
 #include "face_registry.hh"
@@ -241,7 +242,7 @@ void DisplayBuffer::optimize()
         line.optimize();
 }
 
-DisplayLine parse_display_line(StringView line, const HashMap<String, DisplayLine>& builtins)
+DisplayLine parse_display_line(StringView line, const FaceRegistry& faces, const HashMap<String, DisplayLine>& builtins)
 {
     DisplayLine res;
     bool was_antislash = false;
@@ -278,7 +279,7 @@ DisplayLine parse_display_line(StringView line, const HashMap<String, DisplayLin
                     ++closing;
                 }
                 else
-                    face = get_face({it+1, closing});
+                    face = faces[{it+1, closing}];
                 it = closing;
                 pos = closing + 1;
             }
-- 
cgit v1.2.3