To: vim_dev@googlegroups.com
Subject: Patch 8.2.5095
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.5095
Problem:    Terminal test still fails with some shell commands.
Solution:   Disable setting the window title in the Vim instance running in a
            terminal window. (closes #10530)
Files:      src/testdir/test_terminal.vim


*** ../vim-8.2.5094/src/testdir/test_terminal.vim	2022-06-14 14:59:12.655158068 +0100
--- src/testdir/test_terminal.vim	2022-06-14 19:47:21.816244478 +0100
***************
*** 1219,1228 ****
  func Test_terminal_qall_prompt()
    CheckRunVimInTerminal
  
-   " the shell may set the window title, we don't want that here
-   call test_override('vterm_title', 1)
    let buf = RunVimInTerminal('', {})
  
    " Open a terminal window and wait for the prompt to appear
    call term_sendkeys(buf, ":term\<CR>")
    call WaitForAssert({-> assert_match('\[running]', term_getline(buf, 10))})
--- 1219,1229 ----
  func Test_terminal_qall_prompt()
    CheckRunVimInTerminal
  
    let buf = RunVimInTerminal('', {})
  
+   " the shell may set the window title, we don't want that here
+   call term_sendkeys(buf, ":test_override('vterm_title', 1)\<CR>")
+ 
    " Open a terminal window and wait for the prompt to appear
    call term_sendkeys(buf, ":term\<CR>")
    call WaitForAssert({-> assert_match('\[running]', term_getline(buf, 10))})
***************
*** 1236,1242 ****
  
    " close the terminal window where Vim was running
    quit
-   call test_override('ALL', 0)
  endfunc
  
  " Run Vim in a terminal, then start a terminal window with a shell and check
--- 1237,1242 ----
*** ../vim-8.2.5094/src/version.c	2022-06-14 17:13:55.543974165 +0100
--- src/version.c	2022-06-14 19:49:38.136259974 +0100
***************
*** 736,737 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     5095,
  /**/

-- 
It is illegal to take more than three sips of beer at a time while standing.
		[real standing law in Texas, United States of America]

 /// 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    ///