fix(input): use correct grid when restoring cursor for <expr> mapping (#19047)

2 files changed, 7 insertions, 1 deletions

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 7f783fd72f..57d25e5c45 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -2122,6 +2122,7 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
       const bool save_may_garbage_collect = may_garbage_collect;
       const int save_cursor_row = ui_current_row();
       const int save_cursor_col = ui_current_col();
+      const handle_T save_cursor_grid = ui_cursor_grid();
       const int prev_did_emsg = did_emsg;
 
       vgetc_busy = 0;
@@ -2135,7 +2136,7 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
 
       // The mapping may do anything, but we expect it to take care of
       // redrawing.  Do put the cursor back where it was.
-      ui_cursor_goto(save_cursor_row, save_cursor_col);
+      ui_grid_cursor_goto(save_cursor_grid, save_cursor_row, save_cursor_col);
       ui_flush();
 
       // If an error was displayed and the expression returns an empty
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 96ce2c4cb1..a49e9df9ee 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -495,6 +495,11 @@ int ui_current_col(void)
   return cursor_col;
 }
 
+handle_T ui_cursor_grid(void)
+{
+  return cursor_grid_handle;
+}
+
 void ui_flush(void)
 {
   cmdline_ui_flush();