summaryrefslogtreecommitdiff
path: root/src/display_buffer.cc
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2014-07-11 00:27:04 +0100
committerMaxime Coste <frrrwww@gmail.com>2014-07-11 00:27:43 +0100
commita32b49acd12538c27bf4f9abb8acd133e8cf2ee8 (patch)
treed1990535a90aa77fe6754f777e5f1c1c261e0ca8 /src/display_buffer.cc
parent42611aef1e84b7dc13735021b8d0b68fedb86d60 (diff)
Rename ColorPair to Face and ColorRegistry to FaceRegistry
Face also stores the attributes
Diffstat (limited to 'src/display_buffer.cc')
-rw-r--r--src/display_buffer.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/display_buffer.cc b/src/display_buffer.cc
index 2c705bdb..af8d15e4 100644
--- a/src/display_buffer.cc
+++ b/src/display_buffer.cc
@@ -96,8 +96,7 @@ void DisplayLine::optimize()
auto& next_atom = *next_atom_it;
bool merged = false;
- if (atom.colors == next_atom.colors and
- atom.attribute == next_atom.attribute and
+ if (atom.face == next_atom.face and
atom.type() == next_atom.type())
{
auto type = atom.type();