Merge branch 'fix_repeatcmdline' into 20230125_mix

1 files changed, 6 insertions, 0 deletions

diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 22c5b1954d..3fe5a0d7c7 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -855,6 +855,7 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett
   int started_profiling = false;
   bool did_save_redo = false;
   save_redo_T save_redo;
+  char_u* saved_repeat_cmdline = NULL;
 
   // If depth of calling is getting too high, don't execute the function
   if (depth >= p_mfd) {
@@ -867,6 +868,9 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett
   // Save search patterns and redo buffer.
   save_search_patterns();
   if (!ins_compl_active()) {
+    if (repeat_cmdline) {
+      saved_repeat_cmdline = xstrdup(repeat_cmdline);
+    }
     saveRedobuff(&save_redo);
     did_save_redo = true;
   }
@@ -1216,6 +1220,8 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett
   // restore search patterns and redo buffer
   if (did_save_redo) {
     restoreRedobuff(&save_redo);
+    xfree(repeat_cmdline);
+    repeat_cmdline = saved_repeat_cmdline;
   }
   restore_search_patterns();
 }