From c8804ae8ff738de23bb36a7fa7a9d4a1cee8069b Mon Sep 17 00:00:00 2001
From: Yee Cheng Chin <ychin.git@gmail.com>
Date: Wed, 15 Mar 2023 07:03:43 -0700
Subject: [PATCH] Fix MacVim CI breakage in
 Test_mouse_shape_after_cancelling_gr

Set mouseshape correctly when using 'r' or 'gr'. Otherwise Vim will only
do it when mouse moves or window receives focus, which is a little
random. This change will be ported upstream.
---
 src/normal.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/normal.c b/src/normal.c
index cfe7db93bf..44c400c4c3 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -417,6 +417,9 @@ normal_cmd_get_more_chars(
 	    State = MODE_REPLACE;	// pretend Replace mode
 #ifdef CURSOR_SHAPE
 	    ui_cursor_shape();	// show different cursor shape
+#endif
+#ifdef FEAT_MOUSESHAPE
+	    update_mouseshape(-1);
 #endif
 	}
 	if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP)