Merge remote-tracking branch 'topisani/fix-3600'

src/input_handler.cc

@@ -1582,7 +1582,7 @@ void InputHandler::repeat_last_insert()
         // refill last_insert,  this is very inefficient, but necessary at the moment
         // to properly handle insert completion
         m_last_insert.keys.push_back(key);
-        current_mode().handle_key(key, true);
+        handle_key(key);
     }
     kak_assert(dynamic_cast<InputModes::Normal*>(&current_mode()) != nullptr);
 }
@@ -1655,11 +1655,12 @@ void InputHandler::handle_key(Key key)
     auto dec = on_scope_end([this]{ --m_handle_key_level;} );
 
     auto process_key = [&](Key key, bool synthesized) {
-        if (m_last_insert.recording)
-            m_last_insert.keys.push_back(key);
         current_mode().handle_key(key, synthesized);
     };
 
+    if (m_last_insert.recording and m_handle_key_level <= 1)
+        m_last_insert.keys.push_back(key);
+
     const auto keymap_mode = current_mode().keymap_mode();
     KeymapManager& keymaps = m_context.keymaps();
     if (keymaps.is_mapped(key, keymap_mode) and not m_context.keymaps_disabled())

test/normal/repeat-insert/repeat-insert-hooks/cmd

@@ -0,0 +1 @@
+:hook -group h g InsertChar f %{exec FINSERTED}<ret>ifoo<esc>.\.\ifoo<esc>.

test/normal/repeat-insert/repeat-insert-hooks/out

@@ -0,0 +1 @@
+fFINSERTEDoofFINSERTEDoofoofoofoo

test/normal/repeat-insert/repeat-insert-mapped/cmd

@@ -0,0 +1 @@
+ixyz<esc>.

test/normal/repeat-insert/repeat-insert-mapped/out

@@ -0,0 +1 @@
+zzxx

test/normal/repeat-insert/repeat-insert-mapped/rc

@@ -0,0 +1 @@
+map global insert y '<a-;>gh'

test/normal/repeat-insert/repeat-normal-exec/cmd

@@ -0,0 +1 @@
+i<a-;>:execute-keys foo<ret><esc>.

test/normal/repeat-insert/repeat-normal-exec/out

@@ -0,0 +1 @@
+foofoo

test/normal/repeat-insert/repeat-normal-movement/cmd

@@ -0,0 +1 @@
+ifoo<a-;>ghbar<esc>.

test/normal/repeat-insert/repeat-normal-movement/out

@@ -0,0 +1 @@
+barbarfoofoo