summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptzz <ptzzptzzp@gmail.com>2022-04-27 10:51:23 +0200
committerGitHub <noreply@github.com>2022-04-27 10:51:23 +0200
commit36a2bf60adbf113cb6a096c9edd22c711782d912 (patch)
tree70aa03160ff26c8ebfc3ee1dde9eed3c008f80ba
parentdb7bb8ba22f5798bf3abe9f786bc6e6d002725f8 (diff)
downloadvim-polyglot-36a2bf60adbf113cb6a096c9edd22c711782d912.tar.gz
vim-polyglot-36a2bf60adbf113cb6a096c9edd22c711782d912.zip
Rename `TestFiletypeFuncs` to avoid name collision (#796)
Fixes #783.
-rw-r--r--extras/filetype.vim2
-rwxr-xr-xscripts/build1
2 files changed, 2 insertions, 1 deletions
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'))