diff options
| author | Maxime Coste <mawww@kakoune.org> | 2017-03-21 18:17:43 +0000 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2017-03-21 18:17:43 +0000 |
| commit | 777ba287e18f2f2452bd90a02f694395e839ff31 (patch) | |
| tree | 78f160b1e3b4b80b6769c4605e61f9eebcbc484f /src | |
| parent | 8b1078e51029850ea4610cee75a8c81a8e5afbba (diff) | |
Merge faces in show_whitespaces highlighter instead of replacing it
Diffstat (limited to 'src')
| -rw-r--r-- | src/highlighters.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/highlighters.cc b/src/highlighters.cc index 6f0c3848..c1969a94 100644 --- a/src/highlighters.cc +++ b/src/highlighters.cc @@ -721,7 +721,7 @@ void show_whitespaces(const Context& context, HighlightFlags flags, DisplayBuffe atom_it->replace(lf.str()); else if (cp == 0xA0) atom_it->replace(nbsp.str()); - atom_it->face = whitespaceface; + atom_it->face = merge_faces(atom_it->face, whitespaceface); break; } } |