Merge remote-tracking branch 'krobelus/history-in-mappings'

2 files changed, 2 insertions, 0 deletions

diff --git a/src/commands.cc b/src/commands.cc
index 84e0fdf3..46481b9d 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -2621,6 +2621,7 @@ void enter_user_mode(Context& context, String mode_name, KeymapMode mode, bool l
 
         auto& mapping = context.keymaps().get_mapping(key, mode);
         ScopedSetBool disable_keymaps(context.keymaps_disabled());
+        ScopedSetBool disable_history(context.history_disabled());
 
         InputHandler::ScopedForceNormal force_normal{context.input_handler(), {}};
 
diff --git a/src/normal.cc b/src/normal.cc
index 09aad6f8..68a5fd6f 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -2014,6 +2014,7 @@ void exec_user_mappings(Context& context, NormalParams params)
 
         auto& mapping = context.keymaps().get_mapping(key, KeymapMode::User);
         ScopedSetBool disable_keymaps(context.keymaps_disabled());
+        ScopedSetBool disable_history(context.history_disabled());
 
         InputHandler::ScopedForceNormal force_normal{context.input_handler(), params};