To: vim_dev@googlegroups.com
Subject: Patch 8.2.3831
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.3831
Problem:    Opfunc test fails when missing feature changes function name.
            (Dominique Pellé)
Solution:   Check the relevant screen line instead of using a screendump.
            (closes #9360)
Files:      src/testdir/test_vim9_func.vim,
            src/testdir/dumps/Test_opfunc_error.dump


*** ../vim-8.2.3830/src/testdir/test_vim9_func.vim	2021-12-16 15:49:39.157345806 +0000
--- src/testdir/test_vim9_func.vim	2021-12-16 21:06:22.448500964 +0000
***************
*** 3244,3250 ****
  
    var buf = RunVimInTerminal('-S XTest_opfunc_error', {rows: 6, wait_for_ruler: 0})
    WaitForAssert(() => assert_match('Press ENTER', term_getline(buf, 6)))
!   VerifyScreenDump(buf, 'Test_opfunc_error', {})
  
    # clean up
    StopVimInTerminal(buf)
--- 3244,3250 ----
  
    var buf = RunVimInTerminal('-S XTest_opfunc_error', {rows: 6, wait_for_ruler: 0})
    WaitForAssert(() => assert_match('Press ENTER', term_getline(buf, 6)))
!   WaitForAssert(() => assert_match('E684: list index out of range: 0', term_getline(buf, 5)))
  
    # clean up
    StopVimInTerminal(buf)
*** ../vim-8.2.3830/src/testdir/dumps/Test_opfunc_error.dump	2021-12-13 18:14:11.760881287 +0000
--- src/testdir/dumps/Test_opfunc_error.dump	1970-01-01 00:00:00.000000000 +0000
***************
*** 1,6 ****
- |~+0#4040ff13#ffffff0| @73
- |~| @73
- |E+0#ffffff16#e000002|r@1|o|r| |d|e|t|e|c|t|e|d| |w|h|i|l|e| |p|r|o|c|e|s@1|i|n|g| |f|u|n|c|t|i|o|n| |<|S|N|R|>|9|_|O|p|f|u|n|c|:| +0#0000000#ffffff0@19
- |l+0#af5f00255&|i|n|e| @3|2|:| +0#0000000&@64
- |E+0#ffffff16#e000002|6|8|4|:| |l|i|s|t| |i|n|d|e|x| |o|u|t| |o|f| |r|a|n|g|e|:| |0| +0#0000000#ffffff0@42
- |P+0#00e0003&|r|e|s@1| |E|N|T|E|R| |o|r| |t|y|p|e| |c|o|m@1|a|n|d| |t|o| |c|o|n|t|i|n|u|e> +0#0000000&@35
--- 0 ----
*** ../vim-8.2.3830/src/version.c	2021-12-16 20:56:52.956098576 +0000
--- src/version.c	2021-12-16 21:07:05.420481534 +0000
***************
*** 751,752 ****
--- 751,754 ----
  {   /* Add new patch number below this line */
+ /**/
+     3831,
  /**/

-- 
The real
trick is
this: to
keep the
lines as
short as
possible
and keep
the size
the same
yet free
from the
need for
hyphena-
Dammit!!  (Matthew Winn)

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