summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--autoload/sleuth.vim2
-rw-r--r--ftdetect/polyglot.vim6
-rw-r--r--packages.yaml5
-rwxr-xr-xscripts/build3
4 files changed, 14 insertions, 2 deletions
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 41ebe474..abe8cd85 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -218,7 +218,7 @@ let s:globs = {
\ 'vmasm': '*.mar',
\ 'vue': '*.vue,*.wpy',
\ 'xdc': '*.xdc',
- \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+ \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,*.fglrxrc,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
\ 'xml.twig': '*.xml.twig',
\ 'xs': '*.xs',
\ 'xsl': '*.xslt,*.xsl',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 52c536e9..18ccd136 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -163,7 +163,7 @@ if !has_key(s:disabled_packages, 'ampl')
endif
if !has_key(s:disabled_packages, 'xml')
- au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul,*.tpm,*.csproj.user,*.wpl
+ au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul,*.tpm,*.csproj.user,*.wpl,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu
endif
if !has_key(s:disabled_packages, 'ant')
@@ -610,6 +610,7 @@ if !has_key(s:disabled_packages, 'xml')
au BufNewFile,BufRead *.ditaval set ft=xml
au BufNewFile,BufRead *.dll.config set ft=xml
au BufNewFile,BufRead *.dotsettings set ft=xml
+ au BufNewFile,BufRead *.fglrxrc set ft=xml
au BufNewFile,BufRead *.filters set ft=xml
au BufNewFile,BufRead *.fsproj set ft=xml
au BufNewFile,BufRead *.fxml set ft=xml
@@ -687,6 +688,9 @@ if !has_key(s:disabled_packages, 'xml')
au BufNewFile,BufRead *.xspec set ft=xml
au BufNewFile,BufRead *.xul set ft=xml
au BufNewFile,BufRead *.zcml set ft=xml
+ au BufNewFile,BufRead */etc/blkid.tab set ft=xml
+ au BufNewFile,BufRead */etc/blkid.tab.old set ft=xml
+ au BufNewFile,BufRead */etc/xdg/menus/*.menu set ft=xml
au BufNewFile,BufRead {.,}classpath set ft=xml
au BufNewFile,BufRead {.,}cproject set ft=xml
au BufNewFile,BufRead {.,}project set ft=xml
diff --git a/packages.yaml b/packages.yaml
index 2de5535e..322a3a15 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1731,6 +1731,11 @@ filetypes:
- tpm
- csproj.user
- wpl
+ - fglrxrc
+ extra_filenames:
+ - '*/etc/blkid.tab'
+ - '*/etc/blkid.tab.old'
+ - '*/etc/xdg/menus/*.menu'
ignored_extensions:
- ts
- tsx
diff --git a/scripts/build b/scripts/build
index 513b80bb..bc5cd126 100755
--- a/scripts/build
+++ b/scripts/build
@@ -726,6 +726,9 @@ def process_list(list, extras)
end
def show_warnings(all_filetypes, expected_filetypes)
+ if !ENV["DEV"]
+ return
+ end
all_expected = process_list(expected_filetypes, false) do |f|
(f["extensions"] || []).map { |e| "*." + e } + (f["filenames"] || [])
end