Skip to content

Commit 36a2bf6

Browse files
authored
Rename TestFiletypeFuncs to avoid name collision (#796)
Fixes #783.
1 parent db7bb8b commit 36a2bf6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

extras/filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2506,7 +2506,7 @@ endif
25062506
" Function called for testing all functions defined here. These are
25072507
" script-local, thus need to be executed here.
25082508
" Returns a string with error messages (hopefully empty).
2509-
func! TestFiletypeFuncs(testlist)
2509+
func! TestPolyglotFiletypeFuncs(testlist)
25102510
let output = ''
25112511
for f in a:testlist
25122512
try

scripts/build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,7 @@ def generate_fallback
902902
filetype_content.gsub!(/^au StdinReadPost \* .+?runtime!.+?endif/m) {}
903903
filetype_content.gsub!(/^au filetypedetect BufNewFile,BufRead,StdinReadPost \*\n.+?endif/m) {}
904904
filetype_content.gsub!("dist#ft#", "polyglot#ft#")
905+
filetype_content.gsub!("TestFiletypeFuncs", "TestPolyglotFiletypeFuncs")
905906
File.write('extras/filetype.vim', filetype_content)
906907
File.write('extras/menu.vim', File.read('tmp/vim/vim-v8.2.4274/runtime/menu.vim'))
907908

0 commit comments

Comments
 (0)