To: vim_dev@googlegroups.com Subject: Patch 8.2.1216 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1216 Problem: Startup test fails. Solution: Adjust expected values for deleted lines. Files: src/testdir/test_startup.vim *** ../vim-8.2.1215/src/testdir/test_startup.vim 2020-05-31 21:27:58.335221898 +0200 --- src/testdir/test_startup.vim 2020-07-15 01:36:23.009951842 +0200 *************** *** 299,305 **** if RunVim([], after, '-q') let lines = readfile('Xtestout') call assert_equal(['errors.err', ! \ '[0, 208, 5, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif --- 299,305 ---- if RunVim([], after, '-q') let lines = readfile('Xtestout') call assert_equal(['errors.err', ! \ '[0, 208, 1, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif *************** *** 311,317 **** if RunVim([], after, '-q Xerrors') let lines = readfile('Xtestout') call assert_equal(['Xerrors', ! \ '[0, 208, 5, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif --- 311,317 ---- if RunVim([], after, '-q Xerrors') let lines = readfile('Xtestout') call assert_equal(['Xerrors', ! \ '[0, 208, 1, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif *************** *** 321,327 **** if RunVim([], after, '-qXerrors') let lines = readfile('Xtestout') call assert_equal(['Xerrors', ! \ '[0, 208, 5, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif --- 321,327 ---- if RunVim([], after, '-qXerrors') let lines = readfile('Xtestout') call assert_equal(['Xerrors', ! \ '[0, 208, 1, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif *** ../vim-8.2.1215/src/version.c 2020-07-14 23:02:38.184781049 +0200 --- src/version.c 2020-07-15 01:37:16.857798596 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1216, /**/ -- Giving a commit hash to refer to a patch is like giving longitude and lattitude to refer to a city. /// 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 ///