mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 21:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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 vim/vim#5256)
4ebe0e62d0
This commit is contained in:
zeertzjq
2022-02-17 07:18:10 +08:00
parent 3230b31486
commit c90cf8c77b
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/getchar.c
View File

@@ -1949,8 +1949,10 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
// expression. Also save and restore the command line
// for "normal :".
if (mp->m_expr) {
int save_vgetc_busy = vgetc_busy;
const int save_vgetc_busy = vgetc_busy;
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();
vgetc_busy = 0;
may_garbage_collect = false;
@@ -1960,6 +1962,12 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
save_m_str = vim_strsave(mp->m_str);
}
map_str = eval_map_expr(mp, NUL);
// 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_flush();
vgetc_busy = save_vgetc_busy;
may_garbage_collect = save_may_garbage_collect;
} else {