diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2019-09-04 15:44:43 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2019-09-04 15:44:43 +0200 |
| commit | 664aa988f6d9cdb7b75218666fbe348c85ef8b29 (patch) | |
| tree | 306173199576430e6133a1ed137bd80bbc2fb01b /ftdetect | |
| parent | 3ddca5da461ebfaa82104f82e3cbf19d1c326ade (diff) | |
| download | vim-polyglot-664aa988f6d9cdb7b75218666fbe348c85ef8b29.tar.gz vim-polyglot-664aa988f6d9cdb7b75218666fbe348c85ef8b29.zip | |
Update
Diffstat (limited to 'ftdetect')
| -rw-r--r-- | ftdetect/polyglot.vim | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 83a372fc..d326ac02 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -332,6 +332,8 @@ endif if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1 augroup filetypedetect " dockerfile, from Dockerfile.vim in ekalinin/Dockerfile.vim +" vint: -ProhibitAutocmdWithNoGroup + " Dockerfile autocmd BufRead,BufNewFile [Dd]ockerfile set ft=Dockerfile autocmd BufRead,BufNewFile Dockerfile* set ft=Dockerfile @@ -344,6 +346,8 @@ endif if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1 augroup filetypedetect " dockerfile, from docker-compose.vim in ekalinin/Dockerfile.vim +" vint: -ProhibitAutocmdWithNoGroup + " docker-compose.yml autocmd BufRead,BufNewFile docker-compose*.{yaml,yml}* set ft=yaml.docker-compose augroup end @@ -517,8 +521,8 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == augroup filetypedetect " handlebars, from mustache.vim in mustache/vim-mustache-handlebars if has("autocmd") - au BufNewFile,BufRead *.mustache,*.hogan,*.hulk,*.hjs set filetype=html.mustache syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim - au BufNewFile,BufRead *.handlebars,*.hbs set filetype=html.handlebars syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim + au BufNewFile,BufRead *.mustache,*.hogan,*.hulk,*.hjs set filetype=html.mustache syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim indent/handlebars.vim + au BufNewFile,BufRead *.handlebars,*.hdbs,*.hbs,*.hb set filetype=html.handlebars syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim endif augroup end endif @@ -619,11 +623,8 @@ fun! s:SelectJavascript() endif endfun -augroup javascript_syntax_detection - autocmd! - autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript - autocmd BufNewFile,BufRead * call s:SelectJavascript() -augroup END +autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript +autocmd BufNewFile,BufRead * call s:SelectJavascript() augroup end endif @@ -1233,7 +1234,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1 " vint: -ProhibitAutocmdWithNoGroup autocmd BufRead,BufNewFile *.rs call s:set_rust_filetype() -autocmd BufRead,BufNewFile Cargo.toml setf FALLBACK cfg + +if has('patch-8.0.613') + autocmd BufRead,BufNewFile Cargo.toml setf FALLBACK cfg +endif function! s:set_rust_filetype() abort if &filetype !=# 'rust' @@ -1437,6 +1441,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1 " vifm, from vifm.vim in vifm/vifm.vim autocmd BufRead,BufNewFile vifmrc :set filetype=vifm autocmd BufRead,BufNewFile *vifm/colors/* :set filetype=vifm +autocmd BufRead,BufNewFile *.vifm :set filetype=vifm augroup end endif |