To: vim_dev@googlegroups.com Subject: Patch 8.2.1410 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1410 Problem: Adding compiler plugin requires test change. Solution: Include compiler plugin and adjust test. Files: src/testdir/test_compiler.vim, runtime/compiler/xo.vim *** ../vim-8.2.1409/src/testdir/test_compiler.vim 2020-02-08 16:00:43.225362846 +0100 --- src/testdir/test_compiler.vim 2020-08-09 19:53:11.135584084 +0200 *************** *** 46,52 **** 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 " Test executing :compiler from the command line, not from a script --- 46,52 ---- 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/xo.vim$', a[-1]) endfunc " Test executing :compiler from the command line, not from a script *************** *** 60,66 **** func Test_compiler_completion() call feedkeys(":compiler \\\"\", 'tx') ! call assert_match('^"compiler ant bcc .* xmlwf$', @:) call feedkeys(":compiler p\\\"\", 'tx') call assert_equal('"compiler pbx perl php pylint pyunit', @:) --- 60,66 ---- func Test_compiler_completion() call feedkeys(":compiler \\\"\", 'tx') ! call assert_match('^"compiler ant bcc .* xmlwf xo$', @:) call feedkeys(":compiler p\\\"\", 'tx') call assert_equal('"compiler pbx perl php pylint pyunit', @:) *** ../vim-8.2.1409/runtime/compiler/xo.vim 2020-08-09 20:05:11.427534619 +0200 --- runtime/compiler/xo.vim 2020-08-09 15:29:52.000000000 +0200 *************** *** 0 **** --- 1,26 ---- + " Vim compiler file + " Compiler: XO + " Maintainer: Doug Kearns + " Last Change: 2019 Jul 10 + + if exists("current_compiler") + finish + endif + let current_compiler = "xo" + + if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal + endif + + let s:cpo_save = &cpo + set cpo&vim + + " CompilerSet makeprg=npx\ xo\ --reporter\ compact + + CompilerSet makeprg=xo\ --reporter\ compact + CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ %m, + \%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ %m, + \%-G%.%# + + let &cpo = s:cpo_save + unlet s:cpo_save *** ../vim-8.2.1409/src/version.c 2020-08-09 19:31:46.793744881 +0200 --- src/version.c 2020-08-09 20:04:48.647649488 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1410, /**/ -- "Hit any key to continue" is very confusing when you have two keyboards. /// 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 ///