Merge http://github.com/Jonta/kakoune

src/commands.cc

@@ -962,7 +962,7 @@ const CommandDesc arrange_buffers_cmd = {
 const CommandDesc add_highlighter_cmd = {
     "add-highlighter",
     "addhl",
-    "add-highlighter <path>/<name> <type> <type params>...: add an highlighter to the group identified by <path>\n"
+    "add-highlighter <path>/<name> <type> <type params>...: add a highlighter to the group identified by <path>\n"
     "    <path> is a '/' delimited path or the parent highlighter, starting with either\n"
     "   'global', 'buffer', 'window' or 'shared', if <name> is empty, it will be autogenerated",
     ParameterDesc{

src/highlighter.hh

@@ -28,7 +28,7 @@ enum class HighlightPass
 };
 constexpr bool with_bit_ops(Meta::Type<HighlightPass>) { return true; }
 
-// An Highlighter is a function which mutates a DisplayBuffer in order to
+// A Highlighter is a function which mutates a DisplayBuffer in order to
 // change the visual representation of a file. It could be changing text
 // color, adding information text (line numbering for example) or replacing
 // buffer content (folding for example)

src/window.cc

@@ -347,7 +347,7 @@ void Window::clear_display_buffer()
 void Window::on_option_changed(const Option& option)
 {
     run_hook_in_own_context(Hook::WinSetOption, format("{}={}", option.name(), option.get_desc_string()));
-    // an highlighter might depend on the option, so we need to redraw
+    // a highlighter might depend on the option, so we need to redraw
     force_redraw();
 }