summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild.py2
-rw-r--r--ftdetect/polyglot.vim12
2 files changed, 7 insertions, 7 deletions
diff --git a/build.py b/build.py
index 4c98ce0d..b6579808 100755
--- a/build.py
+++ b/build.py
@@ -136,9 +136,9 @@ language("Ferm", extensions=[".ferm"], filenames=["ferm.conf"], filetype="ferm")
language("fish")
language("YAML", extra_filenames=["fish_history", "fish_read_history"])
language("Flatbuffers", extensions=[".fbs"], filetype="fbs", polyglot="flatbuffers")
-language("F#", polyglot="fsharp", filetype="fsharp")
language("GDScript", filetype="gdscript3", polyglot="gdscript")
language("GLSL", extra_extensions=[".comp"])
+language("F#", polyglot="fsharp", filetype="fsharp")
language("Git Config", polyglot="git", filetype="gitconfig", extra_filenames=["*.git/config", "*/.config/git/config", "*.git/modules/**/config", "gitconfig"])
language("Git Rebase", polyglot="git", filetype="gitrebase", filenames=["git-rebase-todo"])
language("Git Send Email", polyglot="git", filetype="gitsendemail", filenames=[".gitsendemail.*"])
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 6e604622..3a843e68 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -267,12 +267,6 @@ if index(g:polyglot_disabled, 'flatbuffers') == -1
au BufNewFile,BufRead *.fbs set ft=fbs
endif
-if index(g:polyglot_disabled, 'fsharp') == -1
- au BufNewFile,BufRead *.fs set ft=fsharp
- au BufNewFile,BufRead *.fsi set ft=fsharp
- au BufNewFile,BufRead *.fsx set ft=fsharp
-endif
-
if index(g:polyglot_disabled, 'gdscript') == -1
au BufNewFile,BufRead *.gd set ft=gdscript3
endif
@@ -301,6 +295,12 @@ if index(g:polyglot_disabled, 'glsl') == -1
au BufNewFile,BufRead *.vshader set ft=glsl
endif
+if index(g:polyglot_disabled, 'fsharp') == -1
+ au BufNewFile,BufRead *.fs set ft=fsharp
+ au BufNewFile,BufRead *.fsi set ft=fsharp
+ au BufNewFile,BufRead *.fsx set ft=fsharp
+endif
+
if index(g:polyglot_disabled, 'git') == -1
au BufNewFile,BufRead *.gitconfig set ft=gitconfig
au BufNewFile,BufRead *.git/config set ft=gitconfig