patch 8.1.1077: reg_executing() is reset by calling input()v8.1.1077

Problem:    reg_executing() is reset by calling input().
Solution:   Implement a more generic way to save and restore reg_executing.
            (Ozaki Kiichi, closes #4192)

4 files changed, 28 insertions, 8 deletions

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 72ffd52d99..30f98eb663 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -4848,7 +4848,6 @@ f_getchar(typval_T *argvars, typval_T *rettv)
 {
     varnumber_T		n;
     int			error = FALSE;
-    int			save_reg_executing = reg_executing;
 
 #ifdef MESSAGE_QUEUE
     // vpeekc() used to check for messages, but that caused problems, invoking
@@ -4883,7 +4882,6 @@ f_getchar(typval_T *argvars, typval_T *rettv)
     }
     --no_mapping;
     --allow_keys;
-    reg_executing = save_reg_executing;
 
     set_vim_var_nr(VV_MOUSE_WIN, 0);
     set_vim_var_nr(VV_MOUSE_WINID, 0);
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f30d9336af..b253e9b734 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1699,6 +1699,7 @@ do_one_cmd(
     exarg_T		ea;			/* Ex command arguments */
     int			save_msg_scroll = msg_scroll;
     cmdmod_T		save_cmdmod;
+    int			save_reg_executing = reg_executing;
     int			ni;			/* set when Not Implemented */
     char_u		*cmd;
 
@@ -2579,6 +2580,7 @@ doend:
 
     free_cmdmod();
     cmdmod = save_cmdmod;
+    reg_executing = save_reg_executing;
 
     if (ea.save_msg_silent != -1)
     {
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index d53499950e..63f477db9a 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1150,20 +1150,38 @@ func Test_reg_executing_and_recording()
   " getchar() command saves and restores reg_executing
   map W :call TestFunc()<CR>
   let @q = "W"
+  let g:typed = ''
+  let g:regs = []
   func TestFunc() abort
-    let g:reg1 = reg_executing()
+    let g:regs += [reg_executing()]
     let g:typed = getchar(0)
-    let g:reg2 = reg_executing()
+    let g:regs += [reg_executing()]
   endfunc
   call feedkeys("@qy", 'xt')
   call assert_equal(char2nr("y"), g:typed)
-  call assert_equal('q', g:reg1)
-  call assert_equal('q', g:reg2)
+  call assert_equal(['q', 'q'], g:regs)
   delfunc TestFunc
   unmap W
   unlet g:typed
-  unlet g:reg1
-  unlet g:reg2
+  unlet g:regs
+
+  " input() command saves and restores reg_executing
+  map W :call TestFunc()<CR>
+  let @q = "W"
+  let g:typed = ''
+  let g:regs = []
+  func TestFunc() abort
+    let g:regs += [reg_executing()]
+    let g:typed = input('?')
+    let g:regs += [reg_executing()]
+  endfunc
+  call feedkeys("@qy\<CR>", 'xt')
+  call assert_equal("y", g:typed)
+  call assert_equal(['q', 'q'], g:regs)
+  delfunc TestFunc
+  unmap W
+  unlet g:typed
+  unlet g:regs
 
   bwipe!
   delfunc s:save_reg_stat
diff --git a/src/version.c b/src/version.c
index 5505e6e897..e84b5db8d5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -776,6 +776,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1077,
+/**/
     1076,
 /**/
     1075,