From 777ba287e18f2f2452bd90a02f694395e839ff31 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Tue, 21 Mar 2017 18:17:43 +0000
Subject: [PATCH] Merge faces in show_whitespaces highlighter instead of
 replacing it

---
 src/highlighters.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
                 }
             }