thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.2336: when an expr mapping moves the cursor it is not restored

Browse Source 
Problem:    When an expr mapping moves the cursor it is not restored.
Solution:   Position the cursor after an expr mapping. (closes #5256)
This commit is contained in:
Bram Moolenaar
2019-11-22 20:55:40 +01:00
parent 2118a30295
commit 4ebe0e62d0
4 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/getchar.c
View File

@@ -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;
}