From 0b8899d1d4624eff20829d7090616412120fd3d3 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Thu, 19 Jul 2018 11:10:10 +0300 Subject: [PATCH] src: Rename `auto_complete` to `autocomplete` Removing the underscore seems to make the option name more in line with the others (even though some do use a separator, e.g. `disabled_hooks`). --- src/input_handler.cc | 4 ++-- src/main.cc | 2 +- test/run | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/input_handler.cc b/src/input_handler.cc index 11f2d5e3..239db2de 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -716,7 +716,7 @@ public: : InputMode(input_handler), m_prompt(prompt.str()), m_prompt_face(face), m_empty_text{std::move(emptystr)}, m_flags(flags), m_completer(std::move(completer)), m_callback(std::move(callback)), - m_auto_complete{context().options()["auto_complete"].get() & AutoComplete::Prompt}, + m_auto_complete{context().options()["autocomplete"].get() & AutoComplete::Prompt}, m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Draft ? Timer::Callback{} : [this](Timer&) { if (m_auto_complete and m_refresh_completion_pending) @@ -1092,7 +1092,7 @@ public: m_restore_cursor(mode == InsertMode::Append), m_edition(context()), m_completer(context()), - m_auto_complete{context().options()["auto_complete"].get() & AutoComplete::Insert}, + m_auto_complete{context().options()["autocomplete"].get() & AutoComplete::Insert}, m_disable_hooks{context().hooks_disabled(), context().hooks_disabled()}, m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Draft ? Timer::Callback{} : [this](Timer&) { diff --git a/src/main.cc b/src/main.cc index a1cfbafd..33084731 100644 --- a/src/main.cc +++ b/src/main.cc @@ -350,7 +350,7 @@ void register_options() reg.declare_option("autoinfo", "automatically display contextual help", AutoInfo::Command | AutoInfo::OnKey); - reg.declare_option("auto_complete", + reg.declare_option("autocomplete", "automatically display possible completions", AutoComplete::Insert | AutoComplete::Prompt); reg.declare_option("aligntab", diff --git a/test/run b/test/run index c019eb60..fb6f88d1 100755 --- a/test/run +++ b/test/run @@ -9,7 +9,7 @@ main() { kak_commands=' set global autoreload yes set global autoinfo "" - set global auto_complete "" + set global autocomplete "" try %{ exec -save-regs / %{%s%\(\K[^)]+\)ai} } catch %{ exec gg }