summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2017-05-29 10:20:21 +0100
committerMaxime Coste <mawww@kakoune.org>2017-05-29 10:20:21 +0100
commitf6e00ff00f60880bd0c57db855c5b5add4555a0f (patch)
treec65026db453105173b45debf75524520c0bc173e /src
parentb030088d601729d03c75751677a6f22537551980 (diff)
parentc9c868d4de032816073b9a09e4861c39b8aff1ec (diff)
Merge remote-tracking branch 'Delapouite/typo'
Diffstat (limited to 'src')
-rw-r--r--src/commands.cc2
-rw-r--r--src/highlighters.cc10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/commands.cc b/src/commands.cc
index 285c0f2a..76a0e845 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -1891,7 +1891,7 @@ const CommandDesc on_key_cmd = {
"on-key",
nullptr,
"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 },
CommandFlags::None,
CommandHelper{},
diff --git a/src/highlighters.cc b/src/highlighters.cc
index 3df17ccb..18302b28 100644
--- a/src/highlighters.cc
+++ b/src/highlighters.cc
@@ -48,7 +48,7 @@ void highlight_range(DisplayBuffer& display_buffer,
BufferCoord begin, BufferCoord end,
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
or begin >= display_buffer.range().end)
return;
@@ -87,7 +87,7 @@ template<typename T>
void replace_range(DisplayBuffer& display_buffer,
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
or begin >= display_buffer.range().end)
return;
@@ -715,7 +715,7 @@ struct WrapHighlighter : Highlighter
const Buffer& buffer = context.buffer();
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();
it != display_buffer.lines().end(); ++it)
{
@@ -786,7 +786,7 @@ struct WrapHighlighter : Highlighter
setup.window_pos.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;
for (auto buf_line = setup.window_pos.line;
buf_line < setup.window_pos.line + setup.window_range.line;
@@ -2009,7 +2009,7 @@ void register_highlighters()
"ref",
{ create_reference_highlighter,
"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"
"which specify what kind of highlighters can be referenced" } });
registry.insert({