diff src/getchar.c @ 18689:8cc12c8d7842 v8.1.2336

patch 8.1.2336: when an expr mapping moves the cursor it is not restored Commit: https://github.com/vim/vim/commit/4ebe0e62d097d68c5312f9c32714fb41a4c947a3 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 22 20:55:40 2019 +0100 patch 8.1.2336: when an expr mapping moves the cursor it is not restored Problem: When an expr mapping moves the cursor it is not restored. Solution: Position the cursor after an expr mapping. (closes https://github.com/vim/vim/issues/5256)
author Bram Moolenaar <Bram@vim.org>
date Fri, 22 Nov 2019 21:00:04 +0100
parents 5ed740336224
children 14d2a210fab1
line wrap: on
line diff
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2594,6 +2594,8 @@ handle_mapping(
 	{
 	    int save_vgetc_busy = vgetc_busy;
 	    int save_may_garbage_collect = may_garbage_collect;
+	    int was_screen_col = screen_cur_col;
+	    int was_screen_row = screen_cur_row;
 
 	    vgetc_busy = 0;
 	    may_garbage_collect = FALSE;
@@ -2602,6 +2604,11 @@ handle_mapping(
 	    save_m_str = vim_strsave(mp->m_str);
 	    map_str = eval_map_expr(save_m_str, NUL);
 
+	    // The mapping may do anything, but we expect it to take care of
+	    // redrawing.  Do put the cursor back where it was.
+	    windgoto(was_screen_row, was_screen_col);
+	    out_flush();
+
 	    vgetc_busy = save_vgetc_busy;
 	    may_garbage_collect = save_may_garbage_collect;
 	}