diff options
| author | Maxime Coste <mawww@kakoune.org> | 2018-11-25 23:01:02 +1100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2018-11-25 23:01:02 +1100 |
| commit | 31d3cef0933f81795afa8eaad76b34c206b4d056 (patch) | |
| tree | a366ff179e7dcb24ddfbc8f203b80e9da0bf19c5 /src | |
| parent | bef7683e1bbccf61a6c4841bbb202233e8370d33 (diff) | |
| parent | 21e93ebc11d55e5bb7d2953bba9f72be1f880abf (diff) | |
Merge remote-tracking branch 'lenormf/rename-auto_complete'
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_handler.cc | 4 | ||||
| -rw-r--r-- | src/main.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc index 1964e116..ade87d04 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -743,7 +743,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>() & AutoComplete::Prompt}, + m_auto_complete{context().options()["autocomplete"].get<AutoComplete>() & 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) @@ -1123,7 +1123,7 @@ public: m_restore_cursor(mode == InsertMode::Append), m_edition(context()), m_completer(context()), - m_auto_complete{context().options()["auto_complete"].get<AutoComplete>() & AutoComplete::Insert}, + m_auto_complete{context().options()["autocomplete"].get<AutoComplete>() & 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 2be8fee5..f9242708 100644 --- a/src/main.cc +++ b/src/main.cc @@ -369,7 +369,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", |