1
0
forked from aniani/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 #406
This commit is contained in:
Bram Moolenaar
2019-03-05 12:24:10 +01:00
parent 8fcb60f961
commit f0fab3046c
3 changed files with 23 additions and 0 deletions

View File

@@ -4811,6 +4811,7 @@ f_getchar(typval_T *argvars, typval_T *rettv)
{ {
varnumber_T n; varnumber_T n;
int error = FALSE; int error = FALSE;
int save_reg_executing = reg_executing;
#ifdef MESSAGE_QUEUE #ifdef MESSAGE_QUEUE
// vpeekc() used to check for messages, but that caused problems, invoking // vpeekc() used to check for messages, but that caused problems, invoking
@@ -4845,6 +4846,7 @@ f_getchar(typval_T *argvars, typval_T *rettv)
} }
--no_mapping; --no_mapping;
--allow_keys; --allow_keys;
reg_executing = save_reg_executing;
set_vim_var_nr(VV_MOUSE_WIN, 0); set_vim_var_nr(VV_MOUSE_WIN, 0);
set_vim_var_nr(VV_MOUSE_WINID, 0); set_vim_var_nr(VV_MOUSE_WINID, 0);

View File

@@ -1138,6 +1138,7 @@ func Test_reg_executing_and_recording()
call assert_equal('":', s:reg_stat) call assert_equal('":', s:reg_stat)
" :normal command saves and restores reg_executing " :normal command saves and restores reg_executing
let s:reg_stat = ''
let @q = ":call TestFunc()\<CR>:call s:save_reg_stat()\<CR>" let @q = ":call TestFunc()\<CR>:call s:save_reg_stat()\<CR>"
func TestFunc() abort func TestFunc() abort
normal! ia normal! ia
@@ -1146,6 +1147,24 @@ func Test_reg_executing_and_recording()
call assert_equal(':q', s:reg_stat) call assert_equal(':q', s:reg_stat)
delfunc TestFunc delfunc TestFunc
" getchar() command saves and restores reg_executing
map W :call TestFunc()<CR>
let @q = "W"
func TestFunc() abort
let g:reg1 = reg_executing()
let g:typed = getchar(0)
let g:reg2 = 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)
delfunc TestFunc
unmap W
unlet g:typed
unlet g:reg1
unlet g:reg2
bwipe! bwipe!
delfunc s:save_reg_stat delfunc s:save_reg_stat
unlet s:reg_stat unlet s:reg_stat

View File

@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
995,
/**/ /**/
994, 994,
/**/ /**/