To: vim_dev@googlegroups.com Subject: Patch 8.1.2131 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2131 (after 8.2.2129) Problem: MSVC tests fail. Solution: Replace backslashes with slashes. Files: src/testdir/test_compiler.vim, src/testdir/test_spell.vim *** ../vim-8.1.2130/src/testdir/test_compiler.vim 2019-10-10 13:30:09.485605298 +0200 --- src/testdir/test_compiler.vim 2019-10-10 14:07:28.193273788 +0200 *************** *** 38,47 **** endfunc func Test_compiler_without_arg() ! let a=split(execute('compiler')) ! call assert_match($VIMRUNTIME .. '/compiler/ant.vim$', a[0]) ! call assert_match($VIMRUNTIME .. '/compiler/bcc.vim$', a[1]) ! call assert_match($VIMRUNTIME .. '/compiler/xmlwf.vim$', a[-1]) endfunc func Test_compiler_completion() --- 38,48 ---- endfunc func Test_compiler_without_arg() ! let runtime = substitute($VIMRUNTIME, '\\', '/', 'g') ! let a = split(execute('compiler')) ! call assert_match(runtime .. '/compiler/ant.vim$', a[0]) ! call assert_match(runtime .. '/compiler/bcc.vim$', a[1]) ! call assert_match(runtime .. '/compiler/xmlwf.vim$', a[-1]) endfunc func Test_compiler_completion() *** ../vim-8.1.2130/src/testdir/test_spell.vim 2019-10-10 13:30:09.485605298 +0200 --- src/testdir/test_spell.vim 2019-10-10 14:05:41.629639778 +0200 *************** *** 128,147 **** func Test_spellinfo() new set enc=latin1 spell spelllang=en ! call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set enc=cp1250 spell spelllang=en ! call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.ascii.spl\n$", execute('spellinfo')) set enc=utf-8 spell spelllang=en ! call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.utf-8.spl\n$", execute('spellinfo')) set enc=latin1 spell spelllang=en_us,en_nz call assert_match("^\n" . ! \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" . ! \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set spell spelllang= call assert_fails('spellinfo', 'E756:') --- 128,148 ---- func Test_spellinfo() new + let runtime = substitute($VIMRUNTIME, '\\', '/', 'g') set enc=latin1 spell spelllang=en ! call assert_match("^\nfile: " .. runtime .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set enc=cp1250 spell spelllang=en ! call assert_match("^\nfile: " .. runtime .. "/spell/en.ascii.spl\n$", execute('spellinfo')) set enc=utf-8 spell spelllang=en ! call assert_match("^\nfile: " .. runtime .. "/spell/en.utf-8.spl\n$", execute('spellinfo')) set enc=latin1 spell spelllang=en_us,en_nz call assert_match("^\n" . ! \ "file: " .. runtime .. "/spell/en.latin1.spl\n" . ! \ "file: " .. runtime.. "/spell/en.latin1.spl\n$", execute('spellinfo')) set spell spelllang= call assert_fails('spellinfo', 'E756:') *** ../vim-8.1.2130/src/version.c 2019-10-10 13:39:04.879357080 +0200 --- src/version.c 2019-10-10 14:06:41.929433735 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 2131, /**/ -- Dreams are free, but there's a small charge for alterations. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///