To: vim_dev@googlegroups.com
Subject: Patch 8.2.4031
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.4031
Problem:    Crash in xterm with only two lines. (Dominique Pellé)
Solution:   Only perform xterm compatibility test if possible. (closes #9488)
Files:      src/term.c, src/testdir/test_startup.vim


*** ../vim-8.2.4030/src/term.c	2022-01-02 21:26:12.319264330 +0000
--- src/term.c	2022-01-07 19:21:09.302981281 +0000
***************
*** 3801,3807 ****
  	line_was_clobbered(1);
      }
  
!     if (xcc_status.tr_progress == STATUS_GET)
      {
  	// 2. Check compatibility with xterm.
  	// We move the cursor to (2, 0), print a test sequence and then query
--- 3801,3807 ----
  	line_was_clobbered(1);
      }
  
!     if (xcc_status.tr_progress == STATUS_GET && Rows > 2)
      {
  	// 2. Check compatibility with xterm.
  	// We move the cursor to (2, 0), print a test sequence and then query
*** ../vim-8.2.4030/src/testdir/test_startup.vim	2021-10-11 22:57:28.693860875 +0100
--- src/testdir/test_startup.vim	2022-01-07 19:20:23.795091505 +0000
***************
*** 821,826 ****
--- 821,837 ----
    call StopVimInTerminal(buf)
  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()
    " Can't catch the output of gvim.
    CheckNotGui
*** ../vim-8.2.4030/src/version.c	2022-01-07 18:20:48.374967088 +0000
--- src/version.c	2022-01-07 19:23:06.482783390 +0000
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     4031,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
248. You sign your letters with your e-mail address instead of your name.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///