aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-05-26 20:50:54 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-05-26 20:55:44 -0400
commit23936115880ba3c9e716f9c3b5d7b89453cd65fc (patch)
tree2800583f742ac06c4ba7bb5b0c754a04cdd9cb0e /src/nvim/eval.c
parent21f160746a4b406f84311a64fff96c1bd52f23c9 (diff)
downloadrneovim-23936115880ba3c9e716f9c3b5d7b89453cd65fc.tar.gz
rneovim-23936115880ba3c9e716f9c3b5d7b89453cd65fc.tar.bz2
rneovim-23936115880ba3c9e716f9c3b5d7b89453cd65fc.zip
vim-patch:8.1.0995: a getchar() call resets the reg_executing() result
Problem: A getchar() call while executing a register resets the reg_executing() result. Solution: Save and restore reg_executing. (closes vim/vim#406 https://github.com/vim/vim/commit/f0fab3046c2b5c4115979347464a802853011220
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index aa4a3da9e5..6eb4263a0c 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -9673,6 +9673,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
varnumber_T n;
bool error = false;
+ const int save_reg_executing = reg_executing;
no_mapping++;
for (;; ) {
@@ -9709,6 +9710,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
break;
}
no_mapping--;
+ reg_executing = save_reg_executing;
vimvars[VV_MOUSE_WIN].vv_nr = 0;
vimvars[VV_MOUSE_WINID].vv_nr = 0;