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

Merge remote-tracking branch 'lenormf/rename-auto_complete'

Browse Source
This commit is contained in:
Maxime Coste 2018-11-25 23:01:02 +11:00
commit 31d3cef093
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/pages/changelog.asciidoc
View File

@ -3,6 +3,11 @@
This changelog contains major and/or breaking changes to Kakoune between This changelog contains major and/or breaking changes to Kakoune between
released versions. released versions.
== Development version
* `auto_complete` has been renamed to `autocomplete` for more
consistency.
== Kakoune 2018.10.27 == Kakoune 2018.10.27
* `remove-hooks` <group> argument is now a regex and removes all * `remove-hooks` <group> argument is now a regex and removes all

4
src/input_handler.cc
View File

@ -743,7 +743,7 @@ public:
: InputMode(input_handler), m_prompt(prompt.str()), m_prompt_face(face), : InputMode(input_handler), m_prompt(prompt.str()), m_prompt_face(face),
m_empty_text{std::move(emptystr)}, m_empty_text{std::move(emptystr)},
m_flags(flags), m_completer(std::move(completer)), m_callback(std::move(callback)), 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 ? m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Draft ?
Timer::Callback{} : [this](Timer&) { Timer::Callback{} : [this](Timer&) {
if (m_auto_complete and m_refresh_completion_pending) if (m_auto_complete and m_refresh_completion_pending)
@ -1123,7 +1123,7 @@ public:
m_restore_cursor(mode == InsertMode::Append), m_restore_cursor(mode == InsertMode::Append),
m_edition(context()), m_edition(context()),
m_completer(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_disable_hooks{context().hooks_disabled(), context().hooks_disabled()},
m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Draft ? m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Draft ?
Timer::Callback{} : [this](Timer&) { Timer::Callback{} : [this](Timer&) {

2
src/main.cc
View File

@ -369,7 +369,7 @@ void register_options()
reg.declare_option("autoinfo", reg.declare_option("autoinfo",
"automatically display contextual help", "automatically display contextual help",
AutoInfo::Command | AutoInfo::OnKey); AutoInfo::Command | AutoInfo::OnKey);
reg.declare_option("auto_complete", reg.declare_option("autocomplete",
"automatically display possible completions", "automatically display possible completions",
AutoComplete::Insert | AutoComplete::Prompt); AutoComplete::Insert | AutoComplete::Prompt);
reg.declare_option("aligntab", reg.declare_option("aligntab",

2
test/run
View File

@ -9,7 +9,7 @@ main() {
kak_commands=' kak_commands='
set global autoreload yes set global autoreload yes
set global autoinfo "" set global autoinfo ""
set global auto_complete "" set global autocomplete ""
try %{ try %{
exec -save-regs / %{%s%\(\K[^)]+\)<ret>a<backspace><esc>i<backspace><backspace><c-u><esc><a-;>} exec -save-regs / %{%s%\(\K[^)]+\)<ret>a<backspace><esc>i<backspace><backspace><c-u><esc><a-;>}
} catch %{ exec gg } } catch %{ exec gg }