summaryrefslogtreecommitdiff
path: root/src/window.cc
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2019-04-23 16:44:30 +0100
committerMaxime Coste <mawww@kakoune.org>2019-04-23 23:15:23 +0100
commit4e24ba86cc95c51f78ebe9e77f1848b6760dbeb5 (patch)
tree6b7b855b249800bd40e23c2a9759847ad8194982 /src/window.cc
parent17c5e7aa5fb020186378f7f738e617b5743839fc (diff)
Change faces alias to be a base that can be modified
Using <fg>,<bg>+<attr>@<base> will apply the given fg color, bg color and attributes on top of base dynamically. Simply giving <base> is a shorthand for default,default@<base>. Inspired by the discussion in #2862
Diffstat (limited to 'src/window.cc')
-rw-r--r--src/window.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.cc b/src/window.cc
index 1b145d66..f44ea92b 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -78,7 +78,7 @@ static uint32_t compute_faces_hash(const FaceRegistry& faces)
{
uint32_t hash = 0;
for (auto&& face : faces.flatten_faces() | transform(&FaceRegistry::FaceMap::Item::value))
- hash = combine_hash(hash, face.alias.empty() ? hash_value(face.face) : hash_value(face.alias));
+ hash = combine_hash(hash, face.base.empty() ? hash_value(face.face) : hash_value(face.base));
return hash;
}