Mercurial > vim
changeset 16144:4850744dc181 v8.1.1077
patch 8.1.1077: reg_executing() is reset by calling input()
commit https://github.com/vim/vim/commit/9a2c091a748b380efafe60583698c9afcaab1e46
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 30 14:26:18 2019 +0100
patch 8.1.1077: reg_executing() is reset by calling input()
Problem: reg_executing() is reset by calling input().
Solution: Implement a more generic way to save and restore reg_executing.
(Ozaki Kiichi, closes #4192)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 30 Mar 2019 14:30:05 +0100 |
| parents | ebca02f14822 |
| children | 3ac2f32abf22 |
| files | src/evalfunc.c src/ex_docmd.c src/testdir/test_functions.vim src/version.c |
| diffstat | 4 files changed, 28 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4848,7 +4848,6 @@ f_getchar(typval_T *argvars, typval_T *r { 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 *r } --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);
--- 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) {
--- 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