thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2061: Vim9: E1030 error when using empty string for term_sendkeys()

Browse Source 
Problem:    Vim9: E1030 error when using empty string for term_sendkeys().
Solution:   Don't check for an invalid type unless the terminal can't be
            found. (closes #7382)
This commit is contained in:
Bram Moolenaar
2020-11-27 20:55:00 +01:00
parent aeb313f355
commit 4d05af0a64
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal.c
View File

@@ -4595,12 +4595,12 @@ term_get_buf(typval_T *argvars, char *where)
{ {
buf_T *buf; buf_T *buf;
(void)tv_get_number(&argvars[0]); // issue errmsg if type error
++emsg_off; ++emsg_off;
buf = tv_get_buf(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
--emsg_off; --emsg_off;
if (buf == NULL || buf->b_term == NULL) if (buf == NULL || buf->b_term == NULL)
{ {
(void)tv_get_number(&argvars[0]); // issue errmsg if type error
ch_log(NULL, "%s: invalid buffer argument", where); ch_log(NULL, "%s: invalid buffer argument", where);
return NULL; return NULL;
} }

16
src/testdir/test_termcodes.vim
View File

@@ -1896,14 +1896,14 @@ endfunc
func Test_list_builtin_terminals() func Test_list_builtin_terminals()
CheckRunVimInTerminal CheckRunVimInTerminal
let buf = RunVimInTerminal('', #{rows: 14}) call RunVimInTerminal('', #{rows: 14})
call term_sendkeys(buf, ":set cmdheight=3\<CR>") call term_sendkeys('', ":set cmdheight=3\<CR>")
call TermWait(buf, 100) call TermWait('', 100)
call term_sendkeys(buf, ":set term=xxx\<CR>") call term_sendkeys('', ":set term=xxx\<CR>")
call TermWait(buf, 100) call TermWait('', 100)
call assert_match('builtin_dumb', term_getline(buf, 11)) call assert_match('builtin_dumb', term_getline('', 11))
call assert_match('Not found in termcap', term_getline(buf, 12)) call assert_match('Not found in termcap', term_getline('', 12))
call StopVimInTerminal(buf) call StopVimInTerminal('')
endfunc endfunc
func GetEscCodeCSI27(key, modifier) func GetEscCodeCSI27(key, modifier)

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
2061,
/**/ /**/
2060, 2060,
/**/ /**/