Merge pull request #19587 from Shougo/vim-9.0.0114

vim-patch:9.0.{0114,0115,0118}

1 files changed, 11 insertions, 12 deletions

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 75ba8dbede..0825f17ccc 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -893,7 +893,7 @@ int do_record(int c)
 {
   char_u *p;
   static int regname;
-  static bool change_cmdheight = false;
+  static bool changed_cmdheight = false;
   yankreg_T *old_y_previous;
   int retval;
 
@@ -907,13 +907,15 @@ int do_record(int c)
       showmode();
       regname = c;
       retval = OK;
+
       if (!ui_has_messages()) {
-        // Enable macro indicator temporary
+        // Enable macro indicator temporarily
         set_option_value("ch", 1L, NULL, 0);
         update_screen(VALID);
 
-        change_cmdheight = true;
+        changed_cmdheight = true;
       }
+
       apply_autocmds(EVENT_RECORDINGENTER, NULL, NULL, false, curbuf);
     }
   } else {  // stop recording
@@ -936,15 +938,6 @@ int do_record(int c)
     (void)tv_dict_add_str(dict, S_LEN("regname"), buf);
     tv_dict_set_keys_readonly(dict);
 
-    if (change_cmdheight) {
-      // Restore cmdheight
-      set_option_value("ch", 0L, NULL, 0);
-
-      redraw_all_later(CLEAR);
-
-      change_cmdheight = false;
-    }
-
     // Get the recorded key hits.  K_SPECIAL will be escaped, this
     // needs to be removed again to put it in a register.  exec_reg then
     // adds the escaping back later.
@@ -968,6 +961,12 @@ int do_record(int c)
 
       y_previous = old_y_previous;
     }
+
+    if (changed_cmdheight) {
+      // Restore cmdheight
+      set_option_value("ch", 0L, NULL, 0);
+      redraw_all_later(CLEAR);
+    }
   }
   return retval;
 }