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

InputHandler: Preserve no-hooks on insert mode from single command normal mode

Browse Source 
Fixes #1775
This commit is contained in:
Maxime Coste 2017-12-21 10:30:45 +11:00
parent e0b28fa421
commit 0814bb2962
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/input_handler.cc
View File

@ -281,6 +281,9 @@ public:
} }
else else
{ {
// Preserve hooks disabled for the whole execution prior to pop_mode
ScopedSetBool disable_hooks{context().hooks_disabled(),
m_single_command and m_hooks_disabled};
if (m_single_command) if (m_single_command)
pop_mode(); pop_mode();
@ -1050,6 +1053,7 @@ public:
m_edition(context()), m_edition(context()),
m_completer(context()), m_completer(context()),
m_autoshowcompl{context().options()["autoshowcompl"].get<bool>()}, m_autoshowcompl{context().options()["autoshowcompl"].get<bool>()},
m_disable_hooks{context().hooks_disabled(), context().hooks_disabled()},
m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Transient ? m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Transient ?
Timer::Callback{} : [this](Timer&) { Timer::Callback{} : [this](Timer&) {
if (m_autoshowcompl) if (m_autoshowcompl)
@ -1392,6 +1396,7 @@ private:
Timer m_idle_timer; Timer m_idle_timer;
bool m_in_end = false; bool m_in_end = false;
MouseHandler m_mouse_handler; MouseHandler m_mouse_handler;
ScopedSetBool m_disable_hooks;
}; };
} }