Merge branch 'master' of git://github.com/pierroelmito/kakoune

This commit is contained in:
Maxime Coste 2016-05-04 23:20:49 +01:00
commit d4e9f30e5f
2 changed files with 3 additions and 0 deletions

View File

@ -121,6 +121,7 @@ FaceRegistry::FaceRegistry()
{ "Prompt", Face{ Color::Yellow, Color::Default } }, { "Prompt", Face{ Color::Yellow, Color::Default } },
{ "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } }, { "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } },
{ "BufferPadding", Face{ Color::Blue, Color::Default } }, { "BufferPadding", Face{ Color::Blue, Color::Default } },
{ "Whitespace", Face{ Color::Default, Color::Default } },
} }
{} {}

View File

@ -683,6 +683,7 @@ void expand_tabulations(const Context& context, HighlightFlags flags, DisplayBuf
void show_whitespaces(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange) void show_whitespaces(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange)
{ {
const int tabstop = context.options()["tabstop"].get<int>(); const int tabstop = context.options()["tabstop"].get<int>();
auto whitespaceface = get_face("Whitespace");
auto& buffer = context.buffer(); auto& buffer = context.buffer();
for (auto& line : display_buffer.lines()) for (auto& line : display_buffer.lines())
{ {
@ -713,6 +714,7 @@ void show_whitespaces(const Context& context, HighlightFlags flags, DisplayBuffe
atom_it->replace("·"); atom_it->replace("·");
else if (c == '\n') else if (c == '\n')
atom_it->replace("¬"); atom_it->replace("¬");
atom_it->face = whitespaceface;
break; break;
} }
} }