1
0
forked from aniani/vim

patch 8.2.4031: crash in xterm with only two lines

Problem:    Crash in xterm with only two lines. (Dominique Pellé)
Solution:   Only perform xterm compatibility test if possible. (closes #9488)
This commit is contained in:
Bram Moolenaar
2022-01-07 19:24:20 +00:00
parent 71f21938bc
commit d1f34e64f0
3 changed files with 14 additions and 1 deletions

View File

@@ -3801,7 +3801,7 @@ check_terminal_behavior(void)
line_was_clobbered(1); line_was_clobbered(1);
} }
if (xcc_status.tr_progress == STATUS_GET) if (xcc_status.tr_progress == STATUS_GET && Rows > 2)
{ {
// 2. Check compatibility with xterm. // 2. Check compatibility with xterm.
// We move the cursor to (2, 0), print a test sequence and then query // We move the cursor to (2, 0), print a test sequence and then query

View File

@@ -821,6 +821,17 @@ func Test_start_with_tabs()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
func Test_start_in_minimal_window()
CheckRunVimInTerminal
let buf = RunVimInTerminal('-c "set nomore"', {'cols': 12, 'rows': 2, 'keep_t_u7': 1})
call term_sendkeys(buf, "ahello\<Esc>")
call WaitForAssert({-> assert_match('^hello', term_getline(buf, 1))})
" clean up
call StopVimInTerminal(buf)
endfunc
func Test_v_argv() func Test_v_argv()
" Can't catch the output of gvim. " Can't catch the output of gvim.
CheckNotGui CheckNotGui

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 */
/**/
4031,
/**/ /**/
4030, 4030,
/**/ /**/