From 36a2bf60adbf113cb6a096c9edd22c711782d912 Mon Sep 17 00:00:00 2001 From: ptzz Date: Wed, 27 Apr 2022 10:51:23 +0200 Subject: Rename `TestFiletypeFuncs` to avoid name collision (#796) Fixes #783. --- extras/filetype.vim | 2 +- scripts/build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extras/filetype.vim b/extras/filetype.vim index f6cb13a1..3da520b4 100644 --- a/extras/filetype.vim +++ b/extras/filetype.vim @@ -2506,7 +2506,7 @@ endif " Function called for testing all functions defined here. These are " script-local, thus need to be executed here. " Returns a string with error messages (hopefully empty). -func! TestFiletypeFuncs(testlist) +func! TestPolyglotFiletypeFuncs(testlist) let output = '' for f in a:testlist try diff --git a/scripts/build b/scripts/build index 8ff113f3..3b86d71e 100755 --- a/scripts/build +++ b/scripts/build @@ -902,6 +902,7 @@ def generate_fallback filetype_content.gsub!(/^au StdinReadPost \* .+?runtime!.+?endif/m) {} filetype_content.gsub!(/^au filetypedetect BufNewFile,BufRead,StdinReadPost \*\n.+?endif/m) {} filetype_content.gsub!("dist#ft#", "polyglot#ft#") + filetype_content.gsub!("TestFiletypeFuncs", "TestPolyglotFiletypeFuncs") File.write('extras/filetype.vim', filetype_content) File.write('extras/menu.vim', File.read('tmp/vim/vim-v8.2.4274/runtime/menu.vim')) -- cgit v1.2.3