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

Remind user hooks disable when replaying last insert

Browse Source 
Fixes #495
This commit is contained in:
Maxime Coste 2015-11-26 23:02:59 +00:00
parent de72c7d5d3
commit 0b57103c72
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/input_handler.cc
View File

@ -984,6 +984,7 @@ public:
last_insert().mode = mode; last_insert().mode = mode;
last_insert().keys.clear(); last_insert().keys.clear();
last_insert().disable_hooks = m_disable_hooks;
context().hooks().run_hook("InsertBegin", "", context()); context().hooks().run_hook("InsertBegin", "", context());
prepare(m_insert_mode); prepare(m_insert_mode);
} }
@ -1330,6 +1331,8 @@ void InputHandler::repeat_last_insert()
Vector<Key> keys; Vector<Key> keys;
swap(keys, m_last_insert.keys); swap(keys, m_last_insert.keys);
ScopedSetBool disable_hooks(context().user_hooks_disabled(),
m_last_insert.disable_hooks);
// context.last_insert will be refilled by the new Insert // context.last_insert will be refilled by the new Insert
// this is very inefficient. // this is very inefficient.
push_mode(new InputModes::Insert(*this, m_last_insert.mode)); push_mode(new InputModes::Insert(*this, m_last_insert.mode));

4
src/input_handler.hh
View File

@ -94,8 +94,8 @@ private:
void push_mode(InputMode* new_mode); void push_mode(InputMode* new_mode);
std::unique_ptr<InputMode> pop_mode(InputMode* current_mode); std::unique_ptr<InputMode> pop_mode(InputMode* current_mode);
struct Insertion{ InsertMode mode; Vector<Key> keys; }; struct Insertion{ InsertMode mode; Vector<Key> keys; bool disable_hooks; };
Insertion m_last_insert = {InsertMode::Insert, {}}; Insertion m_last_insert = { InsertMode::Insert, {}, false };
char m_recording_reg = 0; char m_recording_reg = 0;
String m_recorded_keys; String m_recorded_keys;