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.hh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/display_buffer.hh')

diff --git a/src/display_buffer.hh b/src/display_buffer.hh
index 2b0a989d..e284fe1f 100644
--- a/src/display_buffer.hh
+++ b/src/display_buffer.hh
@@ -142,8 +142,10 @@ private:
     AtomList  m_atoms;
 };
 
+class FaceRegistry;
+
 String fix_atom_text(StringView str);
-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 = {});
 
 class DisplayBuffer : public UseMemoryDomain<MemoryDomain::Display>
 {
-- 
cgit v1.2.3