xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Delapouite/typo'

Browse Source
This commit is contained in:
Maxime Coste 2017-05-29 10:20:21 +01:00
commit f6e00ff00f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands.cc
View File

@ -1891,7 +1891,7 @@ const CommandDesc on_key_cmd = {
"on-key", "on-key",
nullptr, nullptr,
"on-key <command>: wait for next user key then and execute <command>, " "on-key <command>: wait for next user key then and execute <command>, "
"with key availabe in the `key` value", "with key available in the `key` value",
ParameterDesc{ {}, ParameterDesc::Flags::None, 1, 1 }, ParameterDesc{ {}, ParameterDesc::Flags::None, 1, 1 },
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},

10
src/highlighters.cc
View File

@ -48,7 +48,7 @@ void highlight_range(DisplayBuffer& display_buffer,
BufferCoord begin, BufferCoord end, BufferCoord begin, BufferCoord end,
bool skip_replaced, T func) bool skip_replaced, T func)
{ {
// tolerate begin > end as that can be triggered by wrong encodngs // tolerate begin > end as that can be triggered by wrong encodings
if (begin >= end or end <= display_buffer.range().begin if (begin >= end or end <= display_buffer.range().begin
or begin >= display_buffer.range().end) or begin >= display_buffer.range().end)
return; return;
@ -87,7 +87,7 @@ template<typename T>
void replace_range(DisplayBuffer& display_buffer, void replace_range(DisplayBuffer& display_buffer,
BufferCoord begin, BufferCoord end, T func) BufferCoord begin, BufferCoord end, T func)
{ {
// tolerate begin > end as that can be triggered by wrong encodngs // tolerate begin > end as that can be triggered by wrong encodings
if (begin >= end or end <= display_buffer.range().begin if (begin >= end or end <= display_buffer.range().begin
or begin >= display_buffer.range().end) or begin >= display_buffer.range().end)
return; return;
@ -715,7 +715,7 @@ struct WrapHighlighter : Highlighter
const Buffer& buffer = context.buffer(); const Buffer& buffer = context.buffer();
const int tabstop = context.options()["tabstop"].get<int>(); const int tabstop = context.options()["tabstop"].get<int>();
const LineCount win_height = context.window().dimensions().line; const LineCount win_height = context.window().dimensions().line;
for (auto it = display_buffer.lines().begin(); for (auto it = display_buffer.lines().begin();
it != display_buffer.lines().end(); ++it) it != display_buffer.lines().end(); ++it)
{ {
@ -786,7 +786,7 @@ struct WrapHighlighter : Highlighter
setup.window_pos.column = 0; setup.window_pos.column = 0;
setup.scroll_offset.column = 0; setup.scroll_offset.column = 0;
const LineCount win_height = context.window().dimensions().line; const LineCount win_height = context.window().dimensions().line;
LineCount win_line = 0; LineCount win_line = 0;
for (auto buf_line = setup.window_pos.line; for (auto buf_line = setup.window_pos.line;
buf_line < setup.window_pos.line + setup.window_range.line; buf_line < setup.window_pos.line + setup.window_range.line;
@ -2009,7 +2009,7 @@ void register_highlighters()
"ref", "ref",
{ create_reference_highlighter, { create_reference_highlighter,
"Parameters: [-passes <passes>] <path>\n" "Parameters: [-passes <passes>] <path>\n"
"Reference the highlighter at <path> in shared highglighters\n" "Reference the highlighter at <path> in shared highlighters\n"
"<passes> is a flags(colorize|move|wrap) defaulting to colorize\n" "<passes> is a flags(colorize|move|wrap) defaulting to colorize\n"
"which specify what kind of highlighters can be referenced" } }); "which specify what kind of highlighters can be referenced" } });
registry.insert({ registry.insert({