diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-27 20:55:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-27 20:55:00 +0100 |
| commit | 4d05af0a64c2e26b13d2ad571debbf5f3b6d384e (patch) | |
| tree | cca0c07ff22acf7427d2af4a58c288fbde6116cf /src | |
| parent | aeb313f355cd67638e3c611354ce401d86f56afe (diff) | |
| download | vim-git-8.2.2061.tar.gz | |
patch 8.2.2061: Vim9: E1030 error when using empty string for term_sendkeys()v8.2.2061
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/terminal.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_termcodes.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/terminal.c b/src/terminal.c index 6be757950..32e52ee44 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -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; } diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim index cfbb7ba3c..12e4dd355 100644 --- a/src/testdir/test_termcodes.vim +++ b/src/testdir/test_termcodes.vim @@ -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) diff --git a/src/version.c b/src/version.c index d86a51e95..395aee1a2 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2061, +/**/ 2060, /**/ 2059, |