To: vim_dev@googlegroups.com
Subject: Patch 8.2.4606
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.4606 (after 8.2.4605)
Problem:    Test fails because of changed error message.
Solution:   Update the expected error message
Files:      src/testdir/test_vim9_import.vim


*** ../vim-8.2.4605/src/testdir/test_vim9_import.vim	2022-02-21 13:13:44.923693160 +0000
--- src/testdir/test_vim9_import.vim	2022-03-21 20:38:21.168964794 +0000
***************
*** 2156,2162 ****
       export var Func = 'asdf'
    END
    writefile(lines, 'Xdir/autoload/dup3func.vim')
!   assert_fails('source Xdir/autoload/dup3func.vim', 'E1041: Redefining script item Func')
  
    lines =<< trim END
       vim9script
--- 2156,2162 ----
       export var Func = 'asdf'
    END
    writefile(lines, 'Xdir/autoload/dup3func.vim')
!   assert_fails('source Xdir/autoload/dup3func.vim', 'E1041: Redefining script item: "Func"')
  
    lines =<< trim END
       vim9script
***************
*** 2189,2195 ****
       var Func = 'asdf'
    END
    writefile(lines, 'Xdir/autoload/dup6func.vim')
!   assert_fails('source Xdir/autoload/dup6func.vim', 'E1041: Redefining script item Func')
  
    delete('Xdir', 'rf')
  enddef
--- 2189,2195 ----
       var Func = 'asdf'
    END
    writefile(lines, 'Xdir/autoload/dup6func.vim')
!   assert_fails('source Xdir/autoload/dup6func.vim', 'E1041: Redefining script item: "Func"')
  
    delete('Xdir', 'rf')
  enddef
*** ../vim-8.2.4605/src/version.c	2022-03-21 19:52:50.728673261 +0000
--- src/version.c	2022-03-21 20:39:34.908626028 +0000
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     4606,
  /**/

-- 
Not too long ago, a program was something you watched on TV...

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