forked from aniani/vim
patch 8.2.2061: Vim9: E1030 error when using empty string for term_sendkeys()
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:
@@ -4595,12 +4595,12 @@ term_get_buf(typval_T *argvars, char *where)
|
||||
{
|
||||
buf_T *buf;
|
||||
|
||||
(void)tv_get_number(&argvars[0]); // issue errmsg if type error
|
||||
++emsg_off;
|
||||
buf = tv_get_buf(&argvars[0], FALSE);
|
||||
--emsg_off;
|
||||
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);
|
||||
return NULL;
|
||||
}
|
||||
|
@@ -1896,14 +1896,14 @@ endfunc
|
||||
|
||||
func Test_list_builtin_terminals()
|
||||
CheckRunVimInTerminal
|
||||
let buf = RunVimInTerminal('', #{rows: 14})
|
||||
call term_sendkeys(buf, ":set cmdheight=3\<CR>")
|
||||
call TermWait(buf, 100)
|
||||
call term_sendkeys(buf, ":set term=xxx\<CR>")
|
||||
call TermWait(buf, 100)
|
||||
call assert_match('builtin_dumb', term_getline(buf, 11))
|
||||
call assert_match('Not found in termcap', term_getline(buf, 12))
|
||||
call StopVimInTerminal(buf)
|
||||
call RunVimInTerminal('', #{rows: 14})
|
||||
call term_sendkeys('', ":set cmdheight=3\<CR>")
|
||||
call TermWait('', 100)
|
||||
call term_sendkeys('', ":set term=xxx\<CR>")
|
||||
call TermWait('', 100)
|
||||
call assert_match('builtin_dumb', term_getline('', 11))
|
||||
call assert_match('Not found in termcap', term_getline('', 12))
|
||||
call StopVimInTerminal('')
|
||||
endfunc
|
||||
|
||||
func GetEscCodeCSI27(key, modifier)
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2061,
|
||||
/**/
|
||||
2060,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user